2451 files changed, 47569 insertions, 44493 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index f3a98f636e4..62411df6aff 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,15 @@
+Tue Jan 29 21:09:12 2002  Oliver Kellogg <oliver.kellogg@sysde.eads.net>
+
+	* tao/orbconf.h (TAO_ENV_*):
+	  Deprecated. Instead, use the equivalent ACE_ENV_ macros from
+	  $ACE_ROOT/ace/CORBA_macros.h.
+
+	* (many source files):
+	  Corresponding to the above change, changed all relevant source
+	  files to use the new ACE_ENV_ARG macros instead of the TAO_ENV_ARG
+	  macros. All exception related macros are now defined in
+	  $ACE_ROOT/ace/CORBA_macros.h.
+
 Tue Jan 29 09:01:41 2002  Carlos O'Ryan  <coryan@uci.edu>
 
 	* TAO_IDL/be/be_interface.cpp:
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index ea54e854ab2..92dfbee10c7 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -593,7 +593,7 @@ be_interface::gen_var_defn (char *interface_name)
       << "static " << interface_name
       << "_ptr tao_narrow (" << be_idt << be_idt_nl
       << "CORBA::Object *" << be_nl
-      << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
       << ");" << be_uidt_nl
       << "static CORBA::Object * tao_upcast (void *);"
       << be_uidt_nl << be_nl;
@@ -808,11 +808,11 @@ be_interface::gen_var_impl (char *interface_local_name,
   *cs << "::" << interface_full_name << "_ptr" << be_nl
       << fname << "::tao_narrow (" << be_idt << be_idt_nl
       << "CORBA::Object *p" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "return ::" << interface_full_name
-      << "::_narrow (p TAO_ENV_ARG_PARAMETER);"
+      << "::_narrow (p ACE_ENV_ARG_PARAMETER);"
       << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -2102,7 +2102,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "TAO_ServerRequest &req, " << be_nl
                       << "void *obj," << be_nl
                       << "void *context" << be_nl
-                      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+                      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
                       << ");" << be_uidt << "\n\n";
                 }
               else
@@ -2115,7 +2115,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "TAO_ServerRequest &req," << be_nl
                       << "void *obj," << be_nl
                       << "void *context" << be_nl
-                      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+                      << "ACE_ENV_ARG_DECL" << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
                   *os << ancestor->full_skel_name ()
@@ -2129,7 +2129,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "(" << ancestor->full_skel_name ()
                       << "_ptr) impl," << be_nl
                       << "context" << be_nl
-                      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+                      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}\n";
                 }
@@ -2153,7 +2153,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "TAO_ServerRequest &req," << be_nl
                       << "void *obj," << be_nl
                       << "void *context" << be_nl
-                      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+                      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
                       << ");" << be_uidt << "\n\n";
                 }
               else
@@ -2166,7 +2166,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "TAO_ServerRequest &req," << be_nl
                       << "void *obj," << be_nl
                       << "void *context" << be_nl
-                      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+                      << "ACE_ENV_ARG_DECL" << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl
                       << ancestor->full_skel_name ()
@@ -2180,7 +2180,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "(" << ancestor->full_skel_name ()
                       << "_ptr) impl," << be_nl
                       << "context" << be_nl
-                      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+                      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}\n";
                 }
@@ -2200,7 +2200,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "TAO_ServerRequest &req," << be_nl
                           << "void *obj," << be_nl
                           << "void *context" << be_nl
-                          << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+                          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
                           << ");" << be_uidt << "\n\n";
                     }
                   else
@@ -2214,7 +2214,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "TAO_ServerRequest &req," << be_nl
                           << "void *obj," << be_nl
                           << "void *context" << be_nl
-                          << "TAO_ENV_ARG_DECL" << be_uidt_nl
+                          << "ACE_ENV_ARG_DECL" << be_uidt_nl
                           << ")" << be_uidt_nl
                           << "{" << be_idt_nl
                           << ancestor->full_skel_name ()
@@ -2228,7 +2228,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "(" << ancestor->full_skel_name ()
                           << "_ptr) impl," << be_nl
                           << "context" << be_nl
-                          << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+                          << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
                           << ");" << be_uidt << be_uidt_nl
                           << "}\n";
                     }
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
index 14b2c3e0490..fe97d26c601 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
@@ -87,7 +87,7 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << "{" << be_idt_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
       << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-      << " TAO_ENV_ARG_PARAMETER);" << be_nl
+      << " ACE_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "if (!result)" << be_idt_nl
       << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
index 95c4ec70e3a..5e882bea301 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
@@ -72,7 +72,7 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
       << "{" << be_idt_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
       << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-      << " TAO_ENV_ARG_PARAMETER);" << be_nl
+      << " ACE_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "if (!result)" << be_idt_nl
       << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
index 5854f129730..e29be94d778 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -99,7 +99,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << "{" << be_idt_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
       << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-      << " TAO_ENV_ARG_PARAMETER);" << be_nl
+      << " ACE_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "if (!result)" << be_idt_nl
       << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
index 34394aa35ac..0fead89ad6c 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
@@ -86,11 +86,11 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
       *os << "virtual void _raise (void);\n" << be_nl
           << "virtual void _tao_encode (" << be_idt << be_idt_nl
           << "TAO_OutputCDR &" << be_nl
-          << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
+          << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
           << ") const;" << be_uidt_nl << be_nl
           << "virtual void _tao_decode (" << be_idt << be_idt_nl
           << "TAO_InputCDR &" << be_nl
-          << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
+          << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
           << ");" << be_uidt_nl << be_nl
           << "static " << node->local_name ()
           << " *_downcast (CORBA::Exception *);\n\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 4f0f566a82e..63cd466cec8 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -182,7 +182,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       if (!node->is_local ())
         {
           *os << "TAO_OutputCDR &cdr" << be_nl
-              << "TAO_ENV_ARG_DECL" << be_uidt_nl
+              << "ACE_ENV_ARG_DECL" << be_uidt_nl
               << ") const" << be_uidt_nl
               << "{" << be_idt_nl
               << "if (cdr << *this)" << be_idt_nl
@@ -204,7 +204,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       else
         {
           *os << "TAO_OutputCDR &" << be_nl
-              << "TAO_ENV_ARG_DECL" << be_uidt_nl
+              << "ACE_ENV_ARG_DECL" << be_uidt_nl
               << ") const" << be_uidt_nl
               << "{" << be_idt_nl;
 
@@ -226,7 +226,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       if (!node->is_local ())
         {
           *os << "TAO_InputCDR &cdr" << be_nl
-              << "TAO_ENV_ARG_DECL" << be_uidt_nl
+              << "ACE_ENV_ARG_DECL" << be_uidt_nl
               << ")" << be_uidt_nl
               << "{" << be_idt_nl
               << "if (cdr >> *this)" << be_idt_nl
@@ -248,7 +248,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       else
         {
           *os << "TAO_InputCDR &" << be_nl
-              << "TAO_ENV_ARG_DECL" << be_uidt_nl
+              << "ACE_ENV_ARG_DECL" << be_uidt_nl
               << ")" << be_uidt_nl
               << "{" << be_idt_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
index fce022ee17f..a9b511b3cbf 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
@@ -114,7 +114,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
       << be_nl
       << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
       << "const char* logical_type_id" << be_nl
-      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   *os << "virtual void* _downcast (" << be_idt << be_idt_nl
@@ -126,7 +126,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
       << "void *servant_upcall" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   // Add a skeleton for our _non_existent method.
@@ -134,7 +134,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
       << "void *servant_upcall" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   // Add a skeleton for our _interface method.
@@ -142,14 +142,14 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
       << "void *servant_upcall" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   // Add the dispatch method.
   *os << "virtual void _dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *_servant_upcall" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   this->this_method (node);
@@ -355,6 +355,6 @@ be_visitor_amh_interface_sh::this_method (be_interface *node)
   // the type of the class, but the original class that "implied" the
   // AMH one.
   *os << non_amh_name.c_str () << " *_this (" << be_idt << be_idt_nl
-      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");\n" << be_uidt;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
index 94bf1737db1..a8a079ffe3e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -70,9 +70,9 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
 
   *os << non_amh_name.c_str() << "*" << be_nl
       << full_skel_name
-      << "::_this (TAO_ENV_SINGLE_ARG_DECL)" << be_nl
+      << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl
       << "{" << be_idt_nl // idt = 1
-      << "TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);"
+      << "TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);"
       << be_nl
       << "ACE_CHECK_RETURN (0);" << be_nl << be_nl;
 
@@ -109,14 +109,14 @@ be_visitor_amh_interface_ss::dispatch_method (be_interface *node)
       << full_skel_name << "::_dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *context" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "this->asynchronous_upcall_dispatch (" << be_idt << be_idt_nl
       << "req," << be_nl
       << "context," << be_nl
       << "this" << be_nl
-      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}" << be_nl;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index 5b8e64e50c2..0791620c497 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -82,7 +82,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
           << "_tao_elem = " << node->full_name () << "::_nil ();" << be_nl
           << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
           << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-          << " TAO_ENV_ARG_PARAMETER);" << be_nl
+          << " ACE_ENV_ARG_PARAMETER);" << be_nl
           << "ACE_TRY_CHECK;" << be_nl << be_nl
           << "if (!result)" << be_idt_nl
           << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
index 441b3330a6f..67068688a0d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
@@ -48,7 +48,7 @@ be_visitor_interface_base_proxy_broker_ch::visit_interface (be_interface *node)
       << be_idt << be_idt_nl;
 
   *os << node->local_name () << " *object" << be_nl
-      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ") = 0;"
       << be_uidt_nl  // idt = 1
       << be_uidt_nl; // idt = 0
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
index f8fc999e4a2..f3c743a6dfa 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
@@ -91,7 +91,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
       << node->full_name () << "::_unchecked_narrow ("
       << be_idt << be_idt_nl
       << "obj.in ()" << be_nl
-      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl;
   *os << "ACE_TRY_CHECK;" << be_nl;
   *os << "return 1;" << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp
index d16bf1fd7ed..fa2aebe35da 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_sh.cpp
@@ -100,7 +100,7 @@ int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *no
   *os << "virtual CORBA::Boolean _is_a" << be_idt
       << "(" << be_idt_nl
       << "const CORBA::Char *logical_type_id" << be_nl
-      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   *os << "virtual void *_tao_QueryInterface (ptr_arith_t type);\n"
@@ -118,7 +118,7 @@ int be_visitor_interface_direct_collocated_sh::visit_interface (be_interface *no
 
   *os << "virtual CORBA::Boolean _non_existent" << be_idt
       << "(" << be_idt_nl
-      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   if (this->visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp
index 0d87db8e818..1d9bb2bb34f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_collocated_ss.cpp
@@ -105,10 +105,10 @@ int be_visitor_interface_direct_collocated_ss::visit_interface (be_interface *no
       << "_is_a"  << be_idt
       << "(" << be_idt_nl
       << "const CORBA::Char *logical_type_id" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl << be_nl;
   *os << "{" << be_idt_nl
-      << "return this->servant_->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);"
+      << "return this->servant_->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER);"
       << be_uidt_nl
       << "}\n\n" << be_uidt_nl;
 
@@ -155,10 +155,10 @@ int be_visitor_interface_direct_collocated_ss::visit_interface (be_interface *no
   *os << "CORBA::Boolean " << node->full_coll_name (be_interface::DIRECT) << "::"
       << "_non_existent"  << be_idt
       << "(" << be_idt_nl
-      << "TAO_ENV_SINGLE_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl << be_nl;
   *os << "{" << be_idt_nl
-      << "return this->servant_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);"
+      << "return this->servant_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);"
       << be_uidt_nl
       << "}\n\n" << be_uidt_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index aa9d82b1551..1bc260d140d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -176,7 +176,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
           << "static " << node->local_name () << "_ptr "
           << "_narrow (" << be_idt << be_idt_nl
           << "CORBA::Object_ptr obj" << be_nl
-          << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ");" << be_uidt_nl << be_nl;
 
       // There's no need for an _unchecked_narrow for locality
@@ -184,7 +184,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       *os << "static " << node->local_name () << "_ptr "
           << "_unchecked_narrow (" << be_idt << be_idt_nl
           << "CORBA::Object_ptr obj" << be_nl
-          << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ");" << be_uidt_nl << be_nl;
 
       // This method is defined in the header file to workaround old
@@ -218,7 +218,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
         {
           *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
               << "const CORBA::Char *type_id" << be_nl
-              << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+              << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
               << ");" << be_uidt_nl << be_nl;
         }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index bb569badd4f..57786ac89e7 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -101,11 +101,11 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << "tao_" << node->flat_name ()
       << "_narrow (" << be_idt << be_idt_nl
       << "CORBA::Object *p" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "return " << node->full_name ()
-      << "::_narrow (p TAO_ENV_ARG_PARAMETER);"
+      << "::_narrow (p ACE_ENV_ARG_PARAMETER);"
       << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -127,7 +127,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_interface_cs::"
                          "visit_interface - "
-                         "codegen for _var failed\n"), 
+                         "codegen for _var failed\n"),
                         -1);
     }
 
@@ -137,7 +137,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_interface_cs::"
                          "visit_interface - "
-                         "codegen for _out failed\n"), 
+                         "codegen for _out failed\n"),
                         -1);
     }
 
@@ -301,7 +301,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   *os << node->full_name () << "_ptr " << node->full_name ()
       << "::_narrow (" << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -316,7 +316,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << "if (! obj->_is_local ())" << be_idt_nl
           << "{" << be_idt_nl
           << "CORBA::Boolean is_a = obj->_is_a (\""
-          << node->repoID () << "\" TAO_ENV_ARG_PARAMETER);" << be_nl
+          << node->repoID () << "\" ACE_ENV_ARG_PARAMETER);" << be_nl
           << "ACE_CHECK_RETURN (" << bt->nested_type_name (this->ctx_->scope ())
           << "::_nil ());" << be_nl
           << "if (is_a == 0)" << be_idt_nl
@@ -326,7 +326,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     }
 
   *os << "return " << bt->nested_type_name (this->ctx_->scope ())
-      << "::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);" << be_uidt_nl
+      << "::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // The _unchecked_narrow method
@@ -335,7 +335,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << node->full_name () << "::_unchecked_narrow ("
       << be_idt << be_idt_nl
       << "CORBA::Object_ptr obj" << be_nl
-      << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "if (CORBA::is_nil (obj))" << be_idt_nl
@@ -452,7 +452,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       os->indent ();
       *os << "CORBA::Boolean " << node->full_name ()
           << "::_is_a ("
-          << "const CORBA::Char *value TAO_ENV_ARG_DECL)"
+          << "const CORBA::Char *value ACE_ENV_ARG_DECL)"
           << be_nl
           << "{\n";
 
@@ -475,7 +475,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       *os << "  return 1; // success using local knowledge\n";
       os->decr_indent ();
       *os << "else" << be_nl;
-      *os << "  return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);\n";
+      *os << "  return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);\n";
       os->decr_indent ();
       *os << "}\n\n";
     }
@@ -493,7 +493,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_interface_cs::"
                          "visit_interface - "
-                         "_tao_QueryInterface method codegen failed\n"), 
+                         "_tao_QueryInterface method codegen failed\n"),
                         -1);
     }
 
@@ -522,7 +522,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_interface_cs::"
                          "visit_interface - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index b0062f701ee..bbb32209225 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -146,7 +146,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << be_nl
       << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
       << "const char* logical_type_id" << be_nl
-      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   *os << "virtual void* _downcast (" << be_idt << be_idt_nl
@@ -158,7 +158,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
       << "void *servant_upcall" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   // Add a skeleton for our _non_existent method.
@@ -166,7 +166,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
       << "void *servant_upcall" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   // Add a skeleton for our _interface method.
@@ -174,14 +174,14 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
       << "void *servant_upcall" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   // Add the dispatch method.
   *os << "virtual void _dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *_servant_upcall" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");\n" << be_uidt_nl;
 
   this->this_method (node);
@@ -313,7 +313,7 @@ be_visitor_interface_sh::this_method (be_interface *node)
 
   // Print out the _this() method.
   *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt_nl
-      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");\n" << be_uidt;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index b6f3684674c..8686a4bf0ac 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -137,7 +137,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                          " copy ctor generation failed\n"),
                         -1);
     }
-    
+
 
 
   *os << "  TAO_ServantBase (rhs)" << be_uidt_nl
@@ -166,7 +166,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "TAO_ServerRequest &_tao_server_request, " << be_nl
       << "void * _tao_object_reference," << be_nl
       << "void * /* Servant_Upcall */" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << "TAO_InputCDR &_tao_in = _tao_server_request.incoming ();" << be_nl;
@@ -185,7 +185,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl << be_nl;
     }
 
-  *os << "_tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);"
+  *os << "_tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);"
       << be_nl;
   *os << "ACE_CHECK;" << be_nl << be_nl;
   *os << "_tao_server_request.init_reply ();" << be_nl;
@@ -212,13 +212,13 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "TAO_ServerRequest &_tao_server_request, " << be_nl
       << "void * _tao_object_reference," << be_nl
       << "void * /* Servant_Upcall */" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << full_skel_name << " *_tao_impl = ("
       << full_skel_name << " *) _tao_object_reference;" << be_nl;
   *os << "CORBA::Boolean _tao_retval =" << be_idt_nl
-      << "_tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);"
+      << "_tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);"
       << be_uidt_nl;
   *os << "ACE_CHECK;" << be_nl << be_nl;
   *os << "_tao_server_request.init_reply ();" << be_nl;
@@ -239,7 +239,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "TAO_ServerRequest &_tao_server_request, " << be_nl
       << "void * _tao_object_reference," << be_nl
       << "void * /* Servant_Upcall */" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << full_skel_name << " *_tao_impl = ("
@@ -258,7 +258,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   *os << "ACE_TRY" << be_idt_nl
       << "{" << be_idt_nl
       << "_tao_retval = " << be_idt_nl
-      << "_tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);"
+      << "_tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);"
       << be_uidt_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "_tao_server_request.init_reply ();" << be_nl << be_nl
@@ -286,7 +286,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   *os << "CORBA::Boolean " << full_skel_name
       << "::_is_a (" << be_idt << be_idt_nl
       << "const char* value" << be_nl
-      << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "const char *base_id = \"IDL:org.omg/CORBA/Object:1.0\";" << be_nl
@@ -360,9 +360,9 @@ be_visitor_interface_ss::this_method (be_interface *node)
   // the _this () operation
   *os << node->full_name () << "*" << be_nl
       << node->full_skel_name ()
-      << "::_this (TAO_ENV_SINGLE_ARG_DECL)" << be_nl
+      << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl
       << "{" << be_idt_nl // idt = 1
-      << "TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);"
+      << "TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);"
       << be_nl
       << "ACE_CHECK_RETURN (0);" << be_nl << be_nl
       << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl << be_nl;
@@ -398,13 +398,13 @@ be_visitor_interface_ss::dispatch_method (be_interface *node)
       << "::_dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *servant_upcall" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << "this->synchronous_upcall_dispatch (req," << be_nl
       << "                                   servant_upcall," << be_nl
       << "                                   this" << be_nl
-      << "                                   TAO_ENV_ARG_PARAMETER);"
+      << "                                   ACE_ENV_ARG_PARAMETER);"
       << be_uidt_nl;
   *os << "}" << be_nl << be_nl;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
index 61e98a47572..273530debd1 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
@@ -52,7 +52,7 @@ be_visitor_interface_remote_proxy_broker_ch::visit_interface (be_interface *node
       << be_idt << be_idt_nl;
 
   *os << node->local_name () << " *object" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_uidt_nl;
 
   *os << "private:" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
index 717fb8d85e5..93fa5e34089 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
@@ -77,7 +77,7 @@ be_visitor_interface_remote_proxy_broker_cs::visit_interface (be_interface *node
       <<node->full_remote_proxy_broker_name () << "::"
       << "select_proxy (" << be_idt_nl
       << "::" << node->full_name () << " *" << be_nl
-      << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")"
+      << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ")"
       << be_uidt_nl << "{" << be_idt_nl // idt = 1
       << "return this->remote_proxy_impl_;"
       << be_uidt_nl << "}" << be_nl << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
index f94b49ace25..fd4fd4987e8 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
@@ -80,7 +80,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
           << "_ptr create_proxy (" << be_idt << be_idt_nl
           << node->local_name ()
           << "_ptr proxy" << be_nl
-          << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
           << "};\n\n";
 
@@ -94,15 +94,15 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node)
           << "int register_proxy_factory (" << be_idt << be_idt_nl
           << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl
           << "int one_shot_factory = 1" << be_nl
-          << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ");" << be_uidt_nl << be_nl
           << "int unregister_proxy_factory (" << be_idt << be_idt_nl
-          << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+          << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ");" << be_uidt_nl << be_nl
           << node->local_name ()
           << "_ptr create_proxy (" << be_idt << be_idt_nl
           << node->local_name () << "_ptr proxy" << be_nl
-          << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl << be_nl
           << "protected:" << be_idt_nl
           << "TAO_" << node->flat_name ()
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
index 6fefb52088a..aed69607090 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
@@ -101,7 +101,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << "_Default_Proxy_Factory::create_proxy (" << be_idt << be_idt_nl
           << "::" << node->full_name ()
           << "_ptr proxy" << be_nl
-          << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
+          << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "return proxy;" << be_uidt << be_uidt_nl
@@ -151,14 +151,14 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << "TAO_" << node->flat_name ()
           << "_Default_Proxy_Factory *df," << be_idt_nl
           << " int one_shot_factory" << be_nl
-          << " TAO_ENV_ARG_DECL" << be_idt_nl
+          << " ACE_ENV_ARG_DECL" << be_idt_nl
           << ")" << be_uidt << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (ACE_GUARD_RETURN ("
           << "TAO_SYNCH_RECURSIVE_MUTEX, ace_mon," << be_idt_nl
           << "this->lock_, 0));" <<be_uidt_nl
           << "// Remove any existing <proxy_factory_> and replace with the new one."<<be_nl
-          << "this->unregister_proxy_factory (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl
+          << "this->unregister_proxy_factory (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl
           << "ACE_CHECK_RETURN (-1);" << be_nl
           << "this->proxy_factory_ = df;"<< be_nl
           << "this->one_shot_factory_ = one_shot_factory;" << be_uidt << be_uidt_nl
@@ -175,7 +175,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
 
       *os << "TAO_"<< node->flat_name ()
           << "_Proxy_Factory_Adapter::unregister_proxy_factory (" << be_idt_nl
-          << "TAO_ENV_SINGLE_ARG_DECL_NOT_USED" << be_idt_nl
+          << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_idt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (ACE_GUARD_RETURN ("
@@ -205,7 +205,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node)
           << "_Proxy_Factory_Adapter::create_proxy (" << be_idt << be_idt_nl
           << "::" << node->full_name ()
           << "_ptr proxy" << be_nl
-          << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
+          << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (ACE_GUARD_RETURN ("
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
index 6a861bcbacc..2b78387f443 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
@@ -48,7 +48,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (be_interface
   *os << "virtual " << "::" << node->full_base_proxy_impl_name () << " &" << "select_proxy (" << be_idt_nl;
 
   *os << "::" << node->full_name () << " *object" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
 
@@ -56,7 +56,7 @@ be_visitor_interface_strategized_proxy_broker_sh::visit_interface (be_interface
       << "// Helper methods that takes care to create the proxy" << be_nl
       << "// as soon as their use is necessary." << be_nl
       << "void create_proxy (" << be_idt_nl << "int collocation_strategy"
-      << be_nl << "TAO_ENV_ARG_DECL"
+      << be_nl << "ACE_ENV_ARG_DECL"
       << be_uidt_nl << ");"
       << be_nl << be_nl
       << "// Caches the proxy implementations. The proxy implementation" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
index e16ab575100..f67d173214d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
@@ -70,7 +70,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface
       << "select_proxy ("
       << be_idt << be_idt_nl // idt = 2
       << "::" << node->full_name () << " *object" << be_nl
-      << "TAO_ENV_ARG_DECL"
+      << "ACE_ENV_ARG_DECL"
       << be_uidt_nl // idt = 1
       << ")"
       << be_uidt_nl // idt = 0
@@ -78,7 +78,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface
       << be_idt_nl // idt = 1
       << "int strategy ="
       << be_idt_nl // idt = 2
-      << "TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);"
+      << "TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);"
       << be_nl
       << "ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);"
       << be_uidt_nl << be_nl // idt = 1
@@ -86,7 +86,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface
       << be_idt_nl // idt = 2
       << "return *this->proxy_cache_[strategy];"
       << be_uidt_nl << be_nl // idt = 1
-      << "this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);"
+      << "this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);"
       << be_nl
       << "ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);"
       << be_nl << be_nl
@@ -101,7 +101,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (be_interface
       << be_idt << be_idt_nl // idt = 2
       << "int strategy"
       << be_nl
-      << "TAO_ENV_ARG_DECL"
+      << "ACE_ENV_ARG_DECL"
       << be_uidt_nl // idt = 1
       << ")"
       << be_uidt_nl // idt = 0
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp
index e600e2e83a4..7193ad36241 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_sh.cpp
@@ -89,12 +89,12 @@ int be_visitor_interface_thru_poa_collocated_sh::visit_interface (be_interface *
   *os << "virtual CORBA::Boolean _is_a" << be_idt
       << "(" << be_idt_nl
       << "const CORBA::Char *logical_type_id" << be_nl
-      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   *os << "virtual CORBA::Boolean _non_existent" << be_idt
       << "(" << be_idt_nl
-      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   if (this->visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
index 277a6ec76e8..4a4c59bc34e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/thru_poa_collocated_ss.cpp
@@ -79,7 +79,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "_is_a"  << be_idt
       << "(" << be_idt_nl
       << "const CORBA::Char *logical_type_id" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl << be_nl
       << "{" << be_idt_nl;
   *os <<"TAO_Object_Adapter::Servant_Upcall servant_upcall ("
@@ -93,7 +93,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "this->_object_key ()," << be_nl
       << "\"" << "_is_a" << "\"," << be_nl
       << "forward_to.out ()" << be_nl
-      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt_nl
       << "ACE_CHECK_RETURN (0);" << be_nl;
   *os << "return ACE_reinterpret_cast (" << be_idt << be_idt_nl
@@ -101,14 +101,14 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "servant_upcall.servant ()->_downcast (" << be_idt << be_idt_nl
       << "\"" << node->repoID ()  << "\"" << be_uidt_nl
       << ")" << be_uidt << be_uidt_nl
-      << ")->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl
+      << ")->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl
       << "}" << be_uidt_nl << be_nl << be_nl;
 
   // Generate _non_existent implementation.
   *os << "CORBA::Boolean " << node->full_coll_name (be_interface::THRU_POA) << "::"
       << "_non_existent"  << be_idt
       << "(" << be_idt_nl
-      << "TAO_ENV_SINGLE_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl << be_nl
       << "{" << be_idt_nl;
   *os <<"TAO_Object_Adapter::Servant_Upcall servant_upcall ("
@@ -122,7 +122,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "this->_object_key ()," << be_nl
       << "\"" << "_non_existent" << "\"," << be_nl
       << "forward_to.out ()" << be_nl
-      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt_nl
       << "ACE_CHECK_RETURN (0);" << be_nl;
   *os << "return ACE_reinterpret_cast (" << be_idt << be_idt_nl
@@ -130,7 +130,7 @@ int be_visitor_interface_thru_poa_collocated_ss::visit_interface (be_interface *
       << "servant_upcall.servant ()->_downcast (" << be_idt << be_idt_nl
       << "\"" << node->repoID ()  << "\"" << be_uidt_nl
       << ")" << be_uidt << be_uidt_nl
-      << ")->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt << be_uidt_nl
+      << ")->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt << be_uidt_nl
       << "}" << be_uidt_nl << be_nl << be_nl;
 
   if (this->visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
index 38fe9b00cf7..d8ecbb5d5a6 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_interface.h"
 
@@ -118,7 +118,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "// set the ownership" << be_nl << be_nl
       << "// overridden ServantBase operations" << be_nl
       << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt_nl
-      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt << "\n";
 
   if (node->traverse_inheritance_graph (
@@ -148,8 +148,8 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
 
 int
 be_visitor_interface_tie_sh::method_helper (be_interface *,
-					                                  be_interface *node,
-					                                  TAO_OutStream *os)
+                                                                          be_interface *node,
+                                                                          TAO_OutStream *os)
 {
   be_visitor_context ctx;
   ctx.state (TAO_CodeGen::TAO_INTERFACE_TIE_SH);
@@ -161,8 +161,8 @@ be_visitor_interface_tie_sh::method_helper (be_interface *,
     {
       delete visitor;
       ACE_ERROR_RETURN ((LM_ERROR,
-			 "be_visitor_interface_tie_sh::"
-			 "method_helper\n"), -1);
+                         "be_visitor_interface_tie_sh::"
+                         "method_helper\n"), -1);
     }
 
   delete visitor;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
index b3256a1274c..7a42da46f21 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
 
 #include "be_visitor_interface.h"
 
@@ -161,13 +161,13 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
   *os << "template <class T> ACE_INLINE "
       << "PortableServer::POA_ptr" << be_nl
       << fulltiename
-      << "<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)" << be_nl
+      << "<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)" << be_nl
       << "{" << be_idt_nl
       << "if (!CORBA::is_nil (this->poa_.in ()))" << be_idt_nl
       << "return PortableServer::POA::_duplicate (this->poa_.in ());\n"
       << be_uidt_nl
       << "return this->" << localskelname
-      << "::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl
+      << "::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl
       << "}\n\n";
 
   if (node->traverse_inheritance_graph (be_visitor_interface_tie_si::method_helper, os) == -1)
@@ -189,8 +189,8 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
 
 int
 be_visitor_interface_tie_si::method_helper (be_interface *derived,
-					    be_interface *node,
-					    TAO_OutStream *os)
+                                            be_interface *node,
+                                            TAO_OutStream *os)
 {
   be_visitor_context ctx;
   ctx.state (TAO_CodeGen::TAO_INTERFACE_TIE_SI);
@@ -202,8 +202,8 @@ be_visitor_interface_tie_si::method_helper (be_interface *derived,
     {
       delete visitor;
       ACE_ERROR_RETURN ((LM_ERROR,
-			 "be_visitor_interface_tie_sh::"
-			 "method_helper\n"), -1);
+                         "be_visitor_interface_tie_sh::"
+                         "method_helper\n"), -1);
     }
   delete visitor;
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
index 2b53e07ae24..3df34d98d0d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
@@ -84,7 +84,7 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node)
         }
       *os << be_nl;
     }
-  *os << "TAO_ENV_ARG_DECL"
+  *os << "ACE_ENV_ARG_DECL"
       << be_uidt_nl << ")" << be_uidt;
 
   if (be_global->use_raw_throw ())
@@ -116,7 +116,7 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node)
 
   if (!be_global->exception_support ())
     {
-      *os << "TAO_ENV_SINGLE_ARG_DECL";
+      *os << "ACE_ENV_SINGLE_ARG_DECL";
     }
   *os << be_uidt_nl << ")" << be_uidt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException)) = 0;\n" << be_nl;
@@ -141,7 +141,7 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node)
 
   if (!be_global->exception_support ())
     {
-      *os << be_nl << "TAO_ENV_SINGLE_ARG_DECL";
+      *os << be_nl << "ACE_ENV_SINGLE_ARG_DECL";
     }
   *os << be_uidt_nl << ")" << be_uidt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException)) = 0;\n" << be_nl;
@@ -164,7 +164,7 @@ be_visitor_amh_operation_sh::generate_shared_prologue (be_decl *node,
       << "TAO_ServerRequest &_tao_req," << be_nl
       << "void *_tao_obj," << be_nl
       << "void *_tao_servant_upcall" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt << "\n\n";
 
   // We need the interface node in which this operation was defined. However,
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
index 7b5774e86b8..73a0a577385 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -153,7 +153,7 @@ be_visitor_amh_operation_ss::visit_operation (be_operation *node)
           }
         *os << be_nl;
       }
-    *os << "TAO_ENV_ARG_PARAMETER";
+    *os << "ACE_ENV_ARG_PARAMETER";
   }
 
   if (this->generate_shared_epilogue (os) == -1)
@@ -175,7 +175,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
   if (this->generate_shared_section (node, os) == -1)
     return -1;
 
-  *os << "TAO_ENV_ARG_PARAMETER";
+  *os << "ACE_ENV_ARG_PARAMETER";
 
   if (this->generate_shared_epilogue (os) == -1)
     return -1;
@@ -231,7 +231,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
     return -1;
 
   *os << ", " << node->local_name ()
-      << be_nl << "TAO_ENV_ARG_PARAMETER";
+      << be_nl << "ACE_ENV_ARG_PARAMETER";
 
   if (this->generate_shared_epilogue (os) == -1)
     return -1;
@@ -278,11 +278,11 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node,
       << "TAO_ServerRequest &_tao_server_request," << be_nl
       << "void *_tao_object_reference, " << be_nl
       << "void * /* context */ " << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl;
 
   // Generate the actual code for the skeleton.
-  // last argument - is always TAO_ENV_ARG_PARAMETER.
+  // last argument - is always ACE_ENV_ARG_PARAMETER.
   *os << "{" << be_idt_nl;
 
   // Get the right object implementation.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
index 51e3fc4eb7b..a8577a4ac25 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -120,7 +120,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node)
 
   // Generate the actual code for the stub. However, if any of the argument
   // types is "native", we flag a MARSHAL exception.
-  // last argument - is always TAO_ENV_ARG_PARAMETER
+  // last argument - is always ACE_ENV_ARG_PARAMETER
   *os << "{" << be_idt_nl;
 
   *os << this->gen_environment_var () << be_nl;
@@ -392,7 +392,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node
       << "for (;;)" << be_nl
       << "{" << be_idt_nl;
 
-  *os << "_tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl;
+  *os << "_tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl;
   // Check if there is an exception.
   // Return type is void, so we know what to generate here.
   *os << "ACE_CHECK;" << be_nl;
@@ -412,7 +412,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node
 
   *os << be_nl
       << "_tao_call.prepare_header (" << be_idt << be_idt_nl
-      << "ACE_static_cast (CORBA::Octet, _tao_response_flag) TAO_ENV_ARG_PARAMETER"
+      << "ACE_static_cast (CORBA::Octet, _tao_response_flag) ACE_ENV_ARG_PARAMETER"
       << be_uidt_nl << ");" << be_uidt << "\n";
 
   // Now make sure that we have some in and inout
@@ -456,7 +456,7 @@ be_compiled_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node
     }
 
   *os << be_nl
-      << "int _invoke_status = _tao_call.invoke (TAO_ENV_SINGLE_ARG_PARAMETER);";
+      << "int _invoke_status = _tao_call.invoke (ACE_ENV_SINGLE_ARG_PARAMETER);";
 
   *os << be_uidt_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
index 7515239ac77..8bf51c89647 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
@@ -104,7 +104,7 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (be_oper
   *os << node->local_name () << "(";
 
   if (!be_global->exception_support ())
-    *os << "TAO_ENV_SINGLE_ARG_DECL";
+    *os << "ACE_ENV_SINGLE_ARG_DECL";
 
   *os << ")" << be_uidt;
 
@@ -176,7 +176,7 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (be_oper
       << "this->marshaled_exception ().length ()," << be_nl
       << "this->byte_order ()," << be_nl
       << "this->is_system_exception ()" << be_nl
-      << "TAO_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl;
+      << "ACE_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl;
 
   *os << "}\n\n";
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
index e5a8b2c763a..64ed89f8ce9 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
@@ -80,7 +80,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_ch::visit_operation (be_op
           << "CORBA::ULong reply_status";
 
       *os << be_nl
-          << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ");" << be_uidt_nl << be_nl;
     }
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index 599429e8e43..1220c388552 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -113,13 +113,13 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (be_op
       << "CORBA::ULong reply_status";
 
   *os << be_nl
-      << "TAO_ENV_ARG_DECL";
+      << "ACE_ENV_ARG_DECL";
 
   *os << ")" << be_uidt << be_uidt_nl;
 
   // Generate the actual code for the stub. However, if any of the argument
   // types is "native", we flag a MARSHAL exception.
-  // last argument - is always TAO_ENV_ARG_PARAMETER
+  // last argument - is always ACE_ENV_ARG_PARAMETER
   *os << "{\n" << be_idt;
 
   // Generate any pre stub info if and only if none of our parameters is of the
@@ -148,7 +148,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (be_op
       << "_tao_reply_handler_object =" << be_idt_nl;
 
   *os << parent->full_name ();
-  *os << "::_narrow(_tao_reply_handler TAO_ENV_ARG_PARAMETER);" << be_uidt_nl;
+  *os << "::_narrow(_tao_reply_handler ACE_ENV_ARG_PARAMETER);" << be_uidt_nl;
 
   *os << "ACE_CHECK;" << be_nl << be_nl
       << "// Exception handling" << be_nl
@@ -249,7 +249,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (be_op
 
   if (!be_global->exception_support ())
     {
-      *os << " TAO_ENV_ARG_PARAMETER";
+      *os << " ACE_ENV_ARG_PARAMETER";
     }
 
   *os << be_uidt_nl << ");" << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
index 0b5b69678dd..79fe13e262c 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
@@ -85,7 +85,7 @@ be_visitor_operation_argument::visit_operation (be_operation *node)
     }
 
   // if we are supporting the alternate mapping, we must pass the
-  // TAO_ENV_ARG_PARAMETER as the last parameter
+  // ACE_ENV_ARG_PARAMETER as the last parameter
   if (!be_global->exception_support ())
     {
       switch (this->ctx_->state ())
@@ -94,12 +94,12 @@ be_visitor_operation_argument::visit_operation (be_operation *node)
         case TAO_CodeGen::TAO_OPERATION_COLLOCATED_ARG_UPCALL_SS:
           // applicable only to these cases where the actual upcall is made
 
-          // Use TAO_ENV_SINGLE_ARG_DECL or TAO_ENV_ARG_DECL depending on
+          // Use ACE_ENV_SINGLE_ARG_DECL or ACE_ENV_ARG_DECL depending on
           // whether the operation node has parameters.
           if (node->argument_count () > 0)
-            *os << " TAO_ENV_ARG_PARAMETER";
+            *os << " ACE_ENV_ARG_PARAMETER";
           else
-            *os << "TAO_ENV_SINGLE_ARG_PARAMETER";
+            *os << "ACE_ENV_SINGLE_ARG_PARAMETER";
           break;
         default:
           break;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp
index 27fc52b8574..27499952058 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_arglist.cpp
@@ -58,7 +58,7 @@ be_visitor_operation_interceptors_arglist::visit_operation (be_operation *node)
                         -1);
     }
 
-  // generate the TAO_ENV_ARG_PARAMETER for the alternative mapping
+  // generate the ACE_ENV_ARG_PARAMETER for the alternative mapping
   if (!be_global->exception_support ())
     {
       switch (this->ctx_->state ())
@@ -73,14 +73,14 @@ be_visitor_operation_interceptors_arglist::visit_operation (be_operation *node)
         case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_CS:
         case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_SS:
           {
-            *os << " TAO_ENV_ARG_PARAMETER";
+            *os << " ACE_ENV_ARG_PARAMETER";
             break;
           }
         case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARGLIST_CS:
         case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARGLIST_SS:
           {
            // last argument - is always CORBA::Environment
-            *os << " TAO_ENV_ARG_DECL_NOT_USED";
+            *os << " ACE_ENV_ARG_DECL_NOT_USED";
             break;
           }
         case TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_ARGLIST_CH:
@@ -89,7 +89,7 @@ be_visitor_operation_interceptors_arglist::visit_operation (be_operation *node)
               // @@ Do it for all cases i.e arg count > = 0
 
               // last argument - is always CORBA::Environment
-              *os << " TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl;
+              *os << " ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl;
               break;
             }
         default:
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
index 2979bc2edc5..122e9f3784c 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_cs.cpp
@@ -185,17 +185,17 @@ be_visitor_operation_interceptors_cs::
 
   // Here I still need to generate the other methods + private args.
   *os << "virtual Dynamic::ParameterList * arguments "
-      << "(TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl
+      << "(ACE_ENV_SINGLE_ARG_DECL)" << be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));"
       << be_uidt_nl << be_nl;
 
   *os << "virtual Dynamic::ExceptionList * exceptions "
-      << "(TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl
+      << "(ACE_ENV_SINGLE_ARG_DECL)" << be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));"
       << be_uidt_nl << be_nl;
 
   *os << "virtual CORBA::Any * result "
-      << "(TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl
+      << "(ACE_ENV_SINGLE_ARG_DECL)" << be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));\n"
       << be_uidt;
 
@@ -574,7 +574,7 @@ be_visitor_operation_interceptors_cs::
         }
     }
 
-  *os << "::arguments (TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl
+  *os << "::arguments (ACE_ENV_SINGLE_ARG_DECL)" << be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))"<<  be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -582,7 +582,7 @@ be_visitor_operation_interceptors_cs::
     {
       *os << "// Generate the argument list on demand." << be_nl
           << "Dynamic::ParameterList *parameter_list ="  << be_idt_nl
-          << "TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);"
+          << "TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);"
           << be_uidt_nl
           << "ACE_CHECK_RETURN (0);" << be_nl
           << be_nl;
@@ -693,7 +693,7 @@ be_visitor_operation_interceptors_cs::
         }
     }
 
-  *os << "::exceptions (TAO_ENV_SINGLE_ARG_DECL)"<< be_idt_nl
+  *os << "::exceptions (ACE_ENV_SINGLE_ARG_DECL)"<< be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -701,7 +701,7 @@ be_visitor_operation_interceptors_cs::
     {
       *os << "// Generate the exception list on demand." << be_nl
           << "Dynamic::ExceptionList *exception_list ="  << be_idt_nl
-          << "TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);"
+          << "TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);"
           << be_uidt_nl
           << "ACE_CHECK_RETURN (0);" << be_nl
           << be_nl;
@@ -790,7 +790,7 @@ be_visitor_operation_interceptors_cs::
         }
     }
 
-  *os << "::result (TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl
+  *os << "::result (ACE_ENV_SINGLE_ARG_DECL)" << be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -805,7 +805,7 @@ be_visitor_operation_interceptors_cs::
           // Return an Any with tk_void TypeCode.
           *os << "CORBA::Boolean tk_void_any = 1;" << be_nl
               << "CORBA::Any *result_any ="  << be_idt_nl
-              << "TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);"
+              << "TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);"
               << be_uidt_nl
               << "ACE_CHECK_RETURN (0);" << be_nl
               << be_nl
@@ -815,7 +815,7 @@ be_visitor_operation_interceptors_cs::
         {
           *os << "CORBA::Boolean tk_void_any = 0;" << be_nl
               << "CORBA::Any *result_any ="  << be_idt_nl
-              << "TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);"
+              << "TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);"
               << be_uidt_nl
               << "ACE_CHECK_RETURN (0);" << be_nl
               << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
index 0b141fb00f6..d651e62e77f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
@@ -199,35 +199,35 @@ be_visitor_operation_interceptors_ss::
   // Here I still need to generate the other methods + private args
   *os << "virtual Dynamic::ParameterList * arguments ("
       << be_idt << be_idt_nl
-      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));"
       << be_uidt_nl << be_nl;
 
   *os << "virtual Dynamic::ExceptionList * exceptions ("
       << be_idt << be_idt_nl
-      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));"
       << be_uidt_nl << be_nl;
 
   *os << "virtual CORBA::Any * result ("
       << be_idt << be_idt_nl
-      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));"
       << be_uidt_nl << be_nl;
 
   *os << "virtual char * target_most_derived_interface ("
       << be_idt << be_idt_nl
-      << "TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)"
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)"
       << be_uidt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));"
       << be_uidt_nl << be_nl;
 
   *os << "virtual CORBA::Boolean target_is_a (" << be_idt << be_idt_nl
       << "const char * id" << be_nl
-      << "TAO_ENV_ARG_DECL_WITH_DEFAULTS)"
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS)"
       << be_uidt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException));\n"
       << be_uidt_nl;
@@ -635,12 +635,12 @@ be_visitor_operation_interceptors_ss::
         }
     }
 
-  *os << "::arguments (TAO_ENV_SINGLE_ARG_DECL)" << be_idt_nl
+  *os << "::arguments (ACE_ENV_SINGLE_ARG_DECL)" << be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl
       << "// Generate the argument list on demand." << be_nl
       << "Dynamic::ParameterList *parameter_list ="  << be_idt_nl
-      << "TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);"
+      << "TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);"
       << be_uidt_nl
       << "ACE_CHECK_RETURN (0);" << be_nl
       << be_nl;
@@ -737,7 +737,7 @@ be_visitor_operation_interceptors_ss::
         }
     }
 
-  *os << "::exceptions (TAO_ENV_SINGLE_ARG_DECL)"<< be_idt_nl
+  *os << "::exceptions (ACE_ENV_SINGLE_ARG_DECL)"<< be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -745,7 +745,7 @@ be_visitor_operation_interceptors_ss::
     {
       *os << "// Generate the exception list on demand." << be_nl
           << "Dynamic::ExceptionList *exception_list ="  << be_idt_nl
-          << "TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);"
+          << "TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);"
           << be_uidt_nl
           << "ACE_CHECK_RETURN (0);" << be_nl
           << be_nl;
@@ -834,7 +834,7 @@ be_visitor_operation_interceptors_ss::
         }
     }
 
-  *os << "::result (TAO_ENV_SINGLE_ARG_DECL)"<< be_idt_nl
+  *os << "::result (ACE_ENV_SINGLE_ARG_DECL)"<< be_idt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -849,7 +849,7 @@ be_visitor_operation_interceptors_ss::
           // Return an Any with tk_void TypeCode.
           *os << "CORBA::Boolean tk_void_any = 1;" << be_nl
               << "CORBA::Any *result_any ="  << be_idt_nl
-              << "TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);"
+              << "TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);"
               << be_uidt_nl
               << "ACE_CHECK_RETURN (0);" << be_nl
               << be_nl
@@ -859,7 +859,7 @@ be_visitor_operation_interceptors_ss::
         {
           *os << "CORBA::Boolean tk_void_any = 0;" << be_nl
               << "CORBA::Any *result_any ="  << be_idt_nl
-              << "TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);"
+              << "TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);"
               << be_uidt_nl
               << "ACE_CHECK_RETURN (0);" << be_nl
               << be_nl
@@ -941,7 +941,7 @@ be_visitor_operation_interceptors_ss::
 
   *os << "::target_most_derived_interface ("
       << be_idt << be_idt_nl
-      << "TAO_ENV_SINGLE_ARG_DECL_NOT_USED)" << be_uidt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED)" << be_uidt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl
       << "return" << be_idt_nl
@@ -987,10 +987,10 @@ be_visitor_operation_interceptors_ss::
 
   *os << "::target_is_a (" << be_idt << be_idt_nl
       << "const char * id" << be_nl
-      << "TAO_ENV_ARG_DECL)" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL)" << be_uidt_nl
       << "ACE_THROW_SPEC ((CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl
-      << "return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);"
+      << "return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);"
       << be_uidt_nl << "}" << be_nl << be_nl;
 
   // -----------------------------------------------------------------
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index 1a4df226278..05dddecb079 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -161,11 +161,11 @@ be_visitor_operation::gen_environment_decl (int argument_emitted,
   if (be_global->exception_support ())
     return 0;
 
-  // Use TAO_ENV_SINGLE_ARG_DECL or TAO_ENV_ARG_DECL depending on
+  // Use ACE_ENV_SINGLE_ARG_DECL or ACE_ENV_ARG_DECL depending on
   // whether the operation node has parameters.
-  const char *env_decl = "TAO_ENV_SINGLE_ARG_DECL";
+  const char *env_decl = "ACE_ENV_SINGLE_ARG_DECL";
   if (argument_emitted || node->argument_count () > 0)
-    env_decl = "TAO_ENV_ARG_DECL";
+    env_decl = "ACE_ENV_ARG_DECL";
 
   *os << be_nl;
   switch (this->ctx_->state ())
@@ -180,7 +180,7 @@ be_visitor_operation::gen_environment_decl (int argument_emitted,
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_PROXY_IMPL_XH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_BASE_PROXY_IMPL_CH:
-      // last argument - is always TAO_ENV_ARG_DECL
+      // last argument - is always ACE_ENV_ARG_DECL
       *os << env_decl;
       break;
     default:
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
index 829cf9a36b7..7b3d8a12ab8 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -171,7 +171,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
 
   *os << intf->base_proxy_impl_name () << " &proxy = " << be_idt_nl
       << "this->the" << intf->base_proxy_broker_name ()
-      << "_->select_proxy (this TAO_ENV_ARG_PARAMETER);" << be_uidt_nl;
+      << "_->select_proxy (this ACE_ENV_ARG_PARAMETER);" << be_uidt_nl;
 
   if (!this->void_return_type (bt))
     {
@@ -249,7 +249,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
 
   if (!be_global->exception_support ())
     {
-      *os << " TAO_ENV_ARG_PARAMETER";
+      *os << " ACE_ENV_ARG_PARAMETER";
     }
 
   *os << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}\n\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
index 0aa4c6c2729..096fc8a6633 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
@@ -138,7 +138,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node)
           << "TAO_ServerRequest &_tao_req," << be_nl
           << "void *_tao_obj," << be_nl
           << "void *_tao_servant_upcall" << be_nl
-          << "TAO_ENV_ARG_DECL" << be_uidt_nl
+          << "ACE_ENV_ARG_DECL" << be_uidt_nl
           << ");" << be_uidt << "\n\n";
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index 35606d79667..af39de154e1 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -127,7 +127,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
       << "TAO_ServerRequest &_tao_server_request," << be_nl
       << "void *_tao_object_reference," << be_nl
       << "void *_tao_servant_upcall" << be_nl
-      << "TAO_ENV_ARG_DECL" << be_uidt_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl;
 
   // Generate the actual code for the skeleton. However, if any of the argument
@@ -295,7 +295,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
       << be_nl << be_nl;
 
   // Invoke the receive_request() interception point.
-  *os << "_tao_vfr.receive_request (&_tao_ri TAO_ENV_ARG_PARAMETER);" << be_nl
+  *os << "_tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl;
 
   *os << "\n#endif /* TAO_HAS_INTERCEPTORS */\n";
@@ -404,7 +404,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
     }
 
   *os << "_tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);" << be_nl
-      << "_tao_vfr.send_reply (&_tao_ri TAO_ENV_ARG_PARAMETER);"<< be_nl
+      << "_tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);"<< be_nl
           << "ACE_TRY_CHECK;" << be_uidt_nl;
 
   *os << "}" << be_uidt_nl
@@ -414,7 +414,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   *os << "_tao_ri.exception (&ACE_ANY_EXCEPTION);"<< be_nl
       << "_tao_vfr.send_exception (" << be_idt << be_idt_nl
       << "&_tao_ri" << be_nl
-      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt_nl
       << "ACE_TRY_CHECK;" << be_nl;
 
@@ -423,7 +423,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   // exception.
   *os << be_nl
       << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
-      << "_tao_ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl
+      << "_tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl
       << "ACE_TRY_CHECK;" << be_nl;
 
   *os << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
index 969b8c081c1..9e0cefca478 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
@@ -103,7 +103,7 @@ be_visitor_operation_remote_proxy_impl_cs::visit_operation (be_operation *node)
 
   // Generate the actual code for the stub. However, if any of the argument
   // types is "native", we flag a MARSHAL exception.
-  // last argument - is always TAO_ENV_ARG_PARAMETER
+  // last argument - is always ACE_ENV_ARG_PARAMETER
   *os << "{" << be_idt_nl;
 
 /* This shall go away as soon as we drop the include_env switch
@@ -467,7 +467,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
   // i.e. this is an optimization.
   *os << "_tao_vfr.send_request (" << be_idt_nl
       << "&_tao_ri" << be_nl
-      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_nl
       << "ACE_TRY_CHECK;" << be_nl;
 
@@ -493,7 +493,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
 
 
   *os << be_nl
-      << "_tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_nl;
+      << "_tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl;
   // check if there is an exception
   if (this->gen_check_interceptor_exception (bt) == -1)
     {
@@ -507,7 +507,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
  *os << be_nl
       << "_tao_call.prepare_header (" << be_idt << be_idt_nl
       << "ACE_static_cast (CORBA::Octet, _tao_response_flag)" << be_nl
-      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt_nl;
   // check if there is an exception
 
@@ -569,7 +569,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
   if (node->flags () == AST_Operation::OP_oneway)
     {
       // Oneway operation.
-      *os << "_tao_call.invoke (TAO_ENV_SINGLE_ARG_PARAMETER);";
+      *os << "_tao_call.invoke (ACE_ENV_SINGLE_ARG_PARAMETER);";
     }
   else
     {
@@ -578,11 +578,11 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
           *os << "_tao_call.invoke (_tao_" << node->flat_name ()
               << "_exceptiondata, "
               << node->exceptions ()->length ()
-              << " TAO_ENV_ARG_PARAMETER);";
+              << " ACE_ENV_ARG_PARAMETER);";
         }
       else
         {
-          *os << "_tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);";
+          *os << "_tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);";
         }
     }
 
@@ -626,7 +626,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
       << "_tao_ri.reply_status (_invoke_status);" << be_nl
       << "_tao_vfr.receive_other (" << be_idt_nl
       << "&_tao_ri" << be_nl
-      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_nl
       << "ACE_TRY_CHECK;" << be_uidt_nl
       << ")" << be_nl
@@ -811,7 +811,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
           << "_tao_ri.reply_status (_invoke_status);" << be_nl
           << "_tao_vfr.receive_reply (" << be_idt_nl
           << "&_tao_ri" << be_nl
-          << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+          << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
           << ");" << be_nl;
     }
   else if (node->flags () == AST_Operation::OP_oneway)
@@ -821,7 +821,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
           << "_tao_ri.reply_status (_invoke_status);" << be_nl
           << "_tao_vfr.receive_other (" << be_idt_nl
           << "&_tao_ri" << be_nl
-          << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+          << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
           << ");" << be_nl;
     }
 
@@ -844,7 +844,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
 
   *os << "_tao_vfr.receive_exception (" << be_idt_nl
       << "&_tao_ri" << be_nl
-      << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_nl
       << "ACE_TRY_CHECK;" << be_nl;
 
@@ -854,7 +854,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
   // caught exception.
   *os << be_nl
       << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
-      << "_tao_ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl
+      << "_tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl
       << "ACE_TRY_CHECK;" << be_nl;
 
   *os << be_nl
@@ -887,7 +887,7 @@ be_visitor_operation_remote_proxy_impl_cs::gen_marshal_and_invoke (
   // ClientRequestInfo object.
   *os << be_nl
       << "PortableInterceptor::ReplyStatus _tao_status =" << be_idt_nl
-      << "_tao_ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl;
+      << "_tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_uidt_nl;
 
   if (this->gen_check_exception (bt) == -1)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp
index 2b67da969ad..45a3a6b8d77 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_collocated_ss.cpp
@@ -140,7 +140,7 @@ int be_visitor_operation_thru_poa_collocated_ss::visit_operation (be_operation *
       << "\"" << node->original_local_name () << "\"," << be_nl
       << "forward_to.out ()";
   if (!be_global->exception_support ())
-    *os << " TAO_ENV_ARG_PARAMETER);\n" << be_uidt_nl << be_uidt;
+    *os << " ACE_ENV_ARG_PARAMETER);\n" << be_uidt_nl << be_uidt;
   else
     *os << be_uidt_nl << ");\n" << be_uidt;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
index 8d2b61b6eae..84fdaac5823 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
@@ -149,7 +149,7 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation (be_operation *node
       << "forward_to.out ()";
   if (!be_global->exception_support ())
     *os << be_nl
-        << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl
+        << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
         << ");" << be_nl << be_uidt;
   else
     *os << be_uidt_nl << ");" << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index 608ac0254ab..2bea93a0734 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -129,7 +129,7 @@ int be_visitor_root::visit_root (be_root *node)
               << "tao_" << ifwd->flat_name ()
               << "_narrow (" << be_idt << be_idt_nl
               << "CORBA::Object *" << be_nl
-              << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
+              << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
               << ");" << be_uidt_nl
               << be_global->stub_export_macro () << be_nl
               << "CORBA::Object *" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
index 08eb44a58a0..5f832013e69 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
@@ -102,7 +102,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
       << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-      << " TAO_ENV_ARG_PARAMETER);" << be_nl
+      << " ACE_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "if (!result)" << be_idt_nl
       << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
index ffdbd9d742d..460cb93d1bc 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
@@ -191,7 +191,7 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
       *os << "virtual void _downcast (" << be_idt << be_idt_nl
                 << "void* target," << be_nl
                 << "CORBA_Object *src" << be_nl
-                << "TAO_ENV_ARG_DECL_WITH_DEFAULTS"  << be_uidt_nl
+                << "ACE_ENV_ARG_DECL_WITH_DEFAULTS"  << be_uidt_nl
                 << ");" << be_uidt_nl;
 
       *os << "virtual CORBA_Object* _upcast (void *src) const;";
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
index 09ca692b39e..f144dd55c62 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
@@ -230,7 +230,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
           << full_class_name << "::_downcast (" << be_idt << be_idt_nl
                 << "void* target," << be_nl
                 << "CORBA_Object *src" << be_nl
-                << "TAO_ENV_ARG_DECL" << be_uidt_nl
+                << "ACE_ENV_ARG_DECL" << be_uidt_nl
                 << ")" << be_uidt_nl
                 << "{" << be_idt_nl;
 
@@ -247,12 +247,12 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
         {
           bt->accept (visitor);
 
-          *os << "::_narrow (src TAO_ENV_ARG_PARAMETER);";
+          *os << "::_narrow (src ACE_ENV_ARG_PARAMETER);";
         }
       else
         {
           *os << "tao_" << pt->flat_name ()
-              << "_narrow (src TAO_ENV_ARG_PARAMETER);";
+              << "_narrow (src ACE_ENV_ARG_PARAMETER);";
         }
 
       *os << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
index e2f621e3aff..d7b421b58d7 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
@@ -196,7 +196,7 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
       *os << "virtual void _downcast (" << be_idt << be_idt_nl
                 << "void* target," << be_nl
                 << "CORBA_Object *src" << be_nl
-                << "TAO_ENV_ARG_DECL_WITH_DEFAULTS"  << be_uidt_nl
+                << "ACE_ENV_ARG_DECL_WITH_DEFAULTS"  << be_uidt_nl
                 << ");" << be_uidt_nl;
 
       *os << "virtual CORBA_Object* _upcast (void *src) const;";
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
index 00d7afbae3b..b9e9880dbdd 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
@@ -300,7 +300,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
           << full_class_name << "::_downcast (" << be_idt << be_idt_nl
                 << "void* target," << be_nl
                 << "CORBA_Object *src" << be_nl
-                << "TAO_ENV_ARG_DECL" << be_uidt_nl
+                << "ACE_ENV_ARG_DECL" << be_uidt_nl
                 << ")" << be_uidt_nl
                 << "{" << be_idt_nl;
 
@@ -317,12 +317,12 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
         {
           bt->accept (visitor);
 
-          *os << "::_narrow (src TAO_ENV_ARG_PARAMETER);";
+          *os << "::_narrow (src ACE_ENV_ARG_PARAMETER);";
         }
       else
         {
           *os << "tao_" << pt->flat_name ()
-              << "_narrow (src TAO_ENV_ARG_PARAMETER);";
+              << "_narrow (src ACE_ENV_ARG_PARAMETER);";
         }
 
       *os << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
index fbb5cac423f..76635942a48 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
@@ -97,7 +97,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << "{" << be_idt_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
       << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-      << " TAO_ENV_ARG_PARAMETER);" << be_nl
+      << " ACE_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "if (!result)" << be_idt_nl
       << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
index f91f85da940..560aa5bab7c 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
@@ -110,7 +110,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << "{" << be_idt_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
       << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-      << " TAO_ENV_ARG_PARAMETER);" << be_nl
+      << " ACE_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "if (!result)" << be_idt_nl
       << "return 0; // not equivalent" << be_uidt_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
index e4d67bf3c2a..495807a45f9 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
@@ -73,7 +73,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
 
   *os << be_global->stub_export_macro () << "void" << be_nl
       << "operator<<= (CORBA::Any &any, " << node->name ()
-      << " **value) // non-copying" << be_nl  
+      << " **value) // non-copying" << be_nl
       << "{" << be_idt_nl
       << "TAO_OutputCDR stream;" << be_nl
       << "if (stream << *value)" << be_nl
@@ -84,7 +84,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << "stream.begin ()," << be_nl
       << "1," << be_nl
       << "*value," << be_nl
-      << node->name () << "::_tao_any_destructor);" 
+      << node->name () << "::_tao_any_destructor);"
       << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl << be_nl;
@@ -99,7 +99,7 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << "value = 0;" << be_nl
       << "CORBA::TypeCode_var type = any.type ();" << be_nl << be_nl
       << "CORBA::Boolean result = type->equivalent (" << node->tc_name ()
-      << " TAO_ENV_ARG_PARAMETER);" << be_nl
+      << " ACE_ENV_ARG_PARAMETER);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl << be_nl
       << "if (!result)" << be_nl
       << "{" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
index dd6db9e8716..b53c4daf8be 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
@@ -62,24 +62,24 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
                         -1);
     }
 
-  // Generate the TAO_ENV_ARG_DECL parameter for the alternative mapping.
+  // Generate the ACE_ENV_ARG_DECL parameter for the alternative mapping.
   if (!be_global->exception_support ())
     {
-      // Use TAO_ENV_SINGLE_ARG_DECL or TAO_ENV_ARG_DECL depending on
+      // Use ACE_ENV_SINGLE_ARG_DECL or ACE_ENV_ARG_DECL depending on
       // whether the operation node has parameters.
       const char *env_decl = (node->argument_count () > 0 ?
-                              " TAO_ENV_ARG_DECL" : "TAO_ENV_SINGLE_ARG_DECL");
+                              " ACE_ENV_ARG_DECL" : "ACE_ENV_SINGLE_ARG_DECL");
 
       switch (this->ctx_->state ())
         {
         case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH:
         case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_OBV_CH:
         case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IMPL_CH:
-          // Last argument - is always TAO_ENV_ARG_DECL.
+          // Last argument - is always ACE_ENV_ARG_DECL.
           *os << env_decl << "_WITH_DEFAULTS" << be_uidt_nl;
           break;
         case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IMPL_CS:
-          // Last argument - is always TAO_ENV_ARG_DECL.
+          // Last argument - is always ACE_ENV_ARG_DECL.
           *os << env_decl << be_uidt_nl;
           break;
         default:
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
index 76f2faa5227..88e9a1ed4ac 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
@@ -58,7 +58,7 @@ public:
 
   virtual int gen_environment_decl (int argument_emitted,
                                     be_operation *node);
-  // generate the TAO_ENV_ARG declaration, needs to know if there was
+  // generate the ACE_ENV_ARG declaration, needs to know if there was
   // at least one argument emitted to deal with all the commas.
 
   virtual const char *gen_environment_var (void);
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
index 4650afc561a..819c4ed0cb5 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Consumer_i.h
@@ -14,8 +14,8 @@ public:
 
   void connect (CosEventChanneAdmin::ConsumerAdmin_ptr consumer_admin);
 
-  void push (const CORBA::Any& data TAO_ENV_ARG_DECL_NOT_USED);
-  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void push (const CORBA::Any& data ACE_ENV_ARG_DECL_NOT_USED);
+  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
 };
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
index e02c36336de..efadfaa1e30 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.cpp
@@ -31,7 +31,7 @@ Stock_Consumer::disconnect ()
 
 void
 Stock_Consumer::push (const CORBA::Any& data
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
   throw (CORBA::SystemException)
 {
   Quoter::Event *event;
@@ -45,7 +45,7 @@ Stock_Consumer::push (const CORBA::Any& data
 }
 
 void
-Stock_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Stock_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException)
 {
   this->supplier_proxy_ = CosEventChannelAdmin::ProxyPushSupplier::_nil ();
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
index f3659626a57..d5de84958cd 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_Consumer.h
@@ -18,9 +18,9 @@ public:
   void disconnect ();
   // Disconnect from the event channel.
 
-  void push (const CORBA::Any& data TAO_ENV_ARG_DECL_NOT_USED)
+  void push (const CORBA::Any& data ACE_ENV_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException);
-  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException);
 
 private:
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
index 1a6f7ec52b6..b4cb4937eae 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.cpp
@@ -46,7 +46,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price)
 }
 
 void
-Quoter_Stock_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Quoter_Stock_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   throw (CORBA::SystemException)
 {
   // Forget about the consumer it is not there anymore
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
index 995dabddc7a..d6e82748c82 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Stock_i.h
@@ -23,7 +23,7 @@ public:
   CORBA::Double price () throw (CORBA::SystemException);
   void set_price (CORBA::Double new_price) throw (CORBA::SystemException);
 
-  void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException);
 
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
index 99eb940ad6e..ab075fcfcf7 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.cpp
@@ -14,7 +14,7 @@ Quoter_Stock_Factory_Locator_i::preinvoke (const PortableServer::ObjectId &oid,
                                            PortableServer::POA_ptr,
                                            const char *,
                                            void * & cookie
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
   throw (CORBA::SystemException, PortableServer::ForwardRequest)
 {
 
@@ -49,7 +49,7 @@ Quoter_Stock_Factory_Locator_i::postinvoke (const PortableServer::ObjectId &,
                                             const char *,
                                             void * cookie,
                                             PortableServer::Servant servant
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
   throw (CORBA::SystemException)
 {
 
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
index 4405c865fcd..cd0a6e1178a 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
@@ -18,7 +18,7 @@ class Quoter_Stock_Factory_Locator_i : public PortableServer::ServantLocator
                                              PortableServer::POA_ptr poa,
                                              const char * operation,
                                              void * & cookie
-                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     throw (CORBA::SystemException, PortableServer::ForwardRequest);
 
   // Postinvoke function
@@ -27,7 +27,7 @@ class Quoter_Stock_Factory_Locator_i : public PortableServer::ServantLocator
                            const char * operation,
                            void * cookie,
                            PortableServer::Servant servant
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     throw (CORBA::SystemException);
 
  private:
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
index 62f89416c49..0260584501c 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.cpp
@@ -33,7 +33,7 @@ Stock_Consumer::disconnect ()
 
 void
 Stock_Consumer::push (const RtecEventComm::EventSet &data
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
   throw (CORBA::SystemException)
 {
   for (CORBA::ULong i = 0; i != data.length (); ++i) {
@@ -51,7 +51,7 @@ Stock_Consumer::push (const RtecEventComm::EventSet &data
 }
 
 void
-Stock_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Stock_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException)
 {
   this->supplier_proxy_ =
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
index 2348b9b1a2d..a82044836bc 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_Consumer.h
@@ -20,9 +20,9 @@ public:
   void disconnect ();
   // Disconnect from the event channel.
 
-  void push (const RtecEventComm::EventSet& data TAO_ENV_ARG_DECL_NOT_USED)
+  void push (const RtecEventComm::EventSet& data ACE_ENV_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException);
-  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException);
 
 private:
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
index 672e06cb7f9..a8ca6402a64 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.cpp
@@ -18,12 +18,12 @@ protected:
       ref_count_(0) {}
 
 public:
-  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL)
   {
     ++this->ref_count_;
   }
 
-  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL)
   {
     CORBA::ULong new_count = --this->ref_count_;
 
@@ -95,7 +95,7 @@ Quoter_Stock_i::set_price (CORBA::Double new_price)
 }
 
 void
-Quoter_Stock_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Quoter_Stock_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   throw (CORBA::SystemException)
 {
   // Forget about the consumer it is not there anymore
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
index 3d074a8e31a..7ec530709eb 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Stock_i.h
@@ -24,7 +24,7 @@ public:
   CORBA::Double price () throw (CORBA::SystemException);
   void set_price (CORBA::Double new_price) throw (CORBA::SystemException);
 
-  void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     throw (CORBA::SystemException);
 
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin);
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
index fb81056443c..59f3cbfaae1 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -15,36 +15,36 @@ Peer_Handler_i::Peer_Handler_i (Peer_i *peer)
 
 void
 Peer_Handler_i::request (CORBA::Long retval
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static int i = 0;
   i++;
   if (i % 100 == 0)
     ACE_DEBUG ((LM_DEBUG, "(%P|%t) %d replies received\n", i));
-  this->peer_->reply (retval TAO_ENV_ARG_PARAMETER);
+  this->peer_->reply (retval ACE_ENV_ARG_PARAMETER);
 }
 
 
 void
 Peer_Handler_i::request_excep (
     AMI_PeerExceptionHolder * excep_holder
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (excep_holder);
-  TAO_ENV_ARG_NOT_USED;
+  ACE_ENV_ARG_NOT_USED;
 }
 
 
 void
-Peer_Handler_i::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Peer_Handler_i::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Peer_Handler_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Peer_Handler_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
@@ -63,32 +63,32 @@ void
 Peer_i::init (CORBA::ORB_ptr orb,
               Progress_ptr progress,
               const ACE_Time_Value &delay
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_ = CORBA::ORB::_duplicate (orb);
   this->progress_ = Progress::_duplicate (progress);
   this->delay_ = delay;
 
-  Peer_var peer = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  Peer_var peer = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "Peer (%P|%t) - binding\n"));
-  this->id_ = this->progress_->bind (peer.in () TAO_ENV_ARG_PARAMETER);
+  this->id_ = this->progress_->bind (peer.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Peer_i::reply (CORBA::Long result
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->progress_->recv_reply (result TAO_ENV_ARG_PARAMETER);
+  this->progress_->recv_reply (result ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Long
 Peer_i::request (CORBA::Long id
-                 TAO_ENV_ARG_DECL_NOT_USED)
+                 ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value tv  = this->delay_;
@@ -100,11 +100,11 @@ Peer_i::request (CORBA::Long id
 void
 Peer_i::start (const PeerSet &the_peers,
                CORBA::Long iterations
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   AMI_PeerHandler_var handler =
-    this->reply_handler_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->reply_handler_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ Report errors as exceptions...
@@ -118,10 +118,10 @@ Peer_i::start (const PeerSet &the_peers,
 }
 
 void
-Peer_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Peer_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);
 }
 
 // ****************************************************************
@@ -151,11 +151,11 @@ Peer_Task::svc (void)
             {
               this->the_peers_[j]->sendc_request (this->handler_.in (),
                                                   this->id_
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               this->progress_->sent_request (this->id_
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY
diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h
index 8f95390f898..c0583be398c 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.h
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.h
@@ -28,17 +28,17 @@ public:
   // The peer
 
   virtual void request (CORBA::Long retval
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void request_excep (AMI_PeerExceptionHolder * excep_holder
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void start (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void start (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -58,26 +58,26 @@ public:
   void init (CORBA::ORB_ptr orb,
              Progress_ptr progress,
              const ACE_Time_Value &delay
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void reply (CORBA::Long result
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Used by the Reply_Handler to indicate that a reply has been
   // received.
 
    // = See test.idl for an explanation of these methods.
   CORBA::Long request (CORBA::Long id
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void start (const PeerSet& the_peers,
               CORBA::Long iterations
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_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));
 
 private:
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
index bbadc2933d4..678847e328c 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp
@@ -20,7 +20,7 @@ Progress_i::Progress_i (Progress_Window *window)
 
 void
 Progress_i::sent_request (CORBA::Long id
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG, "Progress (%t) - sent request %d\n", id));
@@ -29,7 +29,7 @@ Progress_i::sent_request (CORBA::Long id
 
 void
 Progress_i::recv_reply (CORBA::Long id
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->window_->recv_reply (id);
@@ -37,11 +37,11 @@ Progress_i::recv_reply (CORBA::Long id
 
 CORBA::Long
 Progress_i::bind (Peer_ptr a_peer
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Progress (%t) - peer bound\n"));
-  return this->window_->bind (a_peer TAO_ENV_ARG_PARAMETER);
+  return this->window_->bind (a_peer ACE_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -132,7 +132,7 @@ Progress_Window::recv_reply (CORBA::Long id)
 
 CORBA::Long
 Progress_Window::bind (Peer_ptr a_peer
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
 {
   CORBA::ULong l = this->peers_.length ();
   this->peers_.length (l + 1);
@@ -155,14 +155,14 @@ Progress_Window::start ()
   if (this->peers_.length () < CORBA::ULong (this->n_peers_))
     return;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   for (CORBA::ULong i = 0; i != this->peers_.length (); ++i)
     {
       ACE_TRY
         {
           this->peers_[i]->start (this->peers_,
                                   this->n_iterations_
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h
index 8ffc57f0aac..e382d928147 100644
--- a/TAO/examples/AMI/FL_Callback/Progress_i.h
+++ b/TAO/examples/AMI/FL_Callback/Progress_i.h
@@ -37,7 +37,7 @@ public:
   // Keep track of the progress on each peer
 
   CORBA::Long bind (Peer_ptr a_peer
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // One of the peers has bound to the server
 
   void start (void);
@@ -77,13 +77,13 @@ public:
 
   // = The Progress methods.
   void sent_request (CORBA::Long id
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void recv_reply (CORBA::Long id
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   CORBA::Long bind (Peer_ptr a_peer
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
index 4107d860a18..1bb06563a62 100644
--- a/TAO/examples/AMI/FL_Callback/peer.cpp
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -100,11 +100,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -113,25 +113,25 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var progress_object =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Progress_var progress =
-        Progress::_narrow (progress_object.in () TAO_ENV_ARG_PARAMETER);
+        Progress::_narrow (progress_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value delay (0, interval);
@@ -140,7 +140,7 @@ main (int argc, char *argv[])
       peer.init (orb.in (),
                  progress.in (),
                  delay
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Worker worker (orb.in ());
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index 715382edd46..8246bf37552 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -62,11 +62,11 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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)
@@ -91,7 +91,7 @@ main (int argc, char *argv[])
       sw.show ();
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -100,24 +100,24 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Progress_i server_impl (&sw);
 
       Progress_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
diff --git a/TAO/examples/Advanced/ch_12/server.cpp b/TAO/examples/Advanced/ch_12/server.cpp
index da02c606a7b..d38195dcebb 100644
--- a/TAO/examples/Advanced/ch_12/server.cpp
+++ b/TAO/examples/Advanced/ch_12/server.cpp
@@ -564,7 +564,7 @@ preinvoke (const PortableServer::ObjectId & oid,
            PortableServer::POA_ptr          /*poa*/,
            const char *                     operation,
            void * &                         /*cookie*/
-           TAO_ENV_ARG_DECL)
+           ACE_ENV_ARG_DECL)
   throw (CORBA::SystemException, PortableServer::ForwardRequest)
 {
   // Convert object id into asset number.
diff --git a/TAO/examples/Advanced/ch_12/server.h b/TAO/examples/Advanced/ch_12/server.h
index 89b18973856..5aff30fa960 100644
--- a/TAO/examples/Advanced/ch_12/server.h
+++ b/TAO/examples/Advanced/ch_12/server.h
@@ -190,7 +190,7 @@ public:
              PortableServer::POA_ptr          poa,
              const char *                     operation,
              void * &                         cookie
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     throw (CORBA::SystemException,
            PortableServer::ForwardRequest);
   virtual void
@@ -199,7 +199,7 @@ public:
               const char *                     /*operation*/,
               void *                           /*cookie*/,
               PortableServer::Servant          /*servant*/
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
     throw (CORBA::SystemException) {}
 private:
   Controller_impl *                   m_ctrl;
diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index bce2bb155d6..84efc422e73 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -49,7 +49,7 @@ class Reply_Handler : public POA_AMI_testHandler
 {
 public:
   void method (CORBA::ULong reply_number
-               TAO_ENV_ARG_DECL_NOT_USED)
+               ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -62,12 +62,12 @@ public:
     }
 
   void method_excep (AMI_testExceptionHolder *holder
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_TRY
       {
-        holder->raise_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+        holder->raise_method (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     ACE_CATCH(CORBA::SystemException, ex)
@@ -77,18 +77,18 @@ public:
     ACE_ENDTRY;
   }
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void shutdown_excep (AMI_testExceptionHolder *holder
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_TRY
       {
-        holder->raise_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+        holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     ACE_CATCH(CORBA::SystemException, ex)
@@ -178,17 +178,17 @@ parse_args (int argc, char **argv)
 
 void
 setup_buffering_constraints (CORBA::ORB_ptr orb
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   // Obtain PolicyCurrent.
   CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent"
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Narrow down to correct type.
   CORBA::PolicyCurrent_var policy_current =
     CORBA::PolicyCurrent::_narrow (object.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Start off with no constraints.
@@ -210,17 +210,17 @@ setup_buffering_constraints (CORBA::ORB_ptr orb
   buffering_constraint_policy_list[0] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
                         buffering_constraint_any
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the constraints (at the ORB level).
   policy_current->set_policy_overrides (buffering_constraint_policy_list,
                                         CORBA::ADD_OVERRIDE
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // We are done with the policy.
-  buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  buffering_constraint_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the none sync scope policy, i.e., the ORB will buffer AMI
@@ -239,24 +239,24 @@ setup_buffering_constraints (CORBA::ORB_ptr orb
   sync_none_policy_list[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                         sync_none_any
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the none sync scope (at the ORB level).
   policy_current->set_policy_overrides (sync_none_policy_list,
                                         CORBA::ADD_OVERRIDE
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // We are now done with these policies.
-  sync_none_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  sync_none_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -265,7 +265,7 @@ main (int argc, char **argv)
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -275,39 +275,39 @@ main (int argc, char **argv)
 
       CORBA::Object_var base =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (base.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get an object reference from the argument string.
       base = orb->string_to_object (IOR
-                                    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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a <test> reference.
       test_var test_object = test::_narrow (base.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Reply_Handler reply_handler_servant;
-      AMI_testHandler_var reply_handler_object = reply_handler_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      AMI_testHandler_var reply_handler_object = reply_handler_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (setup_buffering)
         {
           setup_buffering_constraints (orb.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -322,7 +322,7 @@ main (int argc, char **argv)
               // Invoke the AMI method.
               test_object->sendc_method (reply_handler_object.in (),
                                          i
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
@@ -332,7 +332,7 @@ main (int argc, char **argv)
               // Invoke the regular method.
               test_object->method (i,
                                    reply_number
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
@@ -344,7 +344,7 @@ main (int argc, char **argv)
           ACE_Time_Value sleep_interval (0,
                                          interval * 1000);
 
-          orb->run (sleep_interval TAO_ENV_ARG_PARAMETER);
+          orb->run (sleep_interval ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -357,13 +357,13 @@ main (int argc, char **argv)
       // Shutdown server.
       if (shutdown_server)
         {
-          test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the ORB.  On some platforms, e.g., Win32, the socket
@@ -372,7 +372,7 @@ main (int argc, char **argv)
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp
index e23c785c2e4..61e8cd0bc78 100644
--- a/TAO/examples/Buffered_AMI/server.cpp
+++ b/TAO/examples/Buffered_AMI/server.cpp
@@ -42,21 +42,21 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_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 (poa_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;
 
       if (parse_args (argc, argv) != 0)
@@ -65,12 +65,12 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -84,17 +84,17 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Buffered_AMI/test_i.cpp b/TAO/examples/Buffered_AMI/test_i.cpp
index 2cf8850817b..0b3d8ffd45e 100644
--- a/TAO/examples/Buffered_AMI/test_i.cpp
+++ b/TAO/examples/Buffered_AMI/test_i.cpp
@@ -12,7 +12,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 void
 test_i::method (CORBA::ULong request_number,
                 CORBA::ULong_out reply_number
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -23,9 +23,9 @@ test_i::method (CORBA::ULong request_number,
 }
 
 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);
 }
diff --git a/TAO/examples/Buffered_AMI/test_i.h b/TAO/examples/Buffered_AMI/test_i.h
index c83114c88d0..e42bb2e1bcd 100644
--- a/TAO/examples/Buffered_AMI/test_i.h
+++ b/TAO/examples/Buffered_AMI/test_i.h
@@ -30,10 +30,10 @@ public:
   // = The test interface methods.
   void method (CORBA::ULong request_number,
                CORBA::ULong_out reply_number
-               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:
diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp
index afd3337e212..5668e5f9c05 100644
--- a/TAO/examples/Buffered_Oneways/client.cpp
+++ b/TAO/examples/Buffered_Oneways/client.cpp
@@ -115,7 +115,7 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -124,7 +124,7 @@ main (int argc, char **argv)
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -135,23 +135,23 @@ main (int argc, char **argv)
       // Get an object reference from the argument string.
       CORBA::Object_var base =
         orb->string_to_object (IOR
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a <test> reference.
       test_var test_object = test::_narrow (base.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain PolicyCurrent.
       base = orb->resolve_initial_references ("PolicyCurrent"
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow down to correct type.
       CORBA::PolicyCurrent_var policy_current =
         CORBA::PolicyCurrent::_narrow (base.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Setup the none sync scope policy, i.e., the ORB will buffer
@@ -170,17 +170,17 @@ main (int argc, char **argv)
       sync_none_policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_none_any
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Setup the none sync scope.
       policy_current->set_policy_overrides (sync_none_policy_list,
                                             CORBA::ADD_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We are now done with this policy.
-      sync_none_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      sync_none_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Start off with no constraints.
@@ -226,13 +226,13 @@ main (int argc, char **argv)
       buffering_constraint_policy_list[0] =
         orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
                             buffering_constraint_any
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Setup the constraints.
       policy_current->set_policy_overrides (buffering_constraint_policy_list,
                                             CORBA::ADD_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -259,7 +259,7 @@ main (int argc, char **argv)
       buffering_flush_policy_list[0] =
         orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
                             buffering_flush_any
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -275,7 +275,7 @@ main (int argc, char **argv)
               // Setup explicit flushing.
               policy_current->set_policy_overrides (buffering_flush_policy_list,
                                                     CORBA::ADD_OVERRIDE
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
@@ -284,13 +284,13 @@ main (int argc, char **argv)
 
               // Invoke the oneway method.
               test_object->method (i
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Reset buffering policy.
               policy_current->set_policy_overrides (buffering_constraint_policy_list,
                                                     CORBA::ADD_OVERRIDE
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
@@ -301,7 +301,7 @@ main (int argc, char **argv)
 
               // Invoke the oneway method.
               test_object->method (i
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -309,23 +309,23 @@ main (int argc, char **argv)
           ACE_Time_Value sleep_interval (0,
                                          interval * 1000);
 
-          orb->run (sleep_interval TAO_ENV_ARG_PARAMETER);
+          orb->run (sleep_interval ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Shutdown server.
       if (shutdown_server)
         {
-          test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // We are done with the policy.
-      buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      buffering_constraint_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We are done with the policy.
-      buffering_flush_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      buffering_flush_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the ORB.  On some platforms, e.g., Win32, the socket
@@ -334,7 +334,7 @@ main (int argc, char **argv)
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp
index 76e98cac2e8..31d6a5a42af 100644
--- a/TAO/examples/Buffered_Oneways/server.cpp
+++ b/TAO/examples/Buffered_Oneways/server.cpp
@@ -42,21 +42,21 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_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 (poa_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;
 
       if (parse_args (argc, argv) != 0)
@@ -65,12 +65,12 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -84,17 +84,17 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp
index 74b1323a4df..95972fe8939 100644
--- a/TAO/examples/Buffered_Oneways/test_i.cpp
+++ b/TAO/examples/Buffered_Oneways/test_i.cpp
@@ -11,7 +11,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 void
 test_i::method (CORBA::ULong request_number
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -20,9 +20,9 @@ test_i::method (CORBA::ULong request_number
 }
 
 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);
 }
diff --git a/TAO/examples/Buffered_Oneways/test_i.h b/TAO/examples/Buffered_Oneways/test_i.h
index cbe1b31e777..c8a79e05bb3 100644
--- a/TAO/examples/Buffered_Oneways/test_i.h
+++ b/TAO/examples/Buffered_Oneways/test_i.h
@@ -29,10 +29,10 @@ public:
 
   // = The test interface methods.
   void method (CORBA::ULong request_number
-               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:
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
index 647b643db66..4aeab0b4941 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
@@ -161,7 +161,7 @@ Consumer_Handler::parse_args (void)
 int
 Consumer_Handler::via_naming_service (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialization of the naming service.
@@ -177,14 +177,14 @@ Consumer_Handler::via_naming_service (void)
 
       CORBA::Object_var notifier_obj =
         this->naming_services_client_->resolve (notifier_ref_name
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The CORBA::Object_var object is downcast to Notifier_var using
       // the <_narrow> method.
       this->server_ =
         Notifier::_narrow (notifier_obj.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -211,14 +211,14 @@ Consumer_Handler::init (int argc, char **argv)
   // Register our <Input_Handler> to handle STDIN events, which will
   // trigger the <handle_input> method to process these events.
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     0
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -281,7 +281,7 @@ Consumer_Handler::init (int argc, char **argv)
 
           CORBA::Object_var server_object =
             this->orb_->string_to_object (this->ior_
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (server_object.in ()))
@@ -292,7 +292,7 @@ Consumer_Handler::init (int argc, char **argv)
           // The downcasting from CORBA::Object_var to Notifier_var is
           // done using the <_narrow> method.
           this->server_ = Notifier::_narrow (server_object.in ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -312,23 +312,23 @@ int
 Consumer_Handler::run (void)
 {
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Obtain and activate the RootPOA.
      CORBA::Object_var obj =
-            this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+            this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
      ACE_TRY_CHECK;
 
      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () 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;
 
-     poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+     poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
      ACE_TRY_CHECK;
 
      ACE_NEW_RETURN (this->consumer_servant_,
@@ -339,7 +339,7 @@ Consumer_Handler::run (void)
 
      // Get the consumer stub (i.e consumer object) pointer.
      this->consumer_var_ =
-       this->consumer_servant_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+       this->consumer_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->interactive_ == 0)
@@ -349,7 +349,7 @@ Consumer_Handler::run (void)
           this->server_->register_callback (this->stock_name_,
                                             this->threshold_value_,
                                             this->consumer_var_.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Note the registration.
@@ -361,7 +361,7 @@ Consumer_Handler::run (void)
         }
 
       // Run the ORB.
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
index c98a8522314..a06a4267cf3 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Input_Handler.cpp
@@ -102,7 +102,7 @@ Consumer_Input_Handler::register_consumer ()
   this->consumer_handler_->threshold_value_ =
     ACE_OS::atoi (needed_stock_value);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -111,7 +111,7 @@ Consumer_Input_Handler::register_consumer ()
       this->consumer_handler_->server_->register_callback (this->consumer_handler_->stock_name_,
                                                            this->consumer_handler_->threshold_value_,
                                                            this->consumer_handler_->consumer_var_.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Note the registration.
@@ -165,7 +165,7 @@ Consumer_Input_Handler::quit_consumer_process ()
   // Only if the consumer is registered and wants to shut
   // down, its necessary to unregister and then shutdown.
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -173,9 +173,9 @@ Consumer_Input_Handler::quit_consumer_process ()
         {
           // If the notifier has exited and the consumer tries to call
           // the unregister_callback method tehn an execption will be
-          // raised. Hence check for this case using TAO_ENV_SINGLE_ARG_PARAMETER.
+          // raised. Hence check for this case using ACE_ENV_SINGLE_ARG_PARAMETER.
           this->consumer_handler_->server_->unregister_callback (this->consumer_handler_->consumer_var_.in ()
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
@@ -183,7 +183,7 @@ Consumer_Input_Handler::quit_consumer_process ()
           consumer_handler_->unregistered_ = 0;
           consumer_handler_->registered_ = 0;
         }
-      this->consumer_handler_->consumer_servant_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumer_handler_->consumer_servant_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -196,7 +196,7 @@ Consumer_Input_Handler::quit_consumer_process ()
 
       ACE_TRY_EX (block1)
         {
-          this->consumer_handler_->consumer_servant_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->consumer_handler_->consumer_servant_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (block1);
         }
       ACE_CATCHANY
diff --git a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp
index d78291ee729..5fe25a265f6 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp
@@ -39,7 +39,7 @@ Consumer_Signal_Handler::handle_signal (int /* signum */,
               " Exiting on receiving ^C\n"));
 
   quit_on_signal ();
-  
+
   return 0;
 }
 
@@ -66,13 +66,13 @@ Consumer_Signal_Handler::quit_on_signal (void)
     {
       if (consumer_handler_->unregistered_ != 1
           && consumer_handler_->registered_ == 1)
-	{
-	  this->consumer_handler_->server_->unregister_callback 
+        {
+          this->consumer_handler_->server_->unregister_callback
             (this->consumer_handler_->consumer_var_.in ());
-	  ACE_DEBUG ((LM_DEBUG,
-		      "Consumer Unregistered\n"));
+          ACE_DEBUG ((LM_DEBUG,
+                      "Consumer Unregistered\n"));
         }
-      this->consumer_handler_->consumer_servant_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumer_handler_->consumer_servant_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Callback_Quoter/Consumer_i.cpp b/TAO/examples/Callback_Quoter/Consumer_i.cpp
index 380ff65ecfe..b892a31372c 100644
--- a/TAO/examples/Callback_Quoter/Consumer_i.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_i.cpp
@@ -29,7 +29,7 @@ Consumer_i::~Consumer_i (void)
 
 void
 Consumer_i::push (const Callback_Quoter::Info &data
-                  TAO_ENV_ARG_DECL_NOT_USED)
+                  ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // On getting the needed information you now proceed to the next
@@ -42,7 +42,7 @@ Consumer_i::push (const Callback_Quoter::Info &data
 }
 
 void
-Consumer_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
diff --git a/TAO/examples/Callback_Quoter/Consumer_i.h b/TAO/examples/Callback_Quoter/Consumer_i.h
index 3e7a28df332..839f2768c6a 100644
--- a/TAO/examples/Callback_Quoter/Consumer_i.h
+++ b/TAO/examples/Callback_Quoter/Consumer_i.h
@@ -40,11 +40,11 @@ public:
   // Destructor.
 
   void push (const Callback_Quoter::Info & data
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Gets the stock information from the Notifier.
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Used to get the consumer to shut down.
 
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
index b117ea3d1ab..edaff2abfee 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
@@ -52,7 +52,7 @@ Notifier_Input_Handler::~Notifier_Input_Handler (void)
 // the object name is bound to the naming server.
 
 int
-Notifier_Input_Handler::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+Notifier_Input_Handler::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
 
   CORBA::ORB_var orb = this->orb_manager_.orb ();
@@ -69,15 +69,15 @@ Notifier_Input_Handler::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
   // (re)Bind the object.
   ACE_TRY
     {
-      Notifier_var notifier_obj = notifier_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Notifier_var notifier_obj = notifier_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       naming_server_->rebind (notifier_obj_name,
                               notifier_obj.in()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -142,7 +142,7 @@ Notifier_Input_Handler::parse_args (void)
 int
 Notifier_Input_Handler::init (int argc,
                               char *argv[]
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
 
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
@@ -154,7 +154,7 @@ Notifier_Input_Handler::init (int argc,
   if (this->orb_manager_.init_child_poa (this->argc_,
                                          this->argv_,
                                          "child_poa"
-                                         TAO_ENV_ARG_PARAMETER) == -1)
+                                         ACE_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -187,7 +187,7 @@ Notifier_Input_Handler::init (int argc,
   CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("Notifier",
                                                  &this->notifier_i_
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -204,14 +204,14 @@ Notifier_Input_Handler::init (int argc,
 
   if (this->using_naming_service_)
     {
-      this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   return 0;
 }
 
 int
-Notifier_Input_Handler::run (TAO_ENV_SINGLE_ARG_DECL)
+Notifier_Input_Handler::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Run the main event loop for the ORB.
 
@@ -219,7 +219,7 @@ Notifier_Input_Handler::run (TAO_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               " Type \"q\" to quit \n "));
 
-  int result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result == -1)
@@ -237,7 +237,7 @@ Notifier_Input_Handler::handle_input (ACE_HANDLE)
 {
   char buf[BUFSIZ];
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -259,7 +259,7 @@ Notifier_Input_Handler::handle_input (ACE_HANDLE)
         {
           // @@ Please remove this call if it's not used.
           // (this->notifier_i_.consumer_map_).close();
-          this->notifier_i_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->notifier_i_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
index 4012a86e4a1..f9b1a091ed6 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
@@ -45,10 +45,10 @@ public:
 
   int init (int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Notifier who plays the role of the server here.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the ORB.
 
    virtual int handle_input (ACE_HANDLE);
@@ -62,7 +62,7 @@ private:
   int parse_args (void);
   // Parses the command line arguments.
 
-  int init_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  int init_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Initialises the name server and registers the Notifier object
   // name with the name server.
 
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp
index 470f4bf315b..632820180a4 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp
@@ -38,7 +38,7 @@ void
 Notifier_i::register_callback (const char *stock_name,
                                CORBA::Long threshold_value,
                                Callback_Quoter::Consumer_ptr consumer_handler
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Callback_Quoter::Invalid_Stock))
 {
@@ -107,7 +107,7 @@ Notifier_i::orb (CORBA::ORB_ptr orb)
 
 void
 Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Callback_Quoter::Invalid_Handle))
 {
@@ -154,7 +154,7 @@ Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer
 void
 Notifier_i::market_status (const char *stock_name,
                            CORBA::Long stock_value
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -202,7 +202,7 @@ Notifier_i::market_status (const char *stock_name,
 }
 
 void
-Notifier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Notifier_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ( this->consumer_map_.close () > 0)
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h
index d3d326e3e58..9c99934879e 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.h
+++ b/TAO/examples/Callback_Quoter/Notifier_i.h
@@ -52,28 +52,28 @@ public:
   virtual void register_callback (const char *stock_name,
                                   CORBA::Long threshold_value,
                                   Callback_Quoter::Consumer_ptr consumer_handler
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Callback_Quoter::Invalid_Stock));
   // Register a distributed callback handler that is invoked when the
   // given stock reaches the desired threshold value.
 
   virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Callback_Quoter::Invalid_Handle));
   // Remove the consumer object.
 
   virtual void market_status (const char *stock_name,
                               CORBA::Long stock_value
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the market status.
 
   void orb (CORBA::ORB_ptr orb);
   // Get the orb pointer.
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the Notifier.
 
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp
index a01dec538d8..b3b3072d046 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp
@@ -153,7 +153,7 @@ int
 Supplier::send_market_status (const char *stock_name,
                               long value)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -161,7 +161,7 @@ Supplier::send_market_status (const char *stock_name,
       // Make the RMI.
       this->notifier_->market_status (stock_name,
                                       value
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -229,14 +229,14 @@ Supplier::via_naming_service (void)
 
       CORBA::Object_var notifier_obj =
         this->naming_services_client_->resolve (notifier_ref_name
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The CORBA::Object_var object is downcast to Notifier_var
       // using the <_narrow> method.
       this->notifier_ =
         Notifier::_narrow (notifier_obj.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -270,7 +270,7 @@ Supplier::init (int argc, char **argv)
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     0
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -294,7 +294,7 @@ Supplier::init (int argc, char **argv)
                           -1);
       CORBA::Object_var notifier_object =
         this->orb_->string_to_object (this->ior_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (notifier_object.in ()))
@@ -305,7 +305,7 @@ Supplier::init (int argc, char **argv)
       // The downcasting from CORBA::Object_var to Notifier_var is
       // done using the <_narrow> method.
       this->notifier_ = Notifier::_narrow (notifier_object.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/examples/Callback_Quoter/notifier.cpp b/TAO/examples/Callback_Quoter/notifier.cpp
index 246f16e2ccd..44f07d70cd1 100644
--- a/TAO/examples/Callback_Quoter/notifier.cpp
+++ b/TAO/examples/Callback_Quoter/notifier.cpp
@@ -14,17 +14,17 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tNotifier\n\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int rc = notifier.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int rc = notifier.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (rc == -1)
         return 1;
       else
         {
-          notifier.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          notifier.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index a382f854632..9e64c8a1409 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -26,7 +26,7 @@ Content_Iterator_i::~Content_Iterator_i (void)
 CORBA::Boolean
 Content_Iterator_i::next_chunk (CORBA::ULong offset,
                                 Web_Server::Chunk_Type_out chunk
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initialize/allocate the Chunk_Type sequence
@@ -105,23 +105,23 @@ Content_Iterator_i::next_chunk (CORBA::ULong offset,
 }
 
 void
-Content_Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Content_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   (void) this->file_io_.close ();
 
   // Get the POA used when activating the Content_Iterator object.
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now deactivate the iterator object.
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Decrease the reference count on our selves.
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
index edf2fae0b71..bff3baf702a 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h
@@ -63,12 +63,12 @@ public:
 
   virtual CORBA::Boolean next_chunk (CORBA::ULong offset,
                                      Web_Server::Chunk_Type_out chunk
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns the next <chunk> of the file starting at
   // <offset>.  If there are no more bindings, false is returned.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the iterator.
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
index b7bac2b09f6..50062c1baf1 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp
@@ -12,7 +12,7 @@ void
 Iterator_Factory_i::get_iterator (const char *pathname,
                                   Web_Server::Content_Iterator_out contents,
                                   Web_Server::Metadata_Type_out metadata
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -44,7 +44,7 @@ Iterator_Factory_i::get_iterator (const char *pathname,
 
   // Activate the Content_Iterator object.
   Web_Server::Content_Iterator_var iterator =
-    iterator_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    iterator_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Web_Server::Metadata_Type *tmp = 0;
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
index 71599ff6347..93584967c63 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h
@@ -45,7 +45,7 @@ public:
   virtual void get_iterator (const char *pathname,
                              Web_Server::Content_Iterator_out contents,
                              Web_Server::Metadata_Type_out metadata
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // This factory method returns a <Content_Iterator> that can be used
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
index 46f896a5c8c..faa76c5bd5e 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
@@ -30,7 +30,7 @@ Iterator_Handler::~Iterator_Handler (void)
 void
 Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
                               const Web_Server::Chunk_Type &chunk_data
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (pending_data)
@@ -53,7 +53,7 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
 
       this->contents_->sendc_next_chunk (this->ami_handler_.in (),
                                          this->offset_
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
     }
@@ -67,7 +67,7 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
 
       // Done with the iterator, so destroy it.
       this->contents_->sendc_destroy (this->ami_handler_.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // File retrieval has completed, so spawn an external viewer to
@@ -77,11 +77,11 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data,
     }
 }
 void
-Iterator_Handler::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Iterator_Handler::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate this reply handler.
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -90,7 +90,7 @@ void
 Iterator_Handler::run (int *request_count,
                        const char *pathname,
                        Web_Server::Iterator_Factory_ptr factory
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
@@ -102,17 +102,17 @@ Iterator_Handler::run (int *request_count,
   // Initialize the Content Iterator
   this->initialize_content_iterator (pathname,
                                      factory
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Activate this Reply Handler.
-  this->ami_handler_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->ami_handler_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Begin the asynchronous invocation.
   this->contents_->sendc_next_chunk (this->ami_handler_.in (),
                                      this->offset_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -120,7 +120,7 @@ void
 Iterator_Handler::initialize_content_iterator
   (const char *pathname,
    Web_Server::Iterator_Factory_ptr factory
-   TAO_ENV_ARG_DECL)
+   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
@@ -128,7 +128,7 @@ Iterator_Handler::initialize_content_iterator
   factory->get_iterator (pathname,
                          this->contents_,
                          this->metadata_
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create a temporary file to store the retrieved data.
@@ -149,21 +149,21 @@ Iterator_Handler::initialize_content_iterator
 }
 
 void
-Iterator_Handler::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+Iterator_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the POA used when activating the Reply Handler object.
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now deactivate the iterator object.
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
index e64986ca215..2aee54552da 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
@@ -64,26 +64,26 @@ public:
 
   virtual void next_chunk (CORBA::Boolean pending_data,
                    const Web_Server::Chunk_Type & chunk
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void next_chunk_excep (
       Web_Server::AMI_Content_IteratorExceptionHolder *
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) {}
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy_excep (
       Web_Server::AMI_Content_IteratorExceptionHolder *
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) {}
 
   void run (int *request_count,
             const char *pathname,
             Web_Server::Iterator_Factory_ptr factory
-            TAO_ENV_ARG_DECL)
+            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // Activate and run this Reply Handler.  The contents (not the
@@ -98,12 +98,12 @@ private:
 
   void initialize_content_iterator (const char *pathname,
                                     Web_Server::Iterator_Factory_ptr factory
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // Initialize the Content Iterator used to retrieve the file.
 
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL)
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deactivate this reply handler.
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
index 3ac86a85b96..756603eaf7a 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
@@ -13,19 +13,19 @@ ACE_RCSID (AMI_Iterator, client, "$Id$")
 // Obtain reference to Iterator_Factory
 Web_Server::Iterator_Factory_ptr
 get_iterator (CORBA::ORB_ptr orb
-              TAO_ENV_ARG_DECL);
+              ACE_ENV_ARG_DECL);
 
 // Perform file requests
 void invoke_requests (int argc,
                       char *argv[],
                       int *request_count,
                       Web_Server::Iterator_Factory_ptr f
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       if (argc < 2)
@@ -37,28 +37,28 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             "Mighty ORB"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the Root POA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get an Iterator_Factory reference.
       Web_Server::Iterator_Factory_var factory =
         ::get_iterator (orb.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -80,7 +80,7 @@ main (int argc, char *argv[])
                          argv,
                          &request_count,
                          factory.in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB event loop.
@@ -88,22 +88,22 @@ main (int argc, char *argv[])
         {
           CORBA::Boolean more_work;
 
-          more_work = orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER);
+          more_work = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (more_work)
             {
-              orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
+              orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             ACE_OS::sleep (tv);
         }
 
-      orb->shutdown (0 TAO_ENV_ARG_PARAMETER);
+      orb->shutdown (0 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_CATCH (Web_Server::Error_Result, exc)
@@ -131,19 +131,19 @@ main (int argc, char *argv[])
 
 Web_Server::Iterator_Factory_ptr
 get_iterator (CORBA::ORB_ptr o
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   CORBA::ORB_var orb = CORBA::ORB::_duplicate (o);
 
   // Get a reference to the Name Service.
   CORBA::Object_var obj =
     orb->resolve_initial_references ("NameService"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
 
   // Narrow to a Naming Context
   CosNaming::NamingContext_var nc =
-    CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
 
   if (CORBA::is_nil (obj.in ()))
@@ -159,7 +159,7 @@ get_iterator (CORBA::ORB_ptr o
   name[0].id = CORBA::string_dup ("Iterator_Factory");
   name[0].kind = CORBA::string_dup ("");
 
-  obj = nc->resolve (name TAO_ENV_ARG_PARAMETER);
+  obj = nc->resolve (name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
 
   Web_Server::Iterator_Factory_ptr factory =
@@ -172,7 +172,7 @@ void invoke_requests (int argc,
                       char *argv[],
                       int *request_count,
                       Web_Server::Iterator_Factory_ptr f
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   Web_Server::Iterator_Factory_var factory =
     Web_Server::Iterator_Factory::_duplicate (f);
@@ -195,7 +195,7 @@ void invoke_requests (int argc,
       handler->run (request_count,
                     argv[i + 1],
                     factory.in ()
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
index c711edf8594..fab8f391270 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
@@ -13,46 +13,46 @@ ACE_RCSID (AMI_Iterator, server, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             "Mighty ORB"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the Root POA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the Iterator_Factory servant and object.
       // It activates and deactivates the Content_Iterator object.
       Iterator_Factory_i factory_servant;
       Web_Server::Iterator_Factory_var factory =
-        factory_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        factory_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a reference to the Name Service.
       obj = orb->resolve_initial_references ("NameService"
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow to a Naming Context
       CosNaming::NamingContext_var nc =
-        CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a name.
@@ -61,12 +61,12 @@ main (int argc, char *argv[])
       name[0].id = CORBA::string_dup ("Iterator_Factory");
       name[0].kind = CORBA::string_dup ("");
 
-      nc->bind (name, factory.in () TAO_ENV_ARG_PARAMETER);
+      nc->bind (name, factory.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Some debugging output.
       CORBA::String_var IOR = orb->object_to_string (factory.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"),
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
                   ACE_TEXT ("Accepting requests.\n")));
 
       // Accept requests.
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
index 61774035f58..d26e6b5569c 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
@@ -28,12 +28,12 @@ Callback_Handler::~Callback_Handler (void)
 }
 
 void
-Callback_Handler::next_chunk (TAO_ENV_SINGLE_ARG_DECL)
+Callback_Handler::next_chunk (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->last_chunk_ == 1)
     {
-      this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -80,25 +80,25 @@ Callback_Handler::next_chunk (TAO_ENV_SINGLE_ARG_DECL)
   this->callback_->sendc_next_chunk (this->ami_handler_.in (),
                                      this->chunk_.in (),
                                      this->last_chunk_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Callback_Handler::next_chunk_excep
   (Web_Server::AMI_CallbackExceptionHolder *excep_holder
-   TAO_ENV_ARG_DECL_NOT_USED)
+   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->last_chunk_ = 1;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      excep_holder->raise_next_chunk (TAO_ENV_SINGLE_ARG_PARAMETER);
+      excep_holder->raise_next_chunk (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -111,27 +111,27 @@ Callback_Handler::next_chunk_excep
 }
 
 void
-Callback_Handler::run (TAO_ENV_SINGLE_ARG_DECL)
+Callback_Handler::run (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
   // Open the file to be downloaded
-  this->open_file (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->open_file (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Activate this Reply Handler.
-  this->ami_handler_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->ami_handler_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Begin the asynchronous invocation.  Note that the AMI
   // "sendc_next_chunk()" call is done within the following call,
   // since data must first be read into the Chunk.
-  this->next_chunk (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->next_chunk (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Callback_Handler::open_file (TAO_ENV_SINGLE_ARG_DECL)
+Callback_Handler::open_file (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
@@ -149,23 +149,23 @@ Callback_Handler::open_file (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Callback_Handler::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+Callback_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Close the file that was sent to the client.
   (void) this->file_io_.close ();
 
   // Get the POA used when activating the Reply Handler object.
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now deactivate the AMI_CallbackHandler object.
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
index fe87b50c854..d65c2968650 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h
@@ -87,15 +87,15 @@ public:
   // Constructor that creates a content iterator corresponding to the
   // name of the file being retrieved from the web server.
 
-  virtual void next_chunk (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void next_chunk (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback for this reply handler.
 
   virtual void next_chunk_excep (Web_Server::AMI_CallbackExceptionHolder *
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void run (TAO_ENV_SINGLE_ARG_DECL)
+  void run (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // Activate and run this Reply Handler.  The contents (not the
@@ -108,12 +108,12 @@ private:
   // Destructor (private to ensure that Callback_Handler is allocated
   // on the heap).
 
-  void open_file (TAO_ENV_SINGLE_ARG_DECL)
+  void open_file (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result));
   // Open the file to be uploaded to the client callback.
 
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL)
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deactivate this reply handler.
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
index a6299288c56..2f52e21c41c 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
@@ -47,7 +47,7 @@ Callback_i::~Callback_i (void)
 void
 Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data,
                         CORBA::Boolean last_chunk
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!last_chunk)
@@ -93,7 +93,7 @@ Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data,
       if (this->metadata_received ())
         {
           (void) this->file_io_.close ();
-          this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           (void) this->spawn_viewer ();
@@ -104,7 +104,7 @@ Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data,
 void
 Callback_i::metadata (const Web_Server::Metadata_Type &metadata)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       {
@@ -126,7 +126,7 @@ Callback_i::metadata (const Web_Server::Metadata_Type &metadata)
       // an external viewer to display it.
       if (this->content_received ())
         {
-          this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           (void) this->spawn_viewer ();
@@ -273,19 +273,19 @@ Callback_i::spawn_viewer (void)
 }
 
 void
-Callback_i::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+Callback_i::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get the POA used when activating the Reply Handler object.
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now deactivate the iterator object.
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
index 7a9ea118094..19625ed64a8 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h
@@ -72,7 +72,7 @@ public:
 
   virtual void next_chunk (const Web_Server::Chunk_Type &chunk,
                            CORBA::Boolean last_chunk
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns the next <chunk> of the file starting at
   // <offset>.  If there are no more bindings, false is returned.
@@ -102,7 +102,7 @@ private:
 
 private:
 
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
   // Deactivate this Callback servant.
 
 private:
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
index aa7b3e0e064..ba648843736 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp
@@ -12,7 +12,7 @@ Web_Server::Metadata_Type *
 Push_Iterator_Factory_i::register_callback
   (const char *pathname,
    Web_Server::Callback_ptr client_callback
-   TAO_ENV_ARG_DECL)
+   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result))
 {
   if (CORBA::is_nil (client_callback))  // @@ Will it ever be nil?
@@ -43,7 +43,7 @@ Push_Iterator_Factory_i::register_callback
   PortableServer::ServantBase_var tmp (handler);
 
   // Start sending data to the client callback object.
-  handler->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  handler->run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_stat file_status;
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
index ee2d114c915..4870062e7e9 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h
@@ -53,7 +53,7 @@ public:
   Web_Server::Metadata_Type *register_callback
     (const char *pathname,
      Web_Server::Callback_ptr client_callback
-     TAO_ENV_ARG_DECL)
+     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // This registration method passes a <Callback> that the Web server
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
index f2b0cee21e2..96a7b7c0b88 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp
@@ -26,13 +26,13 @@ Push_Iterator_Handler::~Push_Iterator_Handler (void)
 void
 Push_Iterator_Handler::register_callback
   (const Web_Server::Metadata_Type &metadata
-   TAO_ENV_ARG_DECL)
+   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->callback_servant_->metadata (metadata);
 
   // This handler is no longer needed, so deactivate it.
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -40,7 +40,7 @@ void
 Push_Iterator_Handler::run (int *request_count,
                             const char *pathname,
                             Web_Server::Iterator_Factory_ptr factory
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Web_Server::Error_Result))
 {
@@ -54,37 +54,37 @@ Push_Iterator_Handler::run (int *request_count,
 
   // Activate the Callback.
   this->callback_ =
-    this->callback_servant_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->callback_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Activate this Reply Handler.
   this->ami_handler_ =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Register the client callback with the server asynchronously.
   factory->sendc_register_callback (this->ami_handler_.in (),
                                     pathname,
                                     this->callback_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Push_Iterator_Handler::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+Push_Iterator_Handler::deactivate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the POA used when activating the Reply Handler object.
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now deactivate the AMI_CallbackHandler object.
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
index caa91026a62..e1b04c94f5a 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
+++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h
@@ -73,7 +73,7 @@ public:
   void run (int *request_count,
             const char *pathname,
             Web_Server::Iterator_Factory_ptr factory
-            TAO_ENV_ARG_DECL)
+            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // Activate and run this Reply Handler.  The contents (not the
@@ -89,17 +89,17 @@ private:
 
   virtual void register_callback
   (const Web_Server::Metadata_Type &metadata
-   TAO_ENV_ARG_DECL)
+   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // AMI callback that is invoked when a response from the
   // corresponding server method is received.
 
   virtual void register_callback_excep
   (Web_Server::AMI_Iterator_FactoryExceptionHolder *
-   TAO_ENV_ARG_DECL_NOT_USED)
+   ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) {}
 
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL)
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deactivate this handler.
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp
index 306a86b7910..9c0465ac1c1 100644
--- a/TAO/examples/Content_Server/AMI_Observer/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp
@@ -13,19 +13,19 @@ ACE_RCSID (AMI_Observer, client, "$Id$")
 // Obtain reference to Iterator_Factory
 Web_Server::Iterator_Factory_ptr
 get_iterator (CORBA::ORB_ptr orb
-              TAO_ENV_ARG_DECL);
+              ACE_ENV_ARG_DECL);
 
 // Perform file requests
 void invoke_requests (int argc,
                       char *argv[],
                       int *request_count,
                       Web_Server::Iterator_Factory_ptr f
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       if (argc < 2)
@@ -38,28 +38,28 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             "Mighty ORB"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the Root POA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get an Iterator_Factory reference.
       Web_Server::Iterator_Factory_var factory =
         ::get_iterator (orb.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -81,7 +81,7 @@ main (int argc, char *argv[])
                          argv,
                          &request_count,
                          factory.in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // 1 millisecond delay to reduce "busy waiting" in ORB event
@@ -93,22 +93,22 @@ main (int argc, char *argv[])
         {
           CORBA::Boolean more_work;
 
-          more_work = orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER);
+          more_work = orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (more_work)
             {
-              orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
+              orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             ACE_OS::sleep (tv);
         }
 
-      orb->shutdown (0 TAO_ENV_ARG_PARAMETER);
+      orb->shutdown (0 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_CATCH (Web_Server::Error_Result, exc)
@@ -136,19 +136,19 @@ main (int argc, char *argv[])
 
 Web_Server::Iterator_Factory_ptr
 get_iterator (CORBA::ORB_ptr o
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   CORBA::ORB_var orb = CORBA::ORB::_duplicate (o);
 
   // Get a reference to the Name Service.
   CORBA::Object_var obj =
     orb->resolve_initial_references ("NameService"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
 
   // Narrow to a Naming Context
   CosNaming::NamingContext_var nc =
-    CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
 
   if (CORBA::is_nil (obj.in ()))
@@ -164,7 +164,7 @@ get_iterator (CORBA::ORB_ptr o
   name[0].id = CORBA::string_dup ("Push_Iterator_Factory");
   name[0].kind = CORBA::string_dup ("");
 
-  obj = nc->resolve (name TAO_ENV_ARG_PARAMETER);
+  obj = nc->resolve (name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Web_Server::Iterator_Factory::_nil ());
 
   Web_Server::Iterator_Factory_ptr factory =
@@ -177,7 +177,7 @@ void invoke_requests (int argc,
                       char *argv[],
                       int *request_count,
                       Web_Server::Iterator_Factory_ptr f
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   Web_Server::Iterator_Factory_var factory =
     Web_Server::Iterator_Factory::_duplicate (f);
@@ -200,7 +200,7 @@ void invoke_requests (int argc,
       handler->run (request_count,
                     argv[i + 1],
                     factory.in ()
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp
index 5a59ffd5e91..55854e56c83 100644
--- a/TAO/examples/Content_Server/AMI_Observer/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp
@@ -12,45 +12,45 @@ ACE_RCSID (AMI_Observer, server, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             "Mighty ORB"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the Root POA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the Iterator_Factory servant and object.
       Push_Iterator_Factory_i factory_servant;
       Web_Server::Iterator_Factory_var factory =
-        factory_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        factory_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a reference to the Name Service.
       obj = orb->resolve_initial_references ("NameService"
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow to a Naming Context
       CosNaming::NamingContext_var nc =
-        CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a name.
@@ -59,12 +59,12 @@ main (int argc, char *argv[])
       name[0].id = CORBA::string_dup ("Push_Iterator_Factory");
       name[0].kind = CORBA::string_dup ("");
 
-      nc->bind (name, factory.in () TAO_ENV_ARG_PARAMETER);
+      nc->bind (name, factory.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Some debugging output.
       CORBA::String_var IOR = orb->object_to_string (factory.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"),
@@ -75,7 +75,7 @@ main (int argc, char *argv[])
                   ACE_TEXT ("Accepting requests.\n")));
 
       // Accept requests.
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index ffa637debb2..1f60aaaea0f 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -27,7 +27,7 @@ Content_Iterator_i::~Content_Iterator_i (void)
 CORBA::Boolean
 Content_Iterator_i::next_chunk (CORBA::ULong offset,
                                 Web_Server::Chunk_Type_out chunk
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initialize/allocate the Chunk_Type sequence
@@ -117,23 +117,23 @@ Content_Iterator_i::next_chunk (CORBA::ULong offset,
 }
 
 void
-Content_Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Content_Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   (void) this->file_io_.close ();
 
   // Get the POA used when activating the Content_Iterator object.
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the object ID associated with this servant.
   PortableServer::ObjectId_var oid = poa->servant_to_id (this
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now deactivate the iterator object.
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Decrease the reference count on our selves.
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
index 09bbfa3ddc0..5dbc57a999b 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h
@@ -63,12 +63,12 @@ public:
 
   virtual CORBA::Boolean next_chunk (CORBA::ULong offset,
                                      Web_Server::Chunk_Type_out chunk
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns the next <chunk> of the file starting at
   // <offset>.  If there are no more bindings, false is returned.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the iterator.
 
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
index 4257ddb5581..9fc9c724f24 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp
@@ -12,7 +12,7 @@ void
 Iterator_Factory_i::get_iterator (const char *pathname,
                                   Web_Server::Content_Iterator_out contents,
                                   Web_Server::Metadata_Type_out metadata
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -50,7 +50,7 @@ Iterator_Factory_i::get_iterator (const char *pathname,
 
   // Activate the Content_Iterator object.
   Web_Server::Content_Iterator_var iterator =
-    iterator_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    iterator_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Web_Server::Metadata_Type *tmp = 0;
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
index adad7bc5b1e..5b879e0dd85 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
+++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h
@@ -47,7 +47,7 @@ public:
   virtual void get_iterator (const char *pathname,
                              Web_Server::Content_Iterator_out contents,
                              Web_Server::Metadata_Type_out metadata
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Web_Server::Error_Result));
   // This factory method returns a <Content_Iterator> that can be used
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index c6c3e47d613..7c8cb92ce27 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -14,7 +14,7 @@ ACE_RCSID(SMI_Iterator, client, "$Id$")
 // Retrieve the data from the server
 int retrieve_data (const char *content_type,
                    Web_Server::Content_Iterator_ptr contents
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 
 
 // Map content type to viewer.
@@ -29,7 +29,7 @@ int spawn_viewer (const char *content_type,
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       if (argc < 2)
@@ -41,18 +41,18 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             "Mighty ORB"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a reference to the Name Service.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("NameService"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow to a Naming Context
       CosNaming::NamingContext_var nc =
-        CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (obj.in ()))
@@ -69,7 +69,7 @@ main (int argc, char *argv[])
       name[0].id = CORBA::string_dup ("Iterator_Factory");
       name[0].kind = CORBA::string_dup ("");
 
-      obj = nc->resolve (name TAO_ENV_ARG_PARAMETER);
+      obj = nc->resolve (name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now narrow to an Iterator_Factory reference.
@@ -93,7 +93,7 @@ main (int argc, char *argv[])
       factory->get_iterator (pathname,
                              contents,
                              metadata
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_INFO,
@@ -107,20 +107,20 @@ main (int argc, char *argv[])
 
       int result = ::retrieve_data (metadata->content_type.in (),
                                     contents.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return -1;
 
       // Done with the Content_Iterator, so destroy it.
-      contents->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      contents->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->shutdown (0 TAO_ENV_ARG_PARAMETER);
+      orb->shutdown (0 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_CATCH (Web_Server::Error_Result, exc)
@@ -149,7 +149,7 @@ main (int argc, char *argv[])
 
 int retrieve_data (const char *content_type,
                    Web_Server::Content_Iterator_ptr iterator
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   Web_Server::Content_Iterator_var contents =
     Web_Server::Content_Iterator::_duplicate (iterator);
@@ -179,7 +179,7 @@ int retrieve_data (const char *content_type,
 
   for (;;)
     {
-      rc = contents->next_chunk (offset, chunk TAO_ENV_ARG_PARAMETER);
+      rc = contents->next_chunk (offset, chunk ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (!rc)
diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
index 0ff14a044c1..733b3e71dfc 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
@@ -13,46 +13,46 @@ ACE_RCSID(SMI_Iterator, server, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             "Mighty ORB"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the Root POA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA manager.
       PortableServer::POAManager_var mgr = poa->the_POAManager ();
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the Iterator_Factory servant and object.
       // It activates and deactivates the Content_Iterator object.
       Iterator_Factory_i factory_servant;
       Web_Server::Iterator_Factory_var factory =
-        factory_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        factory_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a reference to the Name Service.
       obj = orb->resolve_initial_references ("NameService"
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow to a Naming Context
       CosNaming::NamingContext_var nc;
-      nc = CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+      nc = CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a name.
@@ -61,12 +61,12 @@ main (int argc, char *argv[])
       name[0].id = CORBA::string_dup ("Iterator_Factory");
       name[0].kind = CORBA::string_dup ("");
 
-      nc->bind (name, factory.in () TAO_ENV_ARG_PARAMETER);
+      nc->bind (name, factory.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Some debugging output.
       CORBA::String_var IOR = orb->object_to_string (factory.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Bound <%s> to <%s> in Name Service.\n"),
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
                   ACE_TEXT ("Accepting requests.\n")));
 
       // Accept requests.
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index cc5c529d9ca..b71951cf34b 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -39,24 +39,24 @@ Consumer_Handler::init (int argc,
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     0
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object  =
         this->orb_->resolve_initial_references("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
         PortableServer::POA::_narrow (poa_object.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // Save the Shutdown callback.
@@ -67,7 +67,7 @@ Consumer_Handler::init (int argc,
 
       // Start the servant.
       this->receiver_ =
-        this->receiver_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->receiver_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -80,7 +80,7 @@ Consumer_Handler::init (int argc,
       // Subscribe ourselves with the notifier's broker.
       this->notifier_->subscribe (this->receiver_.in (),
                                   filtering_criteria
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
     }
   ACE_CATCHANY
    {
@@ -111,14 +111,14 @@ Consumer_Handler::get_notifier (void)
 
       CORBA::Object_var notifier_obj =
         this->naming_services_client_->resolve (notifier_ref_name
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The CORBA::Object_var object is downcast to Notifier_var
       // using the <_narrow> method.
       this->notifier_ =
         Event_Comm::Notifier::_narrow (notifier_obj.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -153,10 +153,10 @@ Consumer_Handler::run (void)
               "Running the Consumer...\n"));
 
   // Run the ORB.
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
index 56c065f735e..697408dfa36 100644
--- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
@@ -55,7 +55,7 @@ Consumer_Input_Handler::close (void)
           if (notifier != 0)
             notifier->unsubscribe (receiver,
                                    ""
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -138,7 +138,7 @@ Consumer_Input_Handler::handle_input (ACE_HANDLE h)
 
           event.tag_ = ACE_OS::strdup (buf);
 
-          notifier->push (event TAO_ENV_ARG_PARAMETER);
+          notifier->push (event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp
index ece9cc4de9f..d9d7cad9412 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.cpp
+++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp
@@ -157,7 +157,7 @@ The filtering criteria will not work.\n"));
 void
 Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
                        const char *filtering_criteria
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    Event_Comm::Notifier::CannotSubscribe
@@ -219,7 +219,7 @@ Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref,
 void
 Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref,
                          const char *filtering_criteria
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    Event_Comm::Notifier::CannotUnsubscribe
@@ -275,7 +275,7 @@ Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref,
 
 void
 Notifier_i::disconnect (const char *reason
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -302,7 +302,7 @@ Notifier_i::disconnect (const char *reason
       ACE_TRY
         {
           consumer_ref->disconnect (reason
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -330,7 +330,7 @@ Notifier_i::disconnect (const char *reason
 
 void
 Notifier_i::push (const Event_Comm::Event &event
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -368,7 +368,7 @@ Notifier_i::push (const Event_Comm::Event &event
           ACE_TRY
             {
               consumer_ref->push (event
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY
@@ -405,7 +405,7 @@ Consumer_i::~Consumer_i (void)
 
 void
 Consumer_i::push (const Event_Comm::Event &event
-                  TAO_ENV_ARG_DECL_NOT_USED)
+                  ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *tmpstr = event.tag_;
@@ -420,7 +420,7 @@ Consumer_i::push (const Event_Comm::Event &event
 
 void
 Consumer_i::disconnect (const char *reason
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.h b/TAO/examples/Event_Comm/Event_Comm_i.h
index ec27c355bab..e58adc4da1d 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.h
+++ b/TAO/examples/Event_Comm/Event_Comm_i.h
@@ -57,12 +57,12 @@ public:
   // set the <ACE_Reactor> to use when quitting.
 
   virtual void push (const Event_Comm::Event & event
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Pass the <event> to the <Consumer>.
 
   virtual void disconnect (const char * reason
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Disconnect the <Consumer> from the <Notifier>, giving it the
@@ -94,19 +94,19 @@ public:
   // Initialize a Notifier_i object with the specified size hint.
 
   virtual void disconnect (const char *reason
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnect all the receivers, giving them the <reason>.
 
   virtual void push (const Event_Comm::Event &event
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Send the <event> to all the consumers who have subscribed and who
   // match the filtering criteria.
 
    virtual void subscribe (Event_Comm::Consumer_ptr Consumer,
                            const char * filtering_criteria
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((
                       CORBA::SystemException,
                       Event_Comm::Notifier::CannotSubscribe
@@ -116,7 +116,7 @@ public:
 
  void unsubscribe (Event_Comm::Consumer *consumer,
                     const char *filtering_criteria
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
    ACE_THROW_SPEC ((
                     CORBA::SystemException,
                     Event_Comm::Notifier::CannotUnsubscribe
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp
index f540f1fd367..b2cb6b53f94 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp
@@ -91,24 +91,24 @@ Notifier_Handler::init (int argc,
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     0
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object  =
         this->orb_->resolve_initial_references("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
         PortableServer::POA::_narrow (poa_object.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // Initialization of the naming service.
@@ -125,7 +125,7 @@ Notifier_Handler::init (int argc,
 
       CORBA::Object_var notifier_obj =
        this->naming_client_->resolve (notifier_ref_name
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -133,7 +133,7 @@ Notifier_Handler::init (int argc,
       // using the <_narrow> method.
       this->notifier_ =
          Event_Comm::Notifier::_narrow (notifier_obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
   }
  ACE_CATCHANY
diff --git a/TAO/examples/Event_Comm/Notifier_Server.cpp b/TAO/examples/Event_Comm/Notifier_Server.cpp
index 40451d57576..fb57174dff1 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Server.cpp
@@ -28,7 +28,7 @@ Notifier_Server::close (void)
     {
       // disconnect all the consumers.
       this->servant_.disconnect ("notifier shutdown."
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Name the object.
@@ -38,7 +38,7 @@ Notifier_Server::close (void)
         CORBA::string_dup (NOTIFIER_BIND_NAME);
 
       this->naming_server_->unbind (notifier_obj_name
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instruct the ORB to shutdown.
@@ -57,7 +57,7 @@ Notifier_Server::close (void)
 // the object name is bound to the naming server.
 
 int
-Notifier_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+Notifier_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -76,7 +76,7 @@ Notifier_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 
       // Register the object implementation with the POA.
       Event_Comm::Notifier_var notifier_obj =
-        this->servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Name the object.
@@ -89,7 +89,7 @@ Notifier_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
       // Now, attach the object name to the context.
       this->naming_server_->bind (notifier_obj_name,
                                   notifier_obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -108,7 +108,7 @@ Notifier_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 int
 Notifier_Server::init (int argc,
                        char *argv[]
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create the child poa under the root POA.
@@ -116,7 +116,7 @@ Notifier_Server::init (int argc,
  if (this->orb_manager_.init_child_poa (argc,
                                         argv,
                                         "child_poa"
-                                        TAO_ENV_ARG_PARAMETER) == -1)
+                                        ACE_ENV_ARG_PARAMETER) == -1)
 
    ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
@@ -124,26 +124,26 @@ Notifier_Server::init (int argc,
                       -1);
  ACE_CHECK_RETURN (-1);
 
- this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
  ACE_CHECK_RETURN (-1);
 
  // Activate the servant in the POA.
  CORBA::String_var str =
    this->orb_manager_.activate_under_child_poa (NOTIFIER_BIND_NAME,
                                                  &this->servant_
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
 
- return this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+ return this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
-Notifier_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+Notifier_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Running the notifier server...\n"));
 
   // Run the main event loop for the ORB.
-  this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h
index 8f09294582d..e5f3f38b8e1 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.h
+++ b/TAO/examples/Event_Comm/Notifier_Server.h
@@ -35,10 +35,10 @@ public:
   ~Notifier_Server (void);
   // Destructor.
 
- int init (int argc, char *argv[] TAO_ENV_ARG_DECL);
+ int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Initialize the Server state.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
   int close (void);
@@ -48,7 +48,7 @@ public:
   // Reactor accessor.
 
 private:
-  int init_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  int init_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Initialises the name server and registers the Notifier server
   // object name with the name server.
 
diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
index 64953cb2dbb..73847bd2ce9 100644
--- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
@@ -109,7 +109,7 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE)
           // reference...  event.value_ = ...
 
           // Forward <Event> to all <Consumers>.
-          notifier->push (event TAO_ENV_ARG_PARAMETER);
+          notifier->push (event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp
index bb8ea19c6fb..8e348b1df5b 100644
--- a/TAO/examples/Event_Comm/notifier.cpp
+++ b/TAO/examples/Event_Comm/notifier.cpp
@@ -22,7 +22,7 @@ Notifier::run (void)
 {
   ACE_TRY_NEW_ENV
     {
-      ns_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ns_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -36,7 +36,7 @@ Notifier::Notifier (int argc, char *argv[])
 {
   ACE_TRY_NEW_ENV
     {
-      ns_.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      ns_.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp
index 70f499475d3..4fb31825759 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Client.cpp
@@ -73,12 +73,12 @@ Identity_Client::init (int argc,
 {
   int result;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       result = this->orb_manager_.init (argc,
                                         argv
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return result;
@@ -100,7 +100,7 @@ Identity_Client::init (int argc,
 }
 
 int
-Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL)
+Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "Identity_Client: Initialized \n"));
 
@@ -108,11 +108,11 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::ORB_var orb = orb_manager_.orb ();
   CORBA::Object_var obj =
     orb->string_to_object (this->group_factory_ior_
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   Load_Balancer::Object_Group_Factory_var factory =
     Load_Balancer::Object_Group_Factory::_narrow (obj.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (factory.in ()))
@@ -131,11 +131,11 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL)
               "with id <%s>\n", group_name));
   Load_Balancer::Object_Group_var object_group =
     factory->resolve (group_name
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // List <Object_Group>'s id.
-  CORBA::String_var id = object_group->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var id = object_group->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (ACE_OS::strcmp (id.in (), group_name) != 0)
@@ -150,7 +150,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL)
               group_name));
 
   Load_Balancer::Member_ID_List_var id_list =
-    object_group->members (TAO_ENV_SINGLE_ARG_PARAMETER);
+    object_group->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -177,11 +177,11 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL)
 
   for (size_t ind = 0; ind < this->number_of_invocations_; ++ind)
     {
-      obj = object_group->resolve (TAO_ENV_SINGLE_ARG_PARAMETER);
+      obj = object_group->resolve (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       identity_object = Identity::_narrow (obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       if (CORBA::is_nil (identity_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -189,7 +189,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL)
                            "<Object_Group::resolve> to <Identity>\n"),
                           -1);
       identity_object->get_name (identity.out ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -212,10 +212,10 @@ main (int argc, char *argv[])
   if (client.init (argc, argv) == -1)
     return 1;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      result = client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Load_Balancing/Identity_Client.h b/TAO/examples/Load_Balancing/Identity_Client.h
index 86b76d1bfc3..371c41c17bd 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.h
+++ b/TAO/examples/Load_Balancing/Identity_Client.h
@@ -54,7 +54,7 @@ public:
   int init (int argc, char *argv[]);
   // Initializes <orb_manager_>, and parses commandline arguments.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // See TITLE.
 
 private:
diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp
index 27640d49433..dfc94035395 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Server.cpp
@@ -69,12 +69,12 @@ Identity_Server::init (int argc,
 {
   int result;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       result = this->orb_manager_.init (argc,
                                         argv
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return result;
@@ -89,11 +89,11 @@ Identity_Server::init (int argc,
       CORBA::ORB_var orb = orb_manager_.orb ();
       CORBA::Object_var obj =
         orb->string_to_object (this->group_factory_ior_
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       Load_Balancer::Object_Group_Factory_var factory =
         Load_Balancer::Object_Group_Factory::_narrow (obj.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -108,7 +108,7 @@ Identity_Server::init (int argc,
 
       Load_Balancer::Object_Group_var random_group =
         factory->make_random ("Identity, Random"
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -117,7 +117,7 @@ Identity_Server::init (int argc,
 
       Load_Balancer::Object_Group_var rr_group =
         factory->make_round_robin ("Identity, Round Robin"
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the requested number of <Identity> objects, and
@@ -130,7 +130,7 @@ Identity_Server::init (int argc,
                     random_objects_));
       create_objects (random_objects_,
                       random_group.in ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -139,7 +139,7 @@ Identity_Server::init (int argc,
                     random_objects_));
       create_objects (rr_objects_,
                       rr_group.in ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -156,7 +156,7 @@ Identity_Server::init (int argc,
 void
 Identity_Server::create_objects (size_t number_of_objects,
                                  Load_Balancer::Object_Group_ptr group
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   // Create the specified number of servants, and register each one
   // with the provided <Object_Group>.
@@ -176,29 +176,29 @@ Identity_Server::create_objects (size_t number_of_objects,
       ACE_CHECK;
       PortableServer::ServantBase_var s = identity_servant;
       orb_manager_.activate (identity_servant
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       Load_Balancer::Member member;
       member.id = CORBA::string_dup (id);
-      member.obj = identity_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      member.obj = identity_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Bind the servant in the <Object_Group>.
-      group->bind (member TAO_ENV_ARG_PARAMETER);
+      group->bind (member ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 int
-Identity_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+Identity_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Identity_Server: Initialized \n"));
 
   int result;
 
-  result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
@@ -217,10 +217,10 @@ main (int argc, char *argv[])
   if (server.init (argc, argv) == -1)
     return 1;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      result = server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Load_Balancing/Identity_Server.h b/TAO/examples/Load_Balancing/Identity_Server.h
index 698d5c89806..5b9249f8fac 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.h
+++ b/TAO/examples/Load_Balancing/Identity_Server.h
@@ -49,7 +49,7 @@ public:
   // Performs all the initializations necessary before going into the
   // ORB event loop.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the server.
 
 private:
@@ -58,7 +58,7 @@ private:
 
   void create_objects (size_t number_of_objects,
                        Load_Balancer::Object_Group_ptr group
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // Creates the specified number of identity objects, and registers
   // each one with the provided <Object_Group>.  Identity servants are
   // given names
diff --git a/TAO/examples/Load_Balancing/Identity_i.cpp b/TAO/examples/Load_Balancing/Identity_i.cpp
index ff364494541..69a168f2e63 100644
--- a/TAO/examples/Load_Balancing/Identity_i.cpp
+++ b/TAO/examples/Load_Balancing/Identity_i.cpp
@@ -25,7 +25,7 @@ Identity_i::~Identity_i (void)
 
 void
 Identity_i::get_name (CORBA::String_out name
-                      TAO_ENV_ARG_DECL_NOT_USED )
+                      ACE_ENV_ARG_DECL_NOT_USED )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   name = this->name_.in ();
diff --git a/TAO/examples/Load_Balancing/Identity_i.h b/TAO/examples/Load_Balancing/Identity_i.h
index 281ca40f138..568f798f1b5 100644
--- a/TAO/examples/Load_Balancing/Identity_i.h
+++ b/TAO/examples/Load_Balancing/Identity_i.h
@@ -37,7 +37,7 @@ public:
   // Destructor.
 
   virtual void get_name (CORBA::String_out name
-                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the name of this object.
 
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
index 9bc3e9a90ba..78537a45bd4 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp
@@ -33,30 +33,30 @@ Object_Group_Factory_i::remove_group (const ACE_CString &id,
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_round_robin (const char * id
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
   return make_group (0,
                      id
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
 }
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_random (const char * id
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
   return make_group (1,
                      id
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
 }
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_group (int random,
                                     const char * id
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
@@ -89,10 +89,10 @@ Object_Group_Factory_i::make_group (int random,
       ACE_Auto_Basic_Ptr<Object_Group_i> temp (group_servant);
 
       // Register with the poa, begin using ref. counting.
-      group = group_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      group = group_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (group._retn ());
 
-      group_servant->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      group_servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
       temp.release ();
 
@@ -123,7 +123,7 @@ Object_Group_Factory_i::make_group (int random,
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::resolve (const char * id
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
 {
@@ -140,7 +140,7 @@ Object_Group_Factory_i::resolve (const char * id
 
 Load_Balancer::Group_List *
 Object_Group_Factory_i::list_groups (int random
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   Load_Balancer::Group_List * list;
 
@@ -181,17 +181,17 @@ Object_Group_Factory_i::list_groups (int random
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::round_robin_groups (TAO_ENV_SINGLE_ARG_DECL)
+Object_Group_Factory_i::round_robin_groups (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return list_groups (0 TAO_ENV_ARG_PARAMETER);
+  return list_groups (0 ACE_ENV_ARG_PARAMETER);
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::random_groups (TAO_ENV_SINGLE_ARG_DECL)
+Object_Group_Factory_i::random_groups (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return list_groups (1 TAO_ENV_ARG_PARAMETER);
+  return list_groups (1 ACE_ENV_ARG_PARAMETER);
 }
 
 Object_Group_i::Object_Group_i (const char * id,
@@ -214,7 +214,7 @@ Object_Group_i::~Object_Group_i (void)
 }
 
 char *
-Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Object_Group_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (id_.c_str ());
@@ -222,7 +222,7 @@ Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Object_Group_i::bind (const Load_Balancer::Member & member
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::duplicate_member))
 {
@@ -257,7 +257,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member
 
 void
 Object_Group_i::unbind (const char * id
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -287,7 +287,7 @@ Object_Group_i::unbind (const char * id
 
 CORBA::Object_ptr
 Object_Group_i::resolve_with_id (const char * id
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -302,7 +302,7 @@ Object_Group_i::resolve_with_id (const char * id
 }
 
 Load_Balancer::Member_ID_List *
-Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL)
+Object_Group_i::members (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Load_Balancer::Member_ID_List * list;
@@ -331,21 +331,21 @@ Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deregister with POA.
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -366,18 +366,18 @@ Random_Object_Group::~Random_Object_Group (void)
 }
 
 void
-Random_Object_Group::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Random_Object_Group::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //Deregisters this <Object_Group> with its
   // <Object_Group_Factory>.
   my_factory_->remove_group (id_, 1);
 
-  Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-Random_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL)
+Random_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -416,18 +416,18 @@ RR_Object_Group::~RR_Object_Group (void)
 }
 
 void
-RR_Object_Group::destroy (TAO_ENV_SINGLE_ARG_DECL)
+RR_Object_Group::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //Deregisters this <Object_Group> with its
   // <Object_Group_Factory>.
   my_factory_->remove_group (id_, 0);
 
-  Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL)
+RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -459,7 +459,7 @@ RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 RR_Object_Group::unbind (const char *id
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h
index cf997db1d6c..55a649c273e 100644
--- a/TAO/examples/Load_Balancing/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h
@@ -59,7 +59,7 @@ public:
   // = Load_Balancer::Object_Group_Factory idl methods.
 
   Load_Balancer::Object_Group_ptr make_round_robin (const char * id
-                                                    TAO_ENV_ARG_DECL)
+                                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -69,7 +69,7 @@ public:
   // exception is thrown.
 
   Load_Balancer::Object_Group_ptr make_random (const char * id
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -79,21 +79,21 @@ public:
   // exception is thrown.
 
   Load_Balancer::Object_Group_ptr resolve (const char * id
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
   // Locates and returns an <Object_Group> by its <Group_ID>.   If
   // no <Object_Group> has <Group_ID> of <id>, throw a
   // <no_such_group> exception.
 
-  Load_Balancer::Group_List * round_robin_groups (TAO_ENV_SINGLE_ARG_DECL)
+  Load_Balancer::Group_List * round_robin_groups (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Lists all the round robin <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
   // a sequence of <Group_ID>s of all existing round robin
   // <Object_Group>s created by this factory.
 
-  Load_Balancer::Group_List * random_groups (TAO_ENV_SINGLE_ARG_DECL)
+  Load_Balancer::Group_List * random_groups (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Lists all the random <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
@@ -116,7 +116,7 @@ private:
 
   Load_Balancer::Object_Group_ptr make_group (int random,
                                               const char * id
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // This function factors out common code in <make_round_robin> and
@@ -124,7 +124,7 @@ private:
   // set to 1 and round robin <Object_Group> if it is 0.
 
   Load_Balancer::Group_List * list_groups (int random
-                                           TAO_ENV_ARG_DECL);
+                                           ACE_ENV_ARG_DECL);
   // This function factors out common code in <random_groups> and
   // <round_robin_groups>.  Returns a sequence of its random
   // groups if <random> parameter is set to 1 and a sequence of its
@@ -170,12 +170,12 @@ public:
 
   // = Load_Balancer::Object_Group idl methods.
 
-  char * id (TAO_ENV_SINGLE_ARG_DECL)
+  char * id (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get group's id.
 
   void bind (const Load_Balancer::Member & member
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_member));
   // Adds a new <member> to the <Object_Group>.  Note that each
@@ -184,14 +184,14 @@ public:
   // <duplicate_member> exceptions is thrown.
 
   void unbind (const char * id
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Removes a member with the specified <Member_ID> from the
   // <Object_Group>.  If none of the group's members have a
   // Member_ID of <id>, <no_such_member> exception is thrown.
 
-  CORBA::Object_ptr resolve (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::Object_ptr resolve (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member)) = 0;
   // Returns a member object from this <Object_Group> in accordance with
@@ -200,18 +200,18 @@ public:
   // exception is thrown.
 
   CORBA::Object_ptr resolve_with_id (const char * id
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns an object with the specified <Member_ID>.  If this
   // <Object_Group> contains no members with the specified
   // <Member_ID>, <no_such_member> exception is thrown.
 
-  Load_Balancer::Member_ID_List * members (TAO_ENV_SINGLE_ARG_DECL)
+  Load_Balancer::Member_ID_List * members (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return a sequence of <Member_ID>s of all of its members.
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
@@ -265,13 +265,13 @@ public:
   ~Random_Object_Group (void);
   // Destructor.
 
-  CORBA::Object_ptr resolve (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::Object_ptr resolve (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns a member object from this <Object_Group> in accordance with
   // the "random" load balancing policy.
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
@@ -295,20 +295,20 @@ public:
   // Destructor.
 
   void unbind (const char * id
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // We need to override the implementation of <unbind> from
   // Object_Group_i to make sure <resolve>
   // works correctly.
 
-  CORBA::Object_ptr resolve (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::Object_ptr resolve (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns a member object from this <Object_Group> in accordance with
   // the "round robin" load balancing policy.
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
index 9011b0d388d..fc4df170ef7 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
@@ -65,12 +65,12 @@ Load_Balancing_Service::init (int argc,
   int result;
   CORBA::String_var ior;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       result = this->orb_manager_.init (argc,
                                         argv
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return result;
@@ -87,7 +87,7 @@ Load_Balancing_Service::init (int argc,
                       -1);
       PortableServer::ServantBase_var s = factory_servant;
       ior = orb_manager_.activate (factory_servant
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ior.in () == 0)
@@ -118,14 +118,14 @@ Load_Balancing_Service::init (int argc,
 
 
 int
-Load_Balancing_Service::run (TAO_ENV_SINGLE_ARG_DECL)
+Load_Balancing_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Load_Balancer: Initialized \n"));
 
   int result;
 
-  result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
@@ -144,10 +144,10 @@ main (int argc, char *argv[])
   if (factory.init (argc, argv) == -1)
     return 1;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      result = factory.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = factory.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.h b/TAO/examples/Load_Balancing/Load_Balancing_Service.h
index c9aea348aa8..eb42bb8375a 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.h
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.h
@@ -44,7 +44,7 @@ public:
   // Initialize the <Load_Balancing_Service>: initializes the ORB, parses
   // arguments, creates a servant ...
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the server.
 
 private:
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
index 5f58ee660d2..d8843235965 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -82,7 +82,7 @@ Identity_Client::init (int argc,
     {
       result = this->orb_manager_.init (argc,
                                         argv
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return result;
@@ -104,13 +104,13 @@ Identity_Client::init (int argc,
 }
 
 int
-Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL)
+Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Contact the <Object_Group_Factory> to obtain an <Object_Group>.
   CORBA::ORB_var orb = orb_manager_.orb ();
   CORBA::Object_var obj =
     orb->string_to_object (this->group_factory_ior_
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (obj.in () == 0)
@@ -121,7 +121,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL)
 
   Load_Balancer::Object_Group_Factory_var factory =
     Load_Balancer::Object_Group_Factory::_narrow (obj.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (factory.in ()))
@@ -157,7 +157,7 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL)
       // Remote call
       object_group =
         factory->resolve (group_name
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::String_var iorstring =
@@ -187,13 +187,13 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   // List <Object_Group>'s id.
-  CORBA::String_var id = object_group->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var id = object_group->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Object Group's id is: %s\n\n", id.in ()));
 
   // List all <Object_Group>s members.
   Load_Balancer::Member_ID_List_var id_list =
-    object_group->members (TAO_ENV_SINGLE_ARG_PARAMETER);
+    object_group->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG,
               "The group contains %d members:\n",
@@ -211,15 +211,15 @@ Identity_Client::run (TAO_ENV_SINGLE_ARG_DECL)
 
   for (size_t ind = 0; ind < this->number_of_invocations_; ++ind)
     {
-      objref = object_group->resolve (TAO_ENV_SINGLE_ARG_PARAMETER);
+      objref = object_group->resolve (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       obj = orb->string_to_object (objref.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       identity_object = Identity::_narrow (obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (CORBA::is_nil (identity_object.in ()))
@@ -256,7 +256,7 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      result = client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.h b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
index 64c168016e4..ceafcc5067f 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
@@ -54,7 +54,7 @@ public:
   int init (int argc, char *argv[]);
   // Initializes <orb_manager_>, and parses commandline arguments.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // See TITLE.
 
 private:
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
index 3857e58845d..5b2aa19c32a 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
@@ -62,7 +62,7 @@ Identity_Server::init (int argc,
     {
       result = this->orb_manager_.init (argc,
                                         argv
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return result;
@@ -73,19 +73,19 @@ Identity_Server::init (int argc,
       // Lifespan policy
       policies[0] =
         this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT
-                                                               TAO_ENV_ARG_PARAMETER);
+                                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policies[1] =
         this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                                          TAO_ENV_ARG_PARAMETER);
+                                                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->persistent_POA_  =
         this->orb_manager_.root_poa()->create_POA ("persistent_server",
                                                    this->orb_manager_.poa_manager (),
                                                    policies
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -94,7 +94,7 @@ Identity_Server::init (int argc,
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -112,7 +112,7 @@ Identity_Server::init (int argc,
 }
 
 int
-Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL)
+Identity_Server::register_groups (ACE_ENV_SINGLE_ARG_DECL)
 {
 
 
@@ -122,12 +122,12 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::ORB_var orb = orb_manager_.orb ();
   CORBA::Object_var obj =
     orb->string_to_object (this->group_factory_ior_
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Load_Balancer::Object_Group_Factory_var factory =
     Load_Balancer::Object_Group_Factory::_narrow (obj.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (factory.in ()))
@@ -141,7 +141,7 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL)
   ACE_TRY_EX (UNBIND_RANDOM)
     {
       factory->unbind_random ("Random group"
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (UNBIND_RANDOM);
     }
   ACE_CATCHANY
@@ -155,7 +155,7 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL)
   ACE_TRY_EX (UNBIND_ROUND)
     {
       factory->unbind_round_robin ("Round Robin group"
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (UNBIND_ROUND);
     }
   ACE_CATCHANY
@@ -169,12 +169,12 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL)
   // We want to make two groups Random & Round Robin.
   Load_Balancer::Object_Group_var random_group =
     factory->make_random ("Random group"
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Load_Balancer::Object_Group_var rr_group =
     factory->make_round_robin ("Round Robin group"
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
@@ -183,13 +183,13 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL)
   // <Object_Group>s.
   this->create_objects (random_objects_,
                         random_group.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
   this->create_objects (rr_objects_,
                         rr_group.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -198,7 +198,7 @@ Identity_Server::register_groups (TAO_ENV_SINGLE_ARG_DECL)
 void
 Identity_Server::create_objects (size_t number_of_objects,
                                  Load_Balancer::Object_Group_ptr group
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   // Create the specified number of servants, and register each one
   // with the provided <Object_Group>.
@@ -218,23 +218,23 @@ Identity_Server::create_objects (size_t number_of_objects,
       ACE_CHECK;
 
       PortableServer::ServantBase_var s = identity_servant;
-      this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::Object_var obj = identity_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Object_var obj = identity_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Load_Balancer::Member member;
       member.id = CORBA::string_dup (id);
       member.obj =
         this->orb_manager_.orb ()->object_to_string (obj.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Do an unbind and then bind
       ACE_TRY_EX (UNBIND)
         {
-          group->unbind (id TAO_ENV_ARG_PARAMETER);
+          group->unbind (id ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (UNBIND);
         }
       ACE_CATCHANY
@@ -245,18 +245,18 @@ Identity_Server::create_objects (size_t number_of_objects,
       ACE_ENDTRY;
 
       // Bind the servant in the random <Object_Group>.
-      group->bind (member TAO_ENV_ARG_PARAMETER);
+      group->bind (member ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
     }
 }
 
 int
- Identity_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+ Identity_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   int result;
 
-  result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
@@ -282,10 +282,10 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      result = server.register_groups (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = server.register_groups (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      result = server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.h b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
index 7ee31f5fd29..d9f69946a5d 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
@@ -52,10 +52,10 @@ public:
   // Performs all the initializations necessary before going into the
   // ORB event loop.
 
-  int register_groups (TAO_ENV_SINGLE_ARG_DECL);
+  int register_groups (ACE_ENV_SINGLE_ARG_DECL);
 
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the server.
 
 private:
@@ -63,7 +63,7 @@ private:
 
   void create_objects (size_t number_of_objects,
                        Load_Balancer::Object_Group_ptr group
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // Creates the specified number of identity objects, and registers
   // each one with the provided <Object_Group>.  Identity servants are
   // given names
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
index 16ac105669f..5c8d6b0b57d 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp
@@ -27,14 +27,14 @@ Identity_i::~Identity_i (void)
 
 void
 Identity_i::get_name (CORBA::String_out name
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   name = this->name_.in ();
 }
 
 PortableServer::POA_ptr
-Identity_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Identity_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h
index 0e381b99b4c..1a7df37cfbc 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h
@@ -38,11 +38,11 @@ public:
   // Destructor.
 
   virtual void get_name (CORBA::String_out name
-                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the name of this object.
 
-  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL)
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Method for the POA that will return the persistent POA_ptr stored
   // in here..
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index 8448a84b8c6..30bb0dd6831 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -39,7 +39,7 @@ Object_Group_Factory_i::~Object_Group_Factory_i (void)
 }
 
 PortableServer::POA_ptr
-Object_Group_Factory_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Object_Group_Factory_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
@@ -48,7 +48,7 @@ Object_Group_Factory_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_round_robin (const char * id
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
@@ -74,12 +74,12 @@ Object_Group_Factory_i::make_round_robin (const char * id
 
   return this->make_group (0,
                            id
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 }
 
 void
 Object_Group_Factory_i::unbind_round_robin (const char * id
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
 {
@@ -120,7 +120,7 @@ Object_Group_Factory_i::unbind_round_robin (const char * id
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_random (const char * id
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
@@ -146,13 +146,13 @@ Object_Group_Factory_i::make_random (const char * id
 
   return this->make_group (1,
                            id
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 }
 
 
 void
 Object_Group_Factory_i::unbind_random (const char * id
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
 {
@@ -193,7 +193,7 @@ Object_Group_Factory_i::unbind_random (const char * id
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::make_group (int random,
                                     const char * id
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group))
 {
@@ -237,15 +237,15 @@ Object_Group_Factory_i::make_group (int random,
   ACE_CHECK_RETURN (group._retn ());
 
   // Register with the poa, begin using ref. counting.
-  group = group_servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  group = group_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (group._retn ());
 
-  group_servant->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  group_servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
 
   CORBA::String_var ior =
     this->orb_->object_to_string (group.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
 
 
@@ -287,7 +287,7 @@ Object_Group_Factory_i::make_group (int random,
 
   // Update the value of flags_
   this->update_flags (random
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
 
   if (result == -1)
@@ -309,7 +309,7 @@ Object_Group_Factory_i::make_group (int random,
 
 Load_Balancer::Object_Group_ptr
 Object_Group_Factory_i::resolve (const char * id
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group))
 {
@@ -358,7 +358,7 @@ Object_Group_Factory_i::resolve (const char * id
     {
       this->mem_pool_->find (flags_name_bind,
                              (void *&)this->flags_);
-      this->update_objects (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->update_objects (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
     }
 
@@ -375,12 +375,12 @@ Object_Group_Factory_i::resolve (const char * id
 
   CORBA_Object_var objref =
     this->orb_->string_to_object (ior
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
 
   Load_Balancer::Object_Group_ptr
     object_group = Load_Balancer::Object_Group::_narrow (objref.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (Load_Balancer::Object_Group::_nil ());
 
@@ -403,7 +403,7 @@ Object_Group_Factory_i::resolve (const char * id
 
 Load_Balancer::Group_List *
 Object_Group_Factory_i::list_groups (int random
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   Load_Balancer::Group_List * list;
 
@@ -444,23 +444,23 @@ Object_Group_Factory_i::list_groups (int random
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::round_robin_groups (TAO_ENV_SINGLE_ARG_DECL)
+Object_Group_Factory_i::round_robin_groups (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return list_groups (0 TAO_ENV_ARG_PARAMETER);
+  return list_groups (0 ACE_ENV_ARG_PARAMETER);
 }
 
 Load_Balancer::Group_List *
-Object_Group_Factory_i::random_groups (TAO_ENV_SINGLE_ARG_DECL)
+Object_Group_Factory_i::random_groups (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return list_groups (1 TAO_ENV_ARG_PARAMETER);
+  return list_groups (1 ACE_ENV_ARG_PARAMETER);
 }
 
 
 void
 Object_Group_Factory_i::update_flags (int random
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   //First check whether we have memory for flags_
   if (!this->flags_)
@@ -503,7 +503,7 @@ Object_Group_Factory_i::update_flags (int random
 }
 
 void
-Object_Group_Factory_i::update_objects (TAO_ENV_SINGLE_ARG_DECL)
+Object_Group_Factory_i::update_objects (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Create an appropriate servant.
   Object_Group_i * group_servant = 0;
@@ -583,7 +583,7 @@ Object_Group_i::~Object_Group_i (void)
 
 
 PortableServer::POA_ptr
-Object_Group_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Object_Group_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
@@ -591,7 +591,7 @@ Object_Group_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 char *
-Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Object_Group_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (id_.c_str ());
@@ -599,14 +599,14 @@ Object_Group_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Object_Group_i::bind (const Load_Balancer::Member & member
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::duplicate_member))
 {
 
   if (this->members_ == 0)
     {
-      ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       id += server_id_name_bind;
@@ -665,7 +665,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member
   // member's id into <member_id_list_>.
 
   ACE_CString id = dll_name_bind;
-  id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 
@@ -699,14 +699,14 @@ Object_Group_i::bind (const Load_Balancer::Member & member
 
 void
 Object_Group_i::unbind (const char * id
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
   // Check whether the this->member_ is NULL
   if (this->members_ == 0)
     {
-      ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       id += server_id_name_bind;
@@ -729,7 +729,7 @@ Object_Group_i::unbind (const char * id
   if (this->member_id_list_ == 0)
     {
       ACE_CString id = dll_name_bind;
-      id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+      id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->allocator_->find (id.c_str (),
@@ -753,7 +753,7 @@ Object_Group_i::unbind (const char * id
 
 char *
 Object_Group_i::resolve_with_id (const char * id
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
@@ -773,12 +773,12 @@ Object_Group_i::resolve_with_id (const char * id
 }
 
 Load_Balancer::Member_ID_List *
-Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL)
+Object_Group_i::members (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Load_Balancer::Member_ID_List * list = 0;
 
-  this->read_from_memory (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->read_from_memory (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Figure out the length of the list.
@@ -807,29 +807,29 @@ Object_Group_i::members (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Object_Group_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Object_Group_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deregister with POA.
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Object_Group_i::read_from_memory (TAO_ENV_SINGLE_ARG_DECL)
+Object_Group_i::read_from_memory (ACE_ENV_SINGLE_ARG_DECL)
 {
     // Sanity check needs to be done in all the places
-  ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!this->members_)
@@ -848,7 +848,7 @@ Object_Group_i::read_from_memory (TAO_ENV_SINGLE_ARG_DECL)
   if (!this->member_id_list_)
     {
       id = dll_name_bind;
-      id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+      id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->allocator_->find (id.c_str (),
@@ -871,12 +871,12 @@ Random_Object_Group::Random_Object_Group (const char *id,
 }
 
 char *
-Random_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL)
+Random_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
 
-  this->read_from_memory (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->read_from_memory (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   size_t group_size = this->members_->current_size ();
@@ -911,13 +911,13 @@ RR_Object_Group::RR_Object_Group (const char *id,
 }
 
 char *
-RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL)
+RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
   char *objref = 0;
 
-  this->read_from_memory (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->read_from_memory (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   size_t group_size = this->members_->current_size ();
@@ -949,14 +949,14 @@ RR_Object_Group::resolve (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 RR_Object_Group::unbind (const char *id
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Load_Balancer::no_such_member))
 {
 
   if (this->members_ == 0)
     {
-      ACE_CString id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CString id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       id += server_id_name_bind;
@@ -982,7 +982,7 @@ RR_Object_Group::unbind (const char *id
   if (this->member_id_list_ == 0)
     {
       ACE_CString id = dll_name_bind;
-      id += this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+      id += this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->allocator_->find (id.c_str (),
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
index 5bc65fba26d..7eff01186b3 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h
@@ -66,7 +66,7 @@ public:
   // Destructor.
 
 
-  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL)
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException));
   // Method for the POA that will return the persistent POA_ptr stored
   // in here..
@@ -74,7 +74,7 @@ public:
   // = Load_Balancer::Object_Group_Factory idl methods.
 
   Load_Balancer::Object_Group_ptr make_round_robin (const char * id
-                                                    TAO_ENV_ARG_DECL)
+                                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -84,13 +84,13 @@ public:
   // exception is thrown.
 
   void unbind_round_robin (const char *id
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
 
 
   Load_Balancer::Object_Group_ptr make_random (const char * id
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // Creates an <Object_Group> that resolves requests for arbitrary
@@ -100,26 +100,26 @@ public:
   // exception is thrown.
 
   void unbind_random (const char *id
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
 
   Load_Balancer::Object_Group_ptr resolve (const char * id
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_group));
   // Locates and returns an <Object_Group IOR> by its <Group_ID>.   If
   // no <Object_Group> has <Group_ID> of <id>, throw a
   // <no_such_group> exception.
 
-  Load_Balancer::Group_List * round_robin_groups (TAO_ENV_SINGLE_ARG_DECL)
+  Load_Balancer::Group_List * round_robin_groups (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Lists all the round robin <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
   // a sequence of <Group_ID>s of all existing round robin
   // <Object_Group>s created by this factory.
 
-  Load_Balancer::Group_List * random_groups (TAO_ENV_SINGLE_ARG_DECL)
+  Load_Balancer::Group_List * random_groups (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Lists all the random <Object_Group>s which were created
   // by this factory, and haven't been destroyed yet, i.e., return
@@ -138,7 +138,7 @@ private:
 
   Load_Balancer::Object_Group_ptr make_group (int random,
                                               const char * id
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_group));
   // This function factors out common code in <make_round_robin> and
@@ -146,17 +146,17 @@ private:
   // set to 1 and round robin <Object_Group> if it is 0.
 
   Load_Balancer::Group_List * list_groups (int random
-                                           TAO_ENV_ARG_DECL);
+                                           ACE_ENV_ARG_DECL);
   // This function factors out common code in <random_groups> and
   // <round_robin_groups>.  Returns a sequence of its random
   // groups if <random> parameter is set to 1 and a sequence of its
   // round robin groups if it is 0.
 
   void update_flags (int random
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   // The helper that updates the vlaue of the variable flags_
 
-  void update_objects (TAO_ENV_SINGLE_ARG_DECL);
+  void update_objects (ACE_ENV_SINGLE_ARG_DECL);
   // This rolls back the status of the objects in the POA if the
   // service had failed..
 
@@ -211,17 +211,17 @@ public:
 
   // Persistent POA
   // Method for the POA
-  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL)
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = Load_Balancer::Object_Group idl methods.
 
-  char * id (TAO_ENV_SINGLE_ARG_DECL)
+  char * id (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get group's id.
 
   void bind (const Load_Balancer::Member & member
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::duplicate_member));
   // Adds a new <member> to the <Object_Group>.  Note that each
@@ -230,14 +230,14 @@ public:
   // <duplicate_member> exceptions is thrown.
 
   void unbind (const char * id
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Removes a member with the specified <Member_ID> from the
   // <Object_Group>.  If none of the group's members have a
   // Member_ID of <id>, <no_such_member> exception is thrown.
 
-  char * resolve (TAO_ENV_SINGLE_ARG_DECL)
+  char * resolve (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member)) = 0;
   // Returns a member object from this <Object_Group> in accordance with
@@ -246,18 +246,18 @@ public:
   // exception is thrown.
 
   char * resolve_with_id (const char * id
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns an object with the specified <Member_ID>.  If this
   // <Object_Group> contains no members with the specified
   // <Member_ID>, <no_such_member> exception is thrown.
 
-  Load_Balancer::Member_ID_List * members (TAO_ENV_SINGLE_ARG_DECL)
+  Load_Balancer::Member_ID_List * members (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return a sequence of <Member_ID>s of all of its members.
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cleanup the resources associated with this <Object_Group>.
   // Subsequent calls to this <Object_Group> should fail, and its
@@ -266,7 +266,7 @@ public:
 
 protected:
 
-  void read_from_memory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void read_from_memory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // This will replenish all the pointers that could have been lost
   // because of failure
 
@@ -309,7 +309,7 @@ public:
                        PortableServer::POA_ptr poa);
   // Constructor.
 
-  char * resolve (TAO_ENV_SINGLE_ARG_DECL)
+  char * resolve (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns a member object from this <Object_Group> in accordance with
@@ -330,14 +330,14 @@ public:
   // Constructor.
 
   void unbind (const char * id
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // We need to override the implementation of <unbind> from
   // Object_Group_i to make sure <resolve>
   // works correctly.
 
-  char * resolve (TAO_ENV_SINGLE_ARG_DECL)
+  char * resolve (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Load_Balancer::no_such_member));
   // Returns a member object from this <Object_Group> in accordance with
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
index 57b7d0ba7a9..bfe1cee4852 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
@@ -70,7 +70,7 @@ Load_Balancing_Service::init (int argc,
     {
       result = this->orb_manager_.init (argc,
                                         argv
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result == -1)
         return result;
@@ -87,19 +87,19 @@ Load_Balancing_Service::init (int argc,
       // Lifespan policy
       policies[0] =
         this->orb_manager_.root_poa()->create_lifespan_policy (PortableServer::PERSISTENT
-                                                               TAO_ENV_ARG_PARAMETER);
+                                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policies[1] =
         this->orb_manager_.root_poa()->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                                          TAO_ENV_ARG_PARAMETER);
+                                                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var persistent_POA =
         this->orb_manager_.root_poa()->create_POA ("persistent",
                                                    this->orb_manager_.poa_manager (),
                                                    policies
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -108,7 +108,7 @@ Load_Balancing_Service::init (int argc,
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -121,13 +121,13 @@ Load_Balancing_Service::init (int argc,
 
       // Activate the POA manager
       //PortableServer::ServantBase_var s = factory_servant;
-      this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var objref = factory_servant->_this ();
 
       ior = this->orb_manager_.orb ()->object_to_string (objref.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ior.in () == 0)
@@ -158,11 +158,11 @@ Load_Balancing_Service::init (int argc,
 
 
 int
-Load_Balancing_Service::run (TAO_ENV_SINGLE_ARG_DECL)
+Load_Balancing_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   int result;
 
-  result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
@@ -184,7 +184,7 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      result = factory.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = factory.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
index cf39008b21d..e25661d9bd5 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
@@ -44,7 +44,7 @@ public:
   // Initialize the <Load_Balancing_Service>: initializes the ORB, parses
   // arguments, creates a servant ...
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the server.
 
 private:
diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index 6a1cf278034..da8d25ba2d0 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -19,7 +19,7 @@ Logger_Factory_i::~Logger_Factory_i (void)
 
 Logger_ptr
 Logger_Factory_i::make_logger (const char *name
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Logger_i *result;
@@ -62,7 +62,7 @@ Logger_Factory_i::make_logger (const char *name
   // registration attempt.
   // @@ Matt, this code doesn't seem right.  Can you please check with
   // Irfan and Carlos about whether this is the right thing to do?
-  return result->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return result->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 Logger_i::Logger_i (const char *name)
@@ -112,33 +112,33 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level)
 
 void
 Logger_i::log (const Logger::Log_Record &log_rec
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity_level_ TAO_ENV_ARG_PARAMETER);
+  this->logv (log_rec, verbosity_level_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
 Logger_i::log2 (const Logger::Log_Record &log_rec
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity_level_ TAO_ENV_ARG_PARAMETER);
+  this->logv (log_rec, verbosity_level_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
 Logger_i::logv2 (const Logger::Log_Record &log_rec,
                Logger::Verbosity_Level verbosity
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->logv (log_rec, verbosity TAO_ENV_ARG_PARAMETER);
+  this->logv (log_rec, verbosity ACE_ENV_ARG_PARAMETER);
 }
 
 void
 Logger_i::logv (const Logger::Log_Record &log_rec,
                Logger::Verbosity_Level verbosity
-               TAO_ENV_ARG_DECL_NOT_USED)
+               ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create an <ACE_Log_Record> to leverage existing logging
@@ -188,7 +188,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec,
 
 void
 Logger_i::verbosity (Logger::Verbosity_Level level
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->verbosity_level_ = level;
diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/examples/Logging/Logger_i.h
index c775c094e55..a24b2565250 100644
--- a/TAO/examples/Logging/Logger_i.h
+++ b/TAO/examples/Logging/Logger_i.h
@@ -35,31 +35,31 @@ public:
   // destructor
 
   virtual void log (const Logger::Log_Record &log_rec
-                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output.
 
   virtual void logv (const Logger::Log_Record &log_rec,
                      Logger::Verbosity_Level verbosity
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
   virtual void log2 (const Logger::Log_Record &log_rec
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output.
 
   virtual void logv2 (const Logger::Log_Record &log_rec,
                       Logger::Verbosity_Level verbosity
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Writes the <log_rec> to the standard output with the given
   // verbosity level
 
    void verbosity (Logger::Verbosity_Level level
-                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the verbosity level. Valid values are {VERBOSE, VERBOSE_LITE
   //  and SILENT}. Defaults to VERBOSE
@@ -94,7 +94,7 @@ public:
   // Destructor.
 
   virtual Logger_ptr make_logger (const char *name
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function returns a logger with name <name>. If <name> is
   // unique, a new logger is created; else, a previously created
diff --git a/TAO/examples/Logging/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp
index d8943451bf2..51f5062e56e 100644
--- a/TAO/examples/Logging/Logging_Service.cpp
+++ b/TAO/examples/Logging/Logging_Service.cpp
@@ -14,16 +14,16 @@ main (int argc, char *argv[])
 
   Logger_Server log_server;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int ret = log_server.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int ret = log_server.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret == -1)
         return 1;
       else
         {
-          log_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          log_server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp
index 75e64bb96c1..36a50a7287a 100644
--- a/TAO/examples/Logging/Logging_Service_i.cpp
+++ b/TAO/examples/Logging/Logging_Service_i.cpp
@@ -44,7 +44,7 @@ Logger_Server::parse_args (void)
 int
 Logger_Server::init (int argc,
                      char *argv[]
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -54,7 +54,7 @@ Logger_Server::init (int argc,
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
                                          "child_poa"
-                                         TAO_ENV_ARG_PARAMETER) == -1)
+                                         ACE_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -62,7 +62,7 @@ Logger_Server::init (int argc,
 
   ACE_CHECK_RETURN (-1);
 
-  this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Parse the command line arguments.
@@ -76,14 +76,14 @@ Logger_Server::init (int argc,
   CORBA::String_var str =
     this->orb_manager_.activate_under_child_poa ("logger_factory",
                                                  &this->factory_impl_
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
     if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "The IOR is: <%s>\n",
                 str.in ()));
 
     // Initialize the naming service
-    int ret = this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+    int ret = this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
     if (ret != 0)
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -99,7 +99,7 @@ Logger_Server::init (int argc,
 // and logger_factory object.
 
 int
-Logger_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
+Logger_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER)
 {
   // Get pointers to the ORB and child POA
   CORBA::ORB_var orb = this->orb_manager_.orb ();
@@ -111,7 +111,7 @@ Logger_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SIN
     return -1;
 
   // Create an instance of the Logger_Factory
-  Logger_Factory_var factory = this->factory_impl_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  Logger_Factory_var factory = this->factory_impl_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   //Register the logger_factory
@@ -120,16 +120,16 @@ Logger_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SIN
   factory_name[0].id = CORBA::string_dup ("Logger_Factory");
   this->my_name_server_->bind (factory_name,
                                factory.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Logger_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+Logger_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  int ret = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (ret == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h
index 0f94019e7b2..bc70c520427 100644
--- a/TAO/examples/Logging/Logging_Service_i.h
+++ b/TAO/examples/Logging/Logging_Service_i.h
@@ -58,14 +58,14 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Logger_Server state - parsing arguments and ...
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the ORB.
 
   Logger_ptr make_logger (const char *name
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   // This function creates and returns a logger with the given <name>.
   // Currently, <name> is unused.
 
@@ -73,7 +73,7 @@ private:
   int parse_args (void);
   // Parses the commandline arguments.
 
-  int init_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  int init_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Initialises the name server and registers logger_factory with the
   // name server.
 
diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp
index 2941345f45d..8e47f94d2cf 100644
--- a/TAO/examples/Logging/Logging_Test_i.cpp
+++ b/TAO/examples/Logging/Logging_Test_i.cpp
@@ -28,7 +28,7 @@ Logger_Client::init (int argc, char *argv[])
   this->argc_ = argc;
   this->argv_ = argv;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       if (TAO_debug_level > 0)
@@ -38,7 +38,7 @@ Logger_Client::init (int argc, char *argv[])
       orb_ = CORBA::ORB_init (argc,
                               argv,
                               "internet"
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0)
@@ -50,7 +50,7 @@ Logger_Client::init (int argc, char *argv[])
         return -1;
 
       // Initialize the naming service
-      int ret = this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+      int ret = this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -58,7 +58,7 @@ Logger_Client::init (int argc, char *argv[])
                            "services.\n"),
                           -1);
       // Create the logger instances
-      ret = this->init_loggers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ret = this->init_loggers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,7 +79,7 @@ Logger_Client::init (int argc, char *argv[])
 }
 
 int
-Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+Logger_Client::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Initialize the naming services
   if (my_name_client_.init (orb_.in ()) != 0)
@@ -95,7 +95,7 @@ Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var factory_ref =
     my_name_client_->resolve (factory_name
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "\nFactory_ref resolved\n"));
@@ -111,7 +111,7 @@ Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
   // Narrow the factory and check the success
   factory_ =
     Logger_Factory::_narrow (factory_ref.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -127,7 +127,7 @@ Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
   // If debugging, get the factory's IOR
   CORBA::String_var str =
     orb_->object_to_string (factory_.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "The factory IOR is <%s>\n",
@@ -136,18 +136,18 @@ Logger_Client::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Logger_Client::init_loggers (TAO_ENV_SINGLE_ARG_DECL)
+Logger_Client::init_loggers (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Retrieve the Logger obj ref corresponding to key1 and
   // key2.
   ACE_TRY
     {
       this->logger_1_ = factory_->make_logger ("key1"
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->logger_2_ = factory_->make_logger ("key2"
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->logger_1_.in ()))
@@ -169,7 +169,7 @@ Logger_Client::init_loggers (TAO_ENV_SINGLE_ARG_DECL)
           ACE_DEBUG ((LM_DEBUG,
                       "\nTrying to resolve already created logger..."));
           Logger_var logger_3 = factory_->make_logger ("key1"
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (logger_3.in ()))
@@ -195,7 +195,7 @@ Logger_Client::init_loggers (TAO_ENV_SINGLE_ARG_DECL)
 int
 Logger_Client::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Create 3 Log_Records for the test
@@ -245,36 +245,36 @@ Logger_Client::run (void)
         }
 
       // Change the verbosity.
-      this->logger_1_->verbosity (Logger::VERBOSE_LITE TAO_ENV_ARG_PARAMETER);
+      this->logger_1_->verbosity (Logger::VERBOSE_LITE ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Log the first Log_Record (VERBOSE_LITE)
-      this->logger_1_->log (rec1 TAO_ENV_ARG_PARAMETER);
+      this->logger_1_->log (rec1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the verbosity again.
-      this->logger_2_->verbosity (Logger::VERBOSE TAO_ENV_ARG_PARAMETER);
+      this->logger_2_->verbosity (Logger::VERBOSE ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Log the second Log_Record (VERBOSE)
-      this->logger_2_->log (rec2 TAO_ENV_ARG_PARAMETER);
+      this->logger_2_->log (rec2 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the verbosity again
-      this->logger_2_->verbosity (Logger::SILENT TAO_ENV_ARG_PARAMETER);
+      this->logger_2_->verbosity (Logger::SILENT ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Log the third log record using logv() (this shows if the
       // verbosity level overrides the logger's verbosity level)
-      this->logger_2_->logv (rec3, Logger::VERBOSE TAO_ENV_ARG_PARAMETER);
+      this->logger_2_->logv (rec3, Logger::VERBOSE ACE_ENV_ARG_PARAMETER);
 
       // Change the verbosity again (so that regular log msgs can be
       // seen again)
-      this->logger_2_->verbosity (Logger::VERBOSE TAO_ENV_ARG_PARAMETER);
+      this->logger_2_->verbosity (Logger::VERBOSE ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Log the fourth record using log2()
-      this->logger_2_->log2 (rec4 TAO_ENV_ARG_PARAMETER);
+      this->logger_2_->log2 (rec4 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h
index d377718d42f..4eee2679da6 100644
--- a/TAO/examples/Logging/Logging_Test_i.h
+++ b/TAO/examples/Logging/Logging_Test_i.h
@@ -69,10 +69,10 @@ private:
                     const char *msg);
   // Prepares the <Log_Record> for logging.
 
-  int init_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  int init_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Initialises the name server and resolves the logger_factory
 
-  int init_loggers (TAO_ENV_SINGLE_ARG_DECL);
+  int init_loggers (ACE_ENV_SINGLE_ARG_DECL);
   // Instantiates the 2 logger member variables
 
   void show_record (Logger::Log_Record &newrec);
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index 94ae6ef95ef..e8a85e4a6ef 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -66,14 +66,14 @@ template <class Servant> int
 Server<Servant>::init (const char *servant_name,
                        int argc,
                        char *argv[]
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
                                          "child_poa"
-                                         TAO_ENV_ARG_PARAMETER) == -1)
+                                         ACE_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -103,7 +103,7 @@ Server<Servant>::init (const char *servant_name,
       CORBA::String_var str  =
         this->orb_manager_.activate_under_child_poa (servant_name,
                                                      &this->servant_
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -131,10 +131,10 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (TAO_ENV_SINGLE_ARG_DECL)
+Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL)
 {
     // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
                       -1);
@@ -237,7 +237,7 @@ Client<InterfaceObj, Var>::init (const char *name,
   this->argv_ = argv;
 
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -245,7 +245,7 @@ Client<InterfaceObj, Var>::init (const char *name,
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     name
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -257,7 +257,7 @@ Client<InterfaceObj, Var>::init (const char *name,
       if(this->ior_ != 0)
         {
           CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER);
+            this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
@@ -267,7 +267,7 @@ Client<InterfaceObj, Var>::init (const char *name,
                                this->ior_),
                               -1);
           this->server_ = InterfaceObj::_narrow (server_object.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -290,7 +290,7 @@ Client<InterfaceObj, Var>::init (const char *name,
 
 
 template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Client<InterfaceObj, Var>::obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 
   return 0;
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index d5edffeeb05..fc8fb5eb7c6 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -52,7 +52,7 @@ public:
   int init (const char *servant_name,
             int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Server state - parsing arguments and waiting.
   // interface_name is the name used to register the Servant.
 
@@ -60,7 +60,7 @@ public:
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
 protected:
@@ -121,7 +121,7 @@ public:
   void shutdown (int);
   // Fills in the shutdwon flag.
 
-  int obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL);
+  int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL);
   // Initialize naming service
 
 protected:
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index 6f93187e63c..c76cccb0176 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -18,7 +18,7 @@ Checkpoint_Client_i::run (const char *name,
   ACE_Time_Value now (ACE_OS::gettimeofday ());
   ACE_OS::srand ((unsigned int) now.sec () );
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -41,14 +41,14 @@ Checkpoint_Client_i::run (const char *name,
                                            new Temperature_impl (temperature)));
       t_e->origin_id_ (KITCHEN);
       t_e->do_print ();
-      checkpoint->put_event (t_e TAO_ENV_ARG_PARAMETER);
+      checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       temperature = random_number (25,30);
       t_e = new Temperature_impl (temperature);
       t_e->origin_id_ (BATHROOM);
       t_e->do_print ();
-      checkpoint->put_event (t_e TAO_ENV_ARG_PARAMETER);
+      checkpoint->put_event (t_e ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Point point = { random_number (0,4),
@@ -58,7 +58,7 @@ Checkpoint_Client_i::run (const char *name,
                                         new Position_impl (point)));
       p_e->origin_id_ (JONAS);
       p_e->do_print ();
-      checkpoint->put_event (p_e TAO_ENV_ARG_PARAMETER);
+      checkpoint->put_event (p_e ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -69,13 +69,13 @@ Checkpoint_Client_i::run (const char *name,
                                        new Log_Msg_impl (urgent, a_text)));
       l_e->origin_id_ (JONAS);
       l_e->do_print ();
-      checkpoint->put_event (l_e TAO_ENV_ARG_PARAMETER);
+      checkpoint->put_event (l_e ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       ACE_DEBUG ((LM_DEBUG, "\nNow getting the alarms:\n"));
 
-      Event_List_var list (checkpoint->get_critical_events (TAO_ENV_SINGLE_ARG_PARAMETER));
+      Event_List_var list (checkpoint->get_critical_events (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_TRY_CHECK;
 
       for (Event_List_Iterator i (list); i.next (); i.advance ())
@@ -84,7 +84,7 @@ Checkpoint_Client_i::run (const char *name,
         }
 
       if (checkpoint.shutdown () == 1)
-        checkpoint->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+        checkpoint->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
index 605c614f27d..ec5b27fb50b 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
@@ -18,7 +18,7 @@ Event_impl::~Event_impl ()
 }
 
 void
-Event_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Event_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG((LM_DEBUG, "(time %d origin %d)  ",
              (CORBA::ULong) this->time_(),
@@ -54,10 +54,10 @@ Temperature_impl::~Temperature_impl ()
 }
 
 void
-Temperature_impl::do_print (TAO_ENV_SINGLE_ARG_DECL)
+Temperature_impl::do_print (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The timestamp
-  Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER);
+  Event_impl::do_print (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG((LM_DEBUG, "Temperature is %f\n", this->temperature_() ));
@@ -91,51 +91,51 @@ Position_impl::~Position_impl ()
 }
 
 void
-Position_impl::do_print (TAO_ENV_SINGLE_ARG_DECL)
+Position_impl::do_print (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The timestamp
-  Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER);
+  Event_impl::do_print (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Float x =
-    this->x(TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->x(ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   CORBA::Float y =
-    this->y(TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->y(ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   CORBA::Float z =
-    this->z(TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->z(ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   ACE_DEBUG((LM_DEBUG, "Position is (%f, %f, %f)\n",
              x, y, z));
 }
 
-CORBA::Float Position_impl::x (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Float Position_impl::x (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->xyz()[0];
 }
 
-void Position_impl::x (CORBA::Float x TAO_ENV_ARG_DECL_NOT_USED)
+void Position_impl::x (CORBA::Float x ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->xyz()[0] = x;
 }
 
-CORBA::Float Position_impl::y (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Float Position_impl::y (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->xyz()[1];
 }
 
-void Position_impl::y (CORBA::Float y TAO_ENV_ARG_DECL_NOT_USED)
+void Position_impl::y (CORBA::Float y ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->xyz()[1] = y;
 }
 
-CORBA::Float Position_impl::z (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Float Position_impl::z (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->xyz()[2];
 }
 
-void Position_impl::z (CORBA::Float z TAO_ENV_ARG_DECL_NOT_USED)
+void Position_impl::z (CORBA::Float z ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->xyz()[2] = z;
 }
@@ -169,10 +169,10 @@ Log_Msg_impl::~Log_Msg_impl ()
 }
 
 void
-Log_Msg_impl::do_print (TAO_ENV_SINGLE_ARG_DECL)
+Log_Msg_impl::do_print (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The timestamp
-  Event_impl::do_print (TAO_ENV_SINGLE_ARG_PARAMETER);
+  Event_impl::do_print (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->urgency () > 0)
@@ -221,20 +221,20 @@ Event_List_Link_impl::~Event_List_Link_impl ()
 }
 
 Event*
-Event_List_Link_impl::get_event (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Event_List_Link_impl::get_event (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->my_event ();
 }
 
 Event_List_Link*
-Event_List_Link_impl::get_next_link (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Event_List_Link_impl::get_next_link (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->next ();
 }
 
 void
 Event_List_Link_impl::attach_next_link (Event_List_Link *n
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->next (n);
 }
@@ -264,7 +264,7 @@ Event_List_impl::~Event_List_impl ()
 }
 
 void
-Event_List_impl::store_event (Event* e TAO_ENV_ARG_DECL_NOT_USED)
+Event_List_impl::store_event (Event* e ACE_ENV_ARG_DECL_NOT_USED)
 {
   // This operation should perform atomically and should
   // guard against the access to the list from another thread.
@@ -406,7 +406,7 @@ Temperature_Criterion_impl::~Temperature_Criterion_impl ()
 
 CORBA::Boolean
 Temperature_Criterion_impl::is_critical (Event* e
-                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   // Downcast to a temperature.
   Temperature* t = Temperature::_downcast (e);
@@ -423,7 +423,7 @@ Temperature_Criterion_impl::is_critical (Event* e
 
 
 void
-Temperature_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Temperature_Criterion_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n",
              this->origin_id_ () ));
@@ -462,7 +462,7 @@ Position_Criterion_impl::~Position_Criterion_impl ()
 
 
 CORBA::Boolean
-Position_Criterion_impl::is_critical (Event* e TAO_ENV_ARG_DECL_NOT_USED)
+Position_Criterion_impl::is_critical (Event* e ACE_ENV_ARG_DECL_NOT_USED)
 {
   Position* p = Position::_downcast (e);
   // Is Event really a Position ?
@@ -483,13 +483,13 @@ Position_Criterion_impl::is_critical (Event* e TAO_ENV_ARG_DECL_NOT_USED)
 
 
 void
-Position_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL)
+Position_Criterion_impl::do_print (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG((LM_DEBUG,
              "Alarm boundary for events with origin id %d is the box\n",
              this->origin_id_ () ));
-  this->leftbottom ()->do_print(TAO_ENV_SINGLE_ARG_PARAMETER);
-  this->topright ()->do_print(TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->leftbottom ()->do_print(ACE_ENV_SINGLE_ARG_PARAMETER);
+  this->topright ()->do_print(ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 Position_Criterion_factory::~Position_Criterion_factory ()
@@ -516,7 +516,7 @@ Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl ()
 
 CORBA::Boolean
 Log_Msg_Criterion_impl::is_critical (Event* e
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
 {
   Log_Msg* lm = Log_Msg::_downcast (e);
 
@@ -530,7 +530,7 @@ Log_Msg_Criterion_impl::is_critical (Event* e
 
 
 void
-Log_Msg_Criterion_impl::do_print (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_Msg_Criterion_impl::do_print (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG((LM_DEBUG,
              "All log messages with urgency greater zero are registered.\n" ));
@@ -565,7 +565,7 @@ Criterion_List_impl::~Criterion_List_impl ()
 
 void
 Criterion_List_impl::store_criterion (Criterion *c
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (!my_list ())
     {
@@ -578,7 +578,7 @@ Criterion_List_impl::store_criterion (Criterion *c
 }
 
 CORBA::Boolean
-Criterion_List_impl::is_critical (Event *e TAO_ENV_ARG_DECL_NOT_USED)
+Criterion_List_impl::is_critical (Event *e ACE_ENV_ARG_DECL_NOT_USED)
 {
   // Try all criterions. Walking the list is efficient enough for
   // demonstration.
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
index 35ed602229e..d330a23f372 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
@@ -48,7 +48,7 @@ class Event_impl : public virtual OBV_Event,
   Event_impl ();
   virtual ~Event_impl ();
 
-  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
   // Implementation of the do_print () operation the valuetype should have.
   // All operations in valuetypes are virtual.
 
@@ -119,7 +119,7 @@ public:
 
   virtual ~Temperature_impl ();
 
-  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
   // Overrides Event_impl::do_print (). Note that a new declaration
   // in IDL in a derived class is not allowed.
 };
@@ -145,15 +145,15 @@ public:
   Position_impl (Point &p);
   virtual ~Position_impl ();
 
-  virtual CORBA::Float x (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void x (CORBA::Float TAO_ENV_ARG_DECL);
-  virtual CORBA::Float y (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void y (CORBA::Float TAO_ENV_ARG_DECL);
-  virtual CORBA::Float z (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void z (CORBA::Float TAO_ENV_ARG_DECL);
+  virtual CORBA::Float x (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void x (CORBA::Float ACE_ENV_ARG_DECL);
+  virtual CORBA::Float y (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void y (CORBA::Float ACE_ENV_ARG_DECL);
+  virtual CORBA::Float z (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void z (CORBA::Float ACE_ENV_ARG_DECL);
   //These are the attributes
 
-  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
 };
 
 class Position_factory : public CORBA::ValueFactoryBase
@@ -178,7 +178,7 @@ public:
   Log_Msg_impl (CORBA::Short urgency_p, const char *message_p);
   virtual ~Log_Msg_impl ();
 
-  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
 };
 
 class Log_Msg_factory : public CORBA::ValueFactoryBase
@@ -210,12 +210,12 @@ class Event_List_Link_impl : public virtual OBV_Event_List_Link,
   Event_List_Link_impl (Event *e);
   virtual ~Event_List_Link_impl ();
 
-  Event *get_event (TAO_ENV_SINGLE_ARG_DECL);
+  Event *get_event (ACE_ENV_SINGLE_ARG_DECL);
 
  private:
-  Event_List_Link *get_next_link (TAO_ENV_SINGLE_ARG_DECL);
+  Event_List_Link *get_next_link (ACE_ENV_SINGLE_ARG_DECL);
 
-  void attach_next_link (Event_List_Link * chain TAO_ENV_ARG_DECL);
+  void attach_next_link (Event_List_Link * chain ACE_ENV_ARG_DECL);
   // Attach a chain at the end.
 };
 
@@ -239,9 +239,9 @@ class Event_List_impl : public virtual OBV_Event_List,
   Event_List_impl ();
   virtual ~Event_List_impl ();
 
-  void store_event (Event* e TAO_ENV_ARG_DECL);
+  void store_event (Event* e ACE_ENV_ARG_DECL);
 
-  Event_List_Link *get_first_link(TAO_ENV_SINGLE_ARG_DECL);
+  Event_List_Link *get_first_link(ACE_ENV_SINGLE_ARG_DECL);
   // The iterator needs it.
 
  private:
@@ -317,8 +317,8 @@ public:
 
   virtual ~Temperature_Criterion_impl ();
 
-  CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL);
-  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Boolean is_critical (Event* e ACE_ENV_ARG_DECL);
+  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
 };
 
 class Temperature_Criterion_factory : public CORBA::ValueFactoryBase
@@ -343,8 +343,8 @@ public:
                            Position *tr);
   virtual ~Position_Criterion_impl ();
 
-  CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL);
-  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Boolean is_critical (Event* e ACE_ENV_ARG_DECL);
+  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
 };
 
 class Position_Criterion_factory : public CORBA::ValueFactoryBase
@@ -365,8 +365,8 @@ public:
   Log_Msg_Criterion_impl ();
   virtual ~Log_Msg_Criterion_impl ();
 
-  CORBA::Boolean is_critical (Event* e TAO_ENV_ARG_DECL);
-  virtual void do_print (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Boolean is_critical (Event* e ACE_ENV_ARG_DECL);
+  virtual void do_print (ACE_ENV_SINGLE_ARG_DECL);
 };
 
 class Log_Msg_Criterion_factory : public CORBA::ValueFactoryBase
@@ -385,8 +385,8 @@ class Criterion_List_impl : public virtual OBV_Criterion_List,
   Criterion_List_impl ();
   virtual ~Criterion_List_impl ();
 
-  void store_criterion (Criterion *c TAO_ENV_ARG_DECL);
-  CORBA::Boolean is_critical (Event *e TAO_ENV_ARG_DECL);
+  void store_criterion (Criterion *c ACE_ENV_ARG_DECL);
+  CORBA::Boolean is_critical (Event *e ACE_ENV_ARG_DECL);
 };
 
 
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
index 1ac7c623802..ab79f8576e0 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -110,7 +110,7 @@ Checkpoint_i::orb (CORBA::ORB_ptr o)
 
 void
 Checkpoint_i::put_event (Event *event
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In general this function would be a dispatcher which looks at the
@@ -140,7 +140,7 @@ Checkpoint_i::put_event (Event *event
 
 
 Event_List *
-Checkpoint_i::get_critical_events (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Checkpoint_i::get_critical_events (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The skeleton should not steal our list by decrementing
@@ -157,7 +157,7 @@ Checkpoint_i::get_critical_events (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Shutdown the server application.
 
 void
-Checkpoint_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Checkpoint_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h
index 3f3c0c00a2e..785093c5d14 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.h
+++ b/TAO/examples/OBV/Typed_Events/Server_i.h
@@ -37,16 +37,16 @@ public:
 
   virtual void put_event (
         Event * e
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
   )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Event_List * get_critical_events (
-        TAO_ENV_SINGLE_ARG_DECL
+        ACE_ENV_SINGLE_ARG_DECL
   )
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp
index e04247695cd..935a93de0a9 100644
--- a/TAO/examples/OBV/Typed_Events/server.cpp
+++ b/TAO/examples/OBV/Typed_Events/server.cpp
@@ -12,18 +12,18 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tCheckpoint Event_Types server\n\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       if (server.init ("Event_Types_Checkpoint",
                        argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER) == -1)
+                       ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp
index c47656ad461..a35bff017c0 100644
--- a/TAO/examples/POA/Adapter_Activator/server.cpp
+++ b/TAO/examples/POA/Adapter_Activator/server.cpp
@@ -61,7 +61,7 @@ public:
 
   CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
                                   const char *name
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::PolicyList first_poa_policies_;
@@ -83,7 +83,7 @@ Adapter_Activator::Adapter_Activator (PortableServer::POAManager_ptr poa_manager
 CORBA::Boolean
 Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
                                     const char *name
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (name, "firstPOA") == 0)
@@ -91,7 +91,7 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
       PortableServer::POA_var child = parent->create_POA (name,
                                                           this->poa_manager_.in (),
                                                           this->first_poa_policies_
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Creation of firstPOA is over. Destroy the Policy objects.
@@ -99,12 +99,12 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
            i < this->first_poa_policies_.length ();
            ++i)
         {
-          this->first_poa_policies_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->first_poa_policies_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
 
       child->the_activator (this
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       Reference_Counted_Foo *foo_impl = new Reference_Counted_Foo (this->orb_.in (),
@@ -112,12 +112,12 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
                                                                    28);
 
       child->set_servant (foo_impl
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // This means that the ownership of <foo_impl> now belongs to
       // the POA.
-      foo_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      foo_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Finally everything is fine
@@ -128,7 +128,7 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
       PortableServer::POA_var child = parent->create_POA (name,
                                                           this->poa_manager_.in (),
                                                           this->second_poa_policies_
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Creation of secondPOA is over. Destroy the Policy objects.
@@ -136,7 +136,7 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
            i < this->second_poa_policies_.length ();
            ++i)
         {
-          this->second_poa_policies_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->second_poa_policies_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
 
@@ -149,12 +149,12 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
 
       child->activate_object_with_id (oid.in (),
                                       foo_impl
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // This means that the ownership of <foo_impl> now belongs to
       // the POA.
-      foo_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      foo_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Finally everything is fine
@@ -264,7 +264,7 @@ write_iors_to_file (const char *first_ior,
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -272,7 +272,7 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -282,18 +282,18 @@ main (int argc, char **argv)
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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;
 
       Adapter_Activator *adapter_activator =
@@ -304,7 +304,7 @@ main (int argc, char **argv)
         adapter_activator;
 
       root_poa->the_activator (adapter_activator_var.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var first_poa;
@@ -318,32 +318,32 @@ main (int argc, char **argv)
         // Id Assignment Policy
         policies[0] =
           root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Lifespan policy
         policies[1] =
           root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Request Processing policy
         policies[2] =
           root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Id Uniqueness
         policies[3] =
           root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Create the firstPOA under the RootPOA.
         first_poa = root_poa->create_POA ("firstPOA",
                                           poa_manager.in (),
                                           policies
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -355,20 +355,20 @@ main (int argc, char **argv)
         // Id Assignment Policy
         policies[0] =
           root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Lifespan policy
         policies[1] =
           root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Create the secondPOA under the firstPOA.
         second_poa = first_poa->create_POA ("secondPOA",
                                             poa_manager.in (),
                                             policies
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -379,16 +379,16 @@ main (int argc, char **argv)
 
       PortableServer::ObjectId_var first_oid =
         root_poa->activate_object (&first_foo_impl
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get Object Reference for the first_foo_impl object.
-      Foo_var first_foo = first_foo_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Foo_var first_foo = first_foo_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var second_foo =
         first_poa->create_reference ("IDL:Foo:1.0"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var third_oid =
@@ -397,20 +397,20 @@ main (int argc, char **argv)
       CORBA::Object_var third_foo =
         second_poa->create_reference_with_id (third_oid.in (),
                                               "IDL:Foo:1.0"
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var first_ior =
-        orb->object_to_string (first_foo.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (first_foo.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_ior =
-        orb->object_to_string (second_foo.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (second_foo.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var third_ior =
-        orb->object_to_string (third_foo.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (third_foo.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -427,13 +427,13 @@ main (int argc, char **argv)
 
       first_poa->destroy (1,
                           1
-                          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;
 
     }
diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp
index d2e003927e2..fb953ff8b78 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -17,20 +17,20 @@ DatabaseImpl::Simpler_Database_Malloc::~Simpler_Database_Malloc (void)
 
 DatabaseImpl::Entry::Entry (CORBA::ORB_ptr orb,
                             PortableServer::POA_ptr poa
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     poa_ (PortableServer::POA::_duplicate (poa))
 {
   // Get the POA Current object reference
   CORBA::Object_var obj =
     this->orb_->resolve_initial_references ("POACurrent"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Narrow the object reference to a POA Current reference
   this->poa_current_ =
     PortableServer::Current::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -40,12 +40,12 @@ DatabaseImpl::Entry::~Entry (void)
 
 void
 DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   // The servant determines the key associated with the database
   // entry represented by self.
   PortableServer::ObjectId_var oid =
-    this->poa_current_->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->poa_current_->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now convert the id into a string
@@ -59,7 +59,7 @@ DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request
   if (ACE_OS::strcmp (operation,
                       "_is_a") == 0)
     {
-      this->is_a (request TAO_ENV_ARG_PARAMETER);
+      this->is_a (request ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -68,7 +68,7 @@ DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request
 
 void
 DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   CORBA::NVList_ptr list;
   this->orb_->create_list (0, list);
@@ -78,15 +78,15 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request
   list->add_value ("value",
                    any_1,
                    CORBA::ARG_IN
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   request->arguments (list
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA_NamedValue_ptr nv = list->item (0
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Any_ptr ap = nv->value ();
@@ -94,7 +94,7 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request
   *ap >>= value;
 
   const char *object_id =
-    CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+    CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Boolean result;
@@ -109,37 +109,37 @@ DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request
   CORBA::Any::from_boolean from_boolean (result);
   result_any <<= from_boolean;
 
-  request->set_result (result_any TAO_ENV_ARG_PARAMETER);
+  request->set_result (result_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::RepositoryId
 DatabaseImpl::Entry::_primary_interface (const PortableServer::ObjectId &/*oid*/,
                                          PortableServer::POA_ptr
-                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 PortableServer::POA_ptr
-DatabaseImpl::Entry::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+DatabaseImpl::Entry::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 DatabaseImpl::Agent::Agent (CORBA::ORB_ptr orb,
                             PortableServer::POA_ptr poa
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     poa_ (PortableServer::POA::_duplicate (poa)),
     common_servant_ (orb,
                      poa
-                     TAO_ENV_ARG_PARAMETER)
+                     ACE_ENV_ARG_PARAMETER)
 {
   ACE_CHECK;
 
   this->poa_->set_servant (&this->common_servant_
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -151,7 +151,7 @@ Database::Entry_ptr
 DatabaseImpl::Agent::create_entry (const char *key,
                                    const char *entry_type,
                                    const Database::NVPairSequence &initial_attributes
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Database::Unknown_Type,
                    Database::Duplicate_Key))
@@ -207,11 +207,11 @@ DatabaseImpl::Agent::create_entry (const char *key,
   CORBA::Object_var obj =
     this->poa_->create_reference_with_id (obj_id.in (),
                                           repository_id.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Database::Entry::_nil ());
 
   Database::Entry_var entry = Database::Entry::_narrow (obj.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Database::Entry::_nil ());
 
   return entry._retn ();
@@ -220,7 +220,7 @@ DatabaseImpl::Agent::create_entry (const char *key,
 Database::Entry_ptr
 DatabaseImpl::Agent::find_entry (const char *key,
                                  const char *entry_type
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Database::Unknown_Type,
                    Database::Not_Found))
@@ -253,11 +253,11 @@ DatabaseImpl::Agent::find_entry (const char *key,
       CORBA::Object_var obj =
         this->poa_->create_reference_with_id (obj_id.in (),
                                               repository_id.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (Database::Entry::_nil ());
 
       entry = Database::Entry::_narrow (obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (Database::Entry::_nil ());
     }
   else
@@ -276,7 +276,7 @@ DatabaseImpl::Agent::find_entry (const char *key,
 void
 DatabaseImpl::Agent::destroy_entry (const char *key,
                                     const char *entry_type
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Database::Unknown_Type,
                    Database::Unknown_Key))
@@ -310,14 +310,14 @@ DatabaseImpl::Agent::destroy_entry (const char *key,
 }
 
 void
-DatabaseImpl::Agent::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+DatabaseImpl::Agent::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
 
 PortableServer::POA_ptr
-DatabaseImpl::Agent::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+DatabaseImpl::Agent::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h
index db60ffbd981..25c120a7b0e 100644
--- a/TAO/examples/POA/DSI/Database_i.h
+++ b/TAO/examples/POA/DSI/Database_i.h
@@ -33,27 +33,27 @@ public:
   public:
     Entry (CORBA::ORB_ptr orb,
            PortableServer::POA_ptr poa
-           TAO_ENV_ARG_DECL_NOT_USED);
+           ACE_ENV_ARG_DECL_NOT_USED);
     ~Entry (void);
 
     virtual void invoke (CORBA::ServerRequest_ptr request
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
     // The invoke() method receives requests issued to any CORBA
     // object incarnated by the DSI servant and performs the
     // processing necessary to execute the request.
 
     virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid,
                                                     PortableServer::POA_ptr poa
-                                                    TAO_ENV_ARG_DECL);
+                                                    ACE_ENV_ARG_DECL);
     // The _primary_interface() method receives an ObjectId value and
     // a POA_ptr as input parameters and returns a valid RepositoryId
     // representing the most-derived interface for that oid.
 
-    virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+    virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
     // Returns the default POA for this servant.
 
     virtual void is_a (CORBA::ServerRequest_ptr request
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
     // Handles the _is_a call
 
   protected:
@@ -72,35 +72,35 @@ public:
   public:
     Agent (CORBA::ORB_ptr orb,
            PortableServer::POA_ptr poa
-           TAO_ENV_ARG_DECL_NOT_USED);
+           ACE_ENV_ARG_DECL_NOT_USED);
     ~Agent (void);
 
     virtual Database::Entry_ptr create_entry (const char *key,
                                               const char *entry_type,
                                               const Database::NVPairSequence &initial_attributes
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Database::Unknown_Type,
                        Database::Duplicate_Key));
 
     virtual Database::Entry_ptr find_entry (const char *key,
                                             const char *entry_type
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Database::Unknown_Type,
                        Database::Not_Found));
 
     virtual void destroy_entry (const char *key,
                                 const char *entry_type
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Database::Unknown_Type,
                        Database::Unknown_Key));
 
-    virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+    virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+    virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
     // Returns the default POA for this servant.
 
   protected:
diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp
index 1d8950ce093..dd15e2008f5 100644
--- a/TAO/examples/POA/DSI/client.cpp
+++ b/TAO/examples/POA/DSI/client.cpp
@@ -99,7 +99,7 @@ read_IOR_from_file (void)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   char str [255];
   // Initialize the ORB
@@ -110,7 +110,7 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
 
-                                            0 TAO_ENV_ARG_PARAMETER);
+                                            0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the location of the
@@ -133,7 +133,7 @@ main (int argc, char **argv)
 
       // Get the object reference with the IOR
       CORBA::Object_var object = orb->string_to_object (IOR
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str,
@@ -142,7 +142,7 @@ main (int argc, char **argv)
       // Narrow the object reference to a Database::Agent
       Database::Agent_var database_agent =
         Database::Agent::_narrow (object.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Database::NVPairSequence employee_attributes (2);
@@ -169,14 +169,14 @@ main (int argc, char **argv)
         database_agent->create_entry ("irfan",
                                       "Employee",
                                       employee_attributes
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "Database::Employee::_narrow");
 
       Database::Employee_var employee =
         Database::Employee::_narrow (entry.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /*
@@ -189,7 +189,7 @@ main (int argc, char **argv)
 #if 0
       // Reset the id
       ACE_OS::strcpy (str, "Database::Employee::id");
-      employee->id (666 TAO_ENV_ARG_PARAMETER);
+      employee->id (666 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* 0 */
 
@@ -197,19 +197,19 @@ main (int argc, char **argv)
       // Find the employee
       entry = database_agent->find_entry ("irfan",
                                           "Employee"
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "Database::Entry::destroy");
       // Destroy the employee
       database_agent->destroy_entry ("irfan",
                                      "Employee"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (shutdown_server)
         {
-          database_agent->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          database_agent->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp
index 54fa21c0aaf..cf8b886114c 100644
--- a/TAO/examples/POA/DSI/server.cpp
+++ b/TAO/examples/POA/DSI/server.cpp
@@ -79,12 +79,12 @@ write_iors_to_file (const char *first_ior)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -94,16 +94,16 @@ main (int argc, char **argv)
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference to a POA reference
       PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.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 (5);
@@ -111,27 +111,27 @@ main (int argc, char **argv)
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy
       policies[1] =
         root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
 
       // Request Processing Policy
       policies[2] =
         root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
 
       // Servant Retention Policy
       policies[3] =
-        root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER);
+        root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Id Uniqueness Policy
       policies[4] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID TAO_ENV_ARG_PARAMETER);
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -139,7 +139,7 @@ main (int argc, char **argv)
       PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
                                                                 poa_manager.in (),
                                                                 policies
-                                                                TAO_ENV_ARG_PARAMETER);
+                                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0;
@@ -147,14 +147,14 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Create a Database Agent Implementation object in first_poa
       DatabaseImpl::Agent database_agent_impl (orb.in (),
                                                first_poa.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var database_agent_oid =
@@ -162,16 +162,16 @@ main (int argc, char **argv)
 
       first_poa->activate_object_with_id (database_agent_oid.in (),
                                           &database_agent_impl
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var database_agent =
-        first_poa->id_to_reference (database_agent_oid.in () TAO_ENV_ARG_PARAMETER);
+        first_poa->id_to_reference (database_agent_oid.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the IOR for the "DatabaseAgent" object
       CORBA::String_var database_agent_ior =
-        orb->object_to_string (database_agent.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (database_agent.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,"%s\n",
@@ -182,11 +182,11 @@ main (int argc, char **argv)
         return write_result;
 
       // set the state of the poa_manager to active i.e ready to process requests
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp
index a80188bd406..4cda27db3ba 100644
--- a/TAO/examples/POA/Default_Servant/File_i.cpp
+++ b/TAO/examples/POA/Default_Servant/File_i.cpp
@@ -24,9 +24,9 @@ FileImpl::System::System (PortableServer::POA_ptr poa)
     // Create the Default Descriptor Servant
     fd_servant_ (poa)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   // set the default servant of the POA
-  poa->set_servant (&this->fd_servant_ TAO_ENV_ARG_PARAMETER);
+  poa->set_servant (&this->fd_servant_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -35,7 +35,7 @@ FileImpl::System::~System (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::System::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+FileImpl::System::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -43,7 +43,7 @@ FileImpl::System::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 File::Descriptor_ptr
 FileImpl::System::open (const char *file_name,
                         CORBA::Long flags
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
@@ -73,12 +73,12 @@ FileImpl::System::open (const char *file_name,
   CORBA::Object_var obj =
     this->poa_->create_reference_with_id (oid.in (),
                                           "IDL:File/Descriptor:1.0"
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (File::Descriptor::_nil ());
 
   // Narrow the object reference to a File Descriptor
   File::Descriptor_var fd =
-    File::Descriptor::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+    File::Descriptor::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (File::Descriptor::_nil ());
 
@@ -96,26 +96,26 @@ FileImpl::Descriptor::~Descriptor (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::Descriptor::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+FileImpl::Descriptor::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 //Extracts the ACE_HANDLE from the passed object reference
 ACE_HANDLE
-FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL)
+FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL)
 {
   //
   // One way of getting our id.
   //
 
   // Get a reference to myself
-  File::Descriptor_var me = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  File::Descriptor_var me = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   // Get the ObjectId from the reference
   PortableServer::ObjectId_var oid1 =
-    this->poa_->reference_to_id (me.in () TAO_ENV_ARG_PARAMETER);
+    this->poa_->reference_to_id (me.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   //
@@ -123,7 +123,7 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL)
   //
 
   PortableServer::ObjectId_var oid2 =
-    this->poa_->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   //
@@ -131,23 +131,23 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL)
   //
 
   int argc = 0;
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 TAO_ENV_ARG_PARAMETER);
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   // Get the POA Current object reference
   CORBA::Object_var obj =
     orb->resolve_initial_references ("POACurrent"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   // Narrow the object reference to a POA Current reference
   PortableServer::Current_var poa_current =
     PortableServer::Current::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   PortableServer::ObjectId_var oid3 =
-    poa_current->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+    poa_current->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   ACE_ASSERT (oid1.in () == oid2.in ());
@@ -163,11 +163,11 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Long
 FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   const CORBA::Octet *data = &buffer[0];
@@ -183,11 +183,11 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer
 
 File::Descriptor::DataBuffer *
 FileImpl::Descriptor::read (CORBA::Long num_bytes
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes);
@@ -206,11 +206,11 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes
 CORBA::ULong
 FileImpl::Descriptor::lseek (CORBA::ULong offset,
                              CORBA::Long whence
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor,
@@ -223,11 +223,11 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset,
 }
 
 void
-FileImpl::Descriptor::destroy (TAO_ENV_SINGLE_ARG_DECL)
+FileImpl::Descriptor::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ACE_HANDLE for this object reference
-  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Close the file corresponding to this object reference.
diff --git a/TAO/examples/POA/Default_Servant/File_i.h b/TAO/examples/POA/Default_Servant/File_i.h
index 30c6c6f5e5b..ebe06fce403 100644
--- a/TAO/examples/POA/Default_Servant/File_i.h
+++ b/TAO/examples/POA/Default_Servant/File_i.h
@@ -34,35 +34,35 @@ public:
     ~Descriptor (void);
     // Destructor
 
-    PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+    PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
     // Returns the default POA of this object
 
     virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // write buffer to File corresponding to this Descriptor
 
     virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes
-                                                TAO_ENV_ARG_DECL)
+                                                ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
     // Reads num_bytes from the file and returns it
                        File::IOError));
 
     virtual CORBA::ULong lseek (CORBA::ULong offset,
                                 CORBA::Long whence
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // seek to the offset in file from whence
 
-    virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
     // closes the file corresponding to the requested ObjectID
 
   private:
 
-    ACE_HANDLE fd (TAO_ENV_SINGLE_ARG_DECL);
+    ACE_HANDLE fd (ACE_ENV_SINGLE_ARG_DECL);
     // Extracts the ACE_HANDLE from the objectID
 
     PortableServer::POA_var poa_;
@@ -80,12 +80,12 @@ public:
     ~System (void);
     //Destructor
 
-    PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+    PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
     //Returns the default POA of this object
 
     File::Descriptor_ptr open (const char *file_name,
                                CORBA::Long flags
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // Opens a file ,creates a Descriptor reference with the
diff --git a/TAO/examples/POA/Default_Servant/client.cpp b/TAO/examples/POA/Default_Servant/client.cpp
index b40fb6b4f5e..9782d810a77 100644
--- a/TAO/examples/POA/Default_Servant/client.cpp
+++ b/TAO/examples/POA/Default_Servant/client.cpp
@@ -72,12 +72,12 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the IOR
@@ -106,18 +106,18 @@ main (int argc, char **argv)
       ACE_OS::close (input_file);
 
       CORBA::Object_var object = orb->string_to_object (ior.c_str ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference to a File::System
       File::System_var file_system = File::System::_narrow (object.in ()
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creat the file filename i.e "test"
       File::Descriptor_var fd = file_system->open (filename,
                                                    O_CREAT | O_RDWR
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int message_length = ACE_OS::strlen (message) + 1;
@@ -126,16 +126,16 @@ main (int argc, char **argv)
       File::Descriptor::DataBuffer data_sent (message_length, message_length, buffer, 1);
 
       // write the message to the file
-      fd->write (data_sent TAO_ENV_ARG_PARAMETER);
+      fd->write (data_sent ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //seek to the beginning of the file
-      fd->lseek (0, SEEK_SET TAO_ENV_ARG_PARAMETER);
+      fd->lseek (0, SEEK_SET ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Read back the written message
       File::Descriptor::DataBuffer_var data_received = fd->read (message_length
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       char *result = (char *) &data_received[0];
@@ -145,7 +145,7 @@ main (int argc, char **argv)
                  result));
 
       // close the file
-      fd->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fd->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp
index 5ff1c36ce5c..75f729016cb 100644
--- a/TAO/examples/POA/Default_Servant/server.cpp
+++ b/TAO/examples/POA/Default_Servant/server.cpp
@@ -58,12 +58,12 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -73,14 +73,14 @@ main (int argc, char **argv)
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference to a POA reference
-      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList policies (5);
@@ -88,34 +88,34 @@ main (int argc, char **argv)
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy
       policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT TAO_ENV_ARG_PARAMETER);
+        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servant Retention Policy
       policies[3] =
-        root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER);
+        root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Id Uniqueness Policy
       policies[4] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID TAO_ENV_ARG_PARAMETER);
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
                                                                 poa_manager.in (),
                                                                 policies
-                                                                TAO_ENV_ARG_PARAMETER);
+                                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0;
@@ -123,7 +123,7 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -135,16 +135,16 @@ main (int argc, char **argv)
 
       first_poa->activate_object_with_id (file_system_oid.in (),
                                           &file_system_impl
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var file_system =
-        first_poa->id_to_reference (file_system_oid.in () TAO_ENV_ARG_PARAMETER);
+        first_poa->id_to_reference (file_system_oid.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the IOR for the "FileSystem" object
       CORBA::String_var file_system_ior =
-        orb->object_to_string (file_system.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (file_system.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,"%s\n",
@@ -160,11 +160,11 @@ main (int argc, char **argv)
       ACE_OS::fclose (output_file);
 
       // set the state of the poa_manager to active i.e ready to process requests
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/examples/POA/Explicit_Activation/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp
index 410a364b7f5..3a45abc8b67 100644
--- a/TAO/examples/POA/Explicit_Activation/server.cpp
+++ b/TAO/examples/POA/Explicit_Activation/server.cpp
@@ -124,7 +124,7 @@ write_iors_to_file (const char *first_ior,
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -132,7 +132,7 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -142,18 +142,18 @@ main (int argc, char **argv)
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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;
 
       // Policies for the firstPOA to be created.
@@ -163,19 +163,19 @@ main (int argc, char **argv)
       // Id Assignment Policy
       policies[0] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan policy
       policies[1] =
         root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Threading policy
       policies[2] =
         root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the firstPOA under the RootPOA.
@@ -184,16 +184,16 @@ main (int argc, char **argv)
         root_poa->create_POA (name.c_str (),
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policies[2]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policies[2]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Threading policy
       policies[2] =
         root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the secondPOA under the firstPOA.
@@ -202,7 +202,7 @@ main (int argc, char **argv)
         first_poa->create_POA (name.c_str (),
                                poa_manager.in (),
                                policies
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of POAs is over. Destroy the Policy objects.
@@ -210,7 +210,7 @@ main (int argc, char **argv)
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -230,11 +230,11 @@ main (int argc, char **argv)
       //    raises (ServantAlreadyActive, WrongPolicy);
       PortableServer::ObjectId_var first_oid =
         root_poa->activate_object (&first_foo_impl
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get Object Reference for the first_foo_impl object.
-      Foo_var first_foo = first_foo_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Foo_var first_foo = first_foo_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get ObjectId for object secondFoo and use that ObjectId to
@@ -247,11 +247,11 @@ main (int argc, char **argv)
 
       first_poa->activate_object_with_id (second_oid.in (),
                                           &second_foo_impl
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get Object reference for second_foo_impl object.
-      Foo_var second_foo = second_foo_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Foo_var second_foo = second_foo_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get ObjectId for the string thirdPOA Create the object reference
@@ -273,20 +273,20 @@ main (int argc, char **argv)
       CORBA::Object_var third_foo =
         second_poa->create_reference_with_id (third_oid.in (),
                                               "IDL:Foo:1.0"
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var first_ior =
-        orb->object_to_string (first_foo.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (first_foo.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_ior =
-        orb->object_to_string (second_foo.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (second_foo.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var third_ior =
-        orb->object_to_string (third_foo.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (third_foo.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -305,13 +305,13 @@ main (int argc, char **argv)
       MyFooServant third_foo_impl (orb.in (), second_poa.in (), 29);
       second_poa->activate_object_with_id (third_oid.in (),
                                            &third_foo_impl
-                                           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;
 
       ACE_TIMEPROBE_PRINT;
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index d13eed56c18..91989c55e41 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -36,7 +36,7 @@ find_non_existant_POA (PortableServer::POA_ptr parent,
       PortableServer::POA_var child_poa =
         parent->find_POA (child_poa_name,
                           activate
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (PortableServer::POA::AdapterNonExistent, foo)
@@ -54,31 +54,31 @@ find_non_existant_POA (PortableServer::POA_ptr parent,
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Initialize the ORB
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow Object reference to RootPOA to a POA reference.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in() TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to find a non-existant POA.  Since the Adapter Activator
@@ -94,7 +94,7 @@ main (int argc, char **argv)
       // Register the TAO_Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
       root_poa->the_activator (activator.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to find a childPOA of RootPOA named firstPOA
@@ -102,14 +102,14 @@ main (int argc, char **argv)
       PortableServer::POA_var first_poa =
         root_poa->find_POA (name.c_str (),
                             1
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       name = "secondPOA";
       PortableServer::POA_var second_poa =
         first_poa->find_POA (name.c_str (),
                              1
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to find a non-existant POA.  Even though the Adapter
@@ -121,15 +121,15 @@ main (int argc, char **argv)
 
       // Get the names of all the POAs
       CORBA::String_var root_poa_name =
-        root_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var first_poa_name =
-        first_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+        first_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_poa_name =
-        second_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+        second_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/POA/Forwarding/MyFooServant.cpp b/TAO/examples/POA/Forwarding/MyFooServant.cpp
index ac7acfc29ef..d22139f29fd 100644
--- a/TAO/examples/POA/Forwarding/MyFooServant.cpp
+++ b/TAO/examples/POA/Forwarding/MyFooServant.cpp
@@ -18,42 +18,42 @@ MyFooServant::MyFooServant (CORBA::ORB_ptr orb,
 }
 
 CORBA::Long
-MyFooServant::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyFooServant::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_++;
 }
 
 void
-MyFooServant::forward (TAO_ENV_SINGLE_ARG_DECL)
+MyFooServant::forward (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Foo::Cannot_Forward))
 {
-  this->activator_.forward_requests (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->activator_.forward_requests (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
     this->poa_->servant_to_id (this
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->poa_->deactivate_object (id.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 
 void
-MyFooServant::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+MyFooServant::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;
 }
 
 PortableServer::POA_ptr
-MyFooServant::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyFooServant::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/examples/POA/Forwarding/MyFooServant.h b/TAO/examples/POA/Forwarding/MyFooServant.h
index fd27cedbcb3..8f3a21d1bfd 100644
--- a/TAO/examples/POA/Forwarding/MyFooServant.h
+++ b/TAO/examples/POA/Forwarding/MyFooServant.h
@@ -36,18 +36,18 @@ public:
                 MyFooServantActivator &activator,
                 CORBA::Long value);
 
-  virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Setup forwarding
-  virtual void forward (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void forward (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Foo::Cannot_Forward));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
   // Returns the default POA for this servant.
 
 protected:
diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.cpp b/TAO/examples/POA/Forwarding/Servant_Activator.cpp
index 0e6a08ded10..bc70ba7e938 100644
--- a/TAO/examples/POA/Forwarding/Servant_Activator.cpp
+++ b/TAO/examples/POA/Forwarding/Servant_Activator.cpp
@@ -15,12 +15,12 @@ MyFooServantActivator::MyFooServantActivator (CORBA::ORB_ptr orb,
 PortableServer::Servant
 MyFooServantActivator::incarnate (const PortableServer::ObjectId &,
                                   PortableServer::POA_ptr
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
   this->orb_->shutdown (0
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Throw forward exception
@@ -36,14 +36,14 @@ MyFooServantActivator::etherealize (const PortableServer::ObjectId &,
                                     PortableServer::Servant servant,
                                     CORBA::Boolean,
                                     CORBA::Boolean
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   delete servant;
 }
 
 void
-MyFooServantActivator::forward_requests (TAO_ENV_SINGLE_ARG_DECL)
+MyFooServantActivator::forward_requests (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->forward_to_.in ()))
     ACE_THROW (Foo::Cannot_Forward ());
diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.h b/TAO/examples/POA/Forwarding/Servant_Activator.h
index affd047814f..5ced44f1f9f 100644
--- a/TAO/examples/POA/Forwarding/Servant_Activator.h
+++ b/TAO/examples/POA/Forwarding/Servant_Activator.h
@@ -35,7 +35,7 @@ public:
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId & oid,
                                              PortableServer::POA_ptr adapter
-                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
 
@@ -44,10 +44,10 @@ public:
                             PortableServer::Servant serv,
                             CORBA::Boolean cleanup_in_progress,
                             CORBA::Boolean remaining_activations
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void forward_requests (TAO_ENV_SINGLE_ARG_DECL);
+  void forward_requests (ACE_ENV_SINGLE_ARG_DECL);
   // Object should be forwarded from now on.
 
 private:
diff --git a/TAO/examples/POA/Forwarding/client.cpp b/TAO/examples/POA/Forwarding/client.cpp
index 781ee1a7ca2..6468da9c49d 100644
--- a/TAO/examples/POA/Forwarding/client.cpp
+++ b/TAO/examples/POA/Forwarding/client.cpp
@@ -67,14 +67,14 @@ parse_args (int argc, char **argv)
 
 void
 do_calls (Foo_ptr foo
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
 {
   for (int j = 1; j <= servers; j++)
     {
       for (int i = 1; i <= iterations; i++)
         {
           // Invoke the doit() method of the foo reference.
-          CORBA::Long result = foo->doit (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::Long result = foo->doit (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           // Print the result of doit () method of the foo reference.
@@ -88,7 +88,7 @@ do_calls (Foo_ptr foo
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Asking server to forward next time\n"));
-          foo->forward (TAO_ENV_SINGLE_ARG_PARAMETER);
+          foo->forward (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -98,12 +98,12 @@ do_calls (Foo_ptr foo
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -114,19 +114,19 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       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;
 
       // Try to narrow the object reference to a Foo reference.
       Foo_var foo =
-        Foo::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Foo::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       do_calls (foo.in ()
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      foo->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      foo->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp
index fd0acdefe82..eb617310753 100644
--- a/TAO/examples/POA/Forwarding/server.cpp
+++ b/TAO/examples/POA/Forwarding/server.cpp
@@ -64,7 +64,7 @@ parse_args (int argc, char **argv)
 
 PortableServer::POA_ptr
 setup_poa (PortableServer::POA_ptr root_poa
-           TAO_ENV_ARG_DECL)
+           ACE_ENV_ARG_DECL)
 {
   // Policies for the childPOA to be created.
   CORBA::PolicyList policies (2);
@@ -73,17 +73,17 @@ setup_poa (PortableServer::POA_ptr root_poa
   // Tell the POA to use a servant manager.
   policies[0] =
     root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Allow implicit activation.
   policies[1] =
     root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Create POA as child of RootPOA with the above policies.  This POA
@@ -92,7 +92,7 @@ setup_poa (PortableServer::POA_ptr root_poa
     root_poa->create_POA ("childPOA",
                           poa_manager.in (),
                           policies
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Creation of childPOAs is over. Destroy the Policy objects.
@@ -100,7 +100,7 @@ setup_poa (PortableServer::POA_ptr root_poa
        i < policies.length ();
        ++i)
     {
-      policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (PortableServer::POA::_nil ());
     }
 
@@ -110,14 +110,14 @@ setup_poa (PortableServer::POA_ptr root_poa
 MyFooServantActivator *
 create_servant_manager (CORBA::ORB_ptr orb,
                         PortableServer::POA_ptr child_poa
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var forward_to;
   if (forward_to_ior)
     {
       forward_to =
         orb->string_to_object (forward_to_ior
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -129,7 +129,7 @@ create_servant_manager (CORBA::ORB_ptr orb,
 
   // Set MyFooServantActivator to be the servant activator.
   child_poa->set_servant_manager (activator
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   // For the code above, we're using the CORBA 3.0 servant manager
   // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
   // use the following code in place of the previous line:
@@ -138,7 +138,7 @@ create_servant_manager (CORBA::ORB_ptr orb,
   //   activator->_this ();
   //
   // child_poa->set_servant_manager (servant_activator.in (),
-  //                                 TAO_ENV_SINGLE_ARG_PARAMETER);
+  //                                 ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   MyFooServant *servant = 0;
@@ -152,12 +152,12 @@ create_servant_manager (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var servant_var (servant);
 
   Foo_var foo =
-    servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::String_var ior =
     orb->object_to_string (foo.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
@@ -183,7 +183,7 @@ main (int argc,
   if (result == -1)
     return -1;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
@@ -191,43 +191,43 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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;
 
       PortableServer::POA_var child_poa =
         setup_poa (root_poa.in ()
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ServantManager_var manager =
         create_servant_manager (orb.in (),
                                 child_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/examples/POA/Generic_Servant/MyFooServant.cpp b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
index 241d420cd47..a28cdc05848 100644
--- a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
+++ b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
@@ -35,27 +35,27 @@ MyFooServant::~MyFooServant (void)
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-MyFooServant::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyFooServant::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 CORBA::Long
-MyFooServant::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyFooServant::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 void
-MyFooServant::simply_doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+MyFooServant::simply_doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 MyFooServant::timed_operation (CORBA::ULong timeout
-                               TAO_ENV_ARG_DECL_NOT_USED)
+                               ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -69,10 +69,10 @@ MyFooServant::timed_operation (CORBA::ULong timeout
 }
 
 void
-MyFooServant::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+MyFooServant::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);
   ACE_CHECK;
 }
 
diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.h b/TAO/examples/POA/Generic_Servant/MyFooServant.h
index e3b14fceeda..e715a747a18 100644
--- a/TAO/examples/POA/Generic_Servant/MyFooServant.h
+++ b/TAO/examples/POA/Generic_Servant/MyFooServant.h
@@ -29,23 +29,23 @@ public:
   virtual ~MyFooServant (void);
   // Destructor
 
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
   // Returns the Default POA of this Servant object
 
-  virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Simple doit method
 
-  virtual void simply_doit (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void simply_doit (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Even simpler doit method
 
   virtual void timed_operation (CORBA::ULong timeout
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Timed operation.
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the ORB
 
diff --git a/TAO/examples/POA/Generic_Servant/client.cpp b/TAO/examples/POA/Generic_Servant/client.cpp
index 121b62356a1..16f7dd3d5a0 100644
--- a/TAO/examples/POA/Generic_Servant/client.cpp
+++ b/TAO/examples/POA/Generic_Servant/client.cpp
@@ -155,7 +155,7 @@ read_IOR_from_file (void)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -163,7 +163,7 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -180,17 +180,17 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       CORBA::Object_var object = orb->string_to_object (IOR
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a Foo reference.
       Foo_var foo = Foo::_narrow (object.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (foo.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -212,20 +212,20 @@ main (int argc, char **argv)
           if (oneway)
             {
               // Invoke the simply_doit() method of the foo reference.
-              foo->simply_doit (TAO_ENV_SINGLE_ARG_PARAMETER);
+              foo->simply_doit (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else if (timed_operations)
             {
               // Invoke the timed_operation() method of the foo reference.
               foo->timed_operation (timeout
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             {
               // Invoke the doit() method of the foo reference.
-              result = foo->doit (TAO_ENV_SINGLE_ARG_PARAMETER);
+              result = foo->doit (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -239,7 +239,7 @@ main (int argc, char **argv)
 
       if (shutdown_server)
         {
-          foo->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          foo->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp
index d0797662314..4fd9ea40348 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Activator.cpp
@@ -66,7 +66,7 @@ ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb,
 PortableServer::Servant
 ServantActivator_i::incarnate (const PortableServer::ObjectId &oid,
                                PortableServer::POA_ptr poa
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -91,7 +91,7 @@ ServantActivator_i::etherealize (const PortableServer::ObjectId &oid,
                                  PortableServer::Servant servant,
                                  CORBA::Boolean,
                                  CORBA::Boolean remaining_activations
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If there are no remaining activations i.e ObjectIds associated
diff --git a/TAO/examples/POA/Loader/Servant_Activator.h b/TAO/examples/POA/Loader/Servant_Activator.h
index aa514132129..38becd7117a 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.h
+++ b/TAO/examples/POA/Loader/Servant_Activator.h
@@ -60,7 +60,7 @@ public:
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr poa
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA with USE_SERVANT_MANAGER and
@@ -78,7 +78,7 @@ public:
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
                             CORBA::Boolean remaining_activations
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a MyFooServant for a MyFoo object
   // is deactivated. This occurs when the POA is destroyed or the
diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp
index ce60de2ad7e..e59a44f7537 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Locator.cpp
@@ -71,7 +71,7 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid,
                              PortableServer::POA_ptr poa,
                              const char * /* operation */,
                              PortableServer::ServantLocator::Cookie &cookie
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -102,7 +102,7 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid,
                               const char * /* operation */,
                               PortableServer::ServantLocator::Cookie cookie,
                               PortableServer::Servant servant
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check the passed servant with the cookie.
diff --git a/TAO/examples/POA/Loader/Servant_Locator.h b/TAO/examples/POA/Loader/Servant_Locator.h
index dc72a49eb6e..f8bab75628f 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.h
+++ b/TAO/examples/POA/Loader/Servant_Locator.h
@@ -64,7 +64,7 @@ public:
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
                                              PortableServer::ServantLocator::Cookie &the_cookie
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA whenever it receives a request
@@ -82,7 +82,7 @@ public:
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
                            PortableServer::Servant the_servant
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a MyFooServant completes a
   // request. As the Servant Loactor interface is used when the POA
diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp
index b6e2b933323..6993740bc61 100644
--- a/TAO/examples/POA/Loader/Server_Manager.cpp
+++ b/TAO/examples/POA/Loader/Server_Manager.cpp
@@ -108,14 +108,14 @@ Server_i::write_iors_to_file (const char *first_ior,
 int
 Server_i::init (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
       orb_ = CORBA::ORB_init (argc,
                               argv,
                               0
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -125,16 +125,16 @@ Server_i::init (int argc, char **argv)
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb_->resolve_initial_references ("RootPOA"
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the Object reference to a POA reference
       root_poa_ = PortableServer::POA::_narrow (obj.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of RootPOA
-      poa_manager_ = root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager_ = root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -158,7 +158,7 @@ Server_i::create_poa (const char *name,
 {
   PortableServer::POA_ptr my_poa = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -168,21 +168,21 @@ Server_i::create_poa (const char *name,
       policies_[0] =
         root_poa_->create_id_assignment_policy
         (PortableServer::USER_ID
-         TAO_ENV_ARG_PARAMETER);
+         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy.
       policies_[1] =
         root_poa_->create_lifespan_policy
         (PortableServer::PERSISTENT
-         TAO_ENV_ARG_PARAMETER);
+         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy.
       policies_[2] =
         root_poa_->create_request_processing_policy
         (PortableServer::USE_SERVANT_MANAGER
-         TAO_ENV_ARG_PARAMETER);
+         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servant Retention Policy.
@@ -190,13 +190,13 @@ Server_i::create_poa (const char *name,
         policies_[3] =
           root_poa_->create_servant_retention_policy
           (PortableServer::RETAIN
-           TAO_ENV_ARG_PARAMETER);
+           ACE_ENV_ARG_PARAMETER);
 
       if (servant_retention_policy == 0)
         policies_[3] =
           root_poa_->create_servant_retention_policy
           (PortableServer::NON_RETAIN
-           TAO_ENV_ARG_PARAMETER);
+           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create myPOA as the child of RootPOA with the above
@@ -206,7 +206,7 @@ Server_i::create_poa (const char *name,
       my_poa = root_poa_->create_POA (name,
                                       poa_manager_.in (),
                                       policies_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the policy objects as they have been passed to
@@ -216,7 +216,7 @@ Server_i::create_poa (const char *name,
            ++i)
         {
           CORBA::Policy_ptr policy = policies_[i];
-          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -236,7 +236,7 @@ Server_i::create_poa (const char *name,
 int
 Server_i::create_activator (PortableServer::POA_var first_poa)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -254,7 +254,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
       // firstPOA.
       this->servant_activator_ = temp_servant_activator;
       first_poa->set_servant_manager (this->servant_activator_.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous lines:
@@ -262,7 +262,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
       // this->servant_activator_ = temp_servant_activator->_this ();
       //
       // first_poa->set_servant_manager (this->servant_activator_.in ()
-      //                                TAO_ENV_ARG_PARAMETER);
+      //                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a reference with user created ID in firstPOA which
@@ -272,7 +272,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 
       first_foo_ = first_poa->create_reference_with_id (first_foo_oid.in (),
                                                         "IDL:Foo:1.0"
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -290,7 +290,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 int
 Server_i::create_locator (PortableServer::POA_var second_poa)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -307,7 +307,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       // secondPOA.
       this->servant_locator_ = temp_servant_locator;
       second_poa->set_servant_manager (this->servant_locator_.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous lines:
@@ -317,7 +317,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       // Set ServantLocator_i object as the servant Manager of
       // secondPOA.
       // second_poa->set_servant_manager (this->servant_locator_.in ()
-      //                                  TAO_ENV_ARG_PARAMETER);
+      //                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to create a reference with user created ID in second_poa
@@ -328,7 +328,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       second_foo_ =
         second_poa->create_reference_with_id (second_foo_oid.in (),
                                               "IDL:Foo:1.0"
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -346,7 +346,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 int
 Server_i::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -355,12 +355,12 @@ Server_i::run (void)
 
       CORBA::String_var first_foo_ior =
         orb_->object_to_string (first_foo_.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_foo_ior =
         orb_->object_to_string (second_foo_.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the ior's of first_foo and second_foo.
@@ -377,12 +377,12 @@ Server_i::run (void)
 
       // Set the poa_manager state to active, ready to process
       // requests.
-      poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Run the ORB.
-      orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp
index 16528209a04..40041f1252e 100644
--- a/TAO/examples/POA/NewPOA/NewPOA.cpp
+++ b/TAO/examples/POA/NewPOA/NewPOA.cpp
@@ -28,14 +28,14 @@ ACE_RCSID(NewPOA, NewPOA, "$Id$")
 
 void
 print_poa (PortableServer::POA_ptr poa
-           TAO_ENV_ARG_DECL)
+           ACE_ENV_ARG_DECL)
 {
   CORBA::String_var poa_name =
-    poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+    poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::OctetSeq_var poa_id =
-    poa->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+    poa->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -58,7 +58,7 @@ print_poa (PortableServer::POA_ptr poa
               "\n"));
 
   PortableServer::POAList_var children =
-    poa->the_children (TAO_ENV_SINGLE_ARG_PARAMETER);
+    poa->the_children (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong index = 0;
@@ -66,7 +66,7 @@ print_poa (PortableServer::POA_ptr poa
        ++index)
     {
       print_poa (children[index].in ()
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -74,7 +74,7 @@ print_poa (PortableServer::POA_ptr poa
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -82,18 +82,18 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // _narrow() the Object to get the POA object, i.e., the root_poa.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Policies for the new POAs
@@ -102,12 +102,12 @@ main (int argc, char **argv)
 
       // Threading policy
       policies[0] =
-        root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL TAO_ENV_ARG_PARAMETER);
+        root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::TRANSIENT TAO_ENV_ARG_PARAMETER);
+        root_poa->create_lifespan_policy (PortableServer::TRANSIENT ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of the firstPOA
@@ -116,7 +116,7 @@ main (int argc, char **argv)
         root_poa->create_POA (name.c_str (),
                               PortableServer::POAManager::_nil (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of the new POA, i.e. firstPOA/secondPOA
@@ -125,7 +125,7 @@ main (int argc, char **argv)
         first_poa->create_POA (name.c_str (),
                                PortableServer::POAManager::_nil (),
                                policies
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creating thirdPOA.
@@ -135,7 +135,7 @@ main (int argc, char **argv)
         root_poa->create_POA (name.c_str (),
                               PortableServer::POAManager::_nil (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of the new POAs over, so destroy the Policy_ptr's.
@@ -144,26 +144,26 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Get the names of all the POAs and print them out.
 
       CORBA::String_var root_poa_name =
-        root_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var first_poa_name =
-        first_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+        first_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_poa_name =
-        second_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+        second_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var third_poa_name =
-        third_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+        third_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -174,7 +174,7 @@ main (int argc, char **argv)
                   third_poa_name.in ()));
 
       print_poa (root_poa.in ()
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
index f7d810d91b3..386656aefe6 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
@@ -30,7 +30,7 @@ MyFooServantActivator::MyFooServantActivator (CORBA::ORB_ptr orb)
 PortableServer::Servant
 MyFooServantActivator::incarnate (const PortableServer::ObjectId &oid,
                                   PortableServer::POA_ptr poa
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -56,7 +56,7 @@ MyFooServantActivator::etherealize (const PortableServer::ObjectId &,
                                     PortableServer::Servant servant,
                                     CORBA::Boolean ,
                                     CORBA::Boolean remaining_activations
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If there are no remaining activations i.e ObjectIds associated
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
index 9a59ae24937..ecd1d02be1e 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
@@ -26,7 +26,7 @@ public:
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr poa
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA with USE_SERVANT_MANAGER and
@@ -38,7 +38,7 @@ public:
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
                             CORBA::Boolean remaining_activations
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a MyFooServant for a MyFoo object
   // is deactivated.
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
index 12edc90e4f3..21a684cf78d 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
@@ -34,7 +34,7 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
                                 PortableServer::POA_ptr poa,
                                 const char * /* operation */,
                                 PortableServer::ServantLocator::Cookie &cookie
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -67,7 +67,7 @@ MyFooServantLocator::postinvoke (const PortableServer::ObjectId & /* oid */,
                                  const char * /* operation */,
                                  PortableServer::ServantLocator::Cookie cookie,
                                  PortableServer::Servant servant
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check the passed servant with the cookie.
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
index bea915fb46f..e2823db28ac 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
@@ -33,7 +33,7 @@ public:
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
                                              PortableServer::ServantLocator::Cookie &the_cookie
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA whenever it receives a request
@@ -44,7 +44,7 @@ public:
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
                            PortableServer::Servant the_servant
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a MyFooServant completes a
   // request.
diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp
index 8c151381fa0..dc19aaf83fb 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/server.cpp
@@ -100,12 +100,12 @@ write_iors_to_file (const char *first_ior,
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -115,18 +115,18 @@ main (int argc, char **argv)
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the Object reference to a POA reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of RootPOA
 
       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;
 
@@ -135,24 +135,24 @@ main (int argc, char **argv)
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy
       policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER TAO_ENV_ARG_PARAMETER);
+        root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var first_poa;
       {
         // Servant Retention Policy
         policies[3] =
-          root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER);
+          root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         ACE_CString name = "firstPOA";
@@ -162,7 +162,7 @@ main (int argc, char **argv)
         first_poa = root_poa->create_POA (name.c_str (),
                                           poa_manager.in (),
                                           policies
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
       }
@@ -171,7 +171,7 @@ main (int argc, char **argv)
       {
         // Servant Retention Policy
         policies[3] =
-          root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN TAO_ENV_ARG_PARAMETER);
+          root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         ACE_CString name = "secondPOA";
@@ -182,7 +182,7 @@ main (int argc, char **argv)
         second_poa = root_poa->create_POA (name.c_str (),
                                            poa_manager.in (),
                                            policies
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
       }
@@ -194,7 +194,7 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -207,7 +207,7 @@ main (int argc, char **argv)
       // Set MyFooServantActivator object as the servant_manager of
       // firstPOA.
       first_poa->set_servant_manager (activator
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous line:
@@ -216,7 +216,7 @@ main (int argc, char **argv)
       //   activator->_this ();
       //
       // first_poa->set_servant_manager (servant_activator.in (),
-      //                                 TAO_ENV_SINGLE_ARG_PARAMETER);
+      //                                 ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a reference with user created ID in firstPOA which uses
@@ -226,7 +226,7 @@ main (int argc, char **argv)
         PortableServer::string_to_ObjectId ("firstFoo");
 
       CORBA::Object_var first_foo =
-        first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0" TAO_ENV_ARG_PARAMETER);
+        first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Allocate the servant activator.
@@ -238,7 +238,7 @@ main (int argc, char **argv)
       // Set MyFooServantLocator object as the servant Manager of
       // secondPOA.
       second_poa->set_servant_manager (locator
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous line:
@@ -247,7 +247,7 @@ main (int argc, char **argv)
       //   locator->_this ();
       //
       // second_poa->set_servant_manager (servant_locator.in (),
-      //                                  TAO_ENV_SINGLE_ARG_PARAMETER);
+      //                                  ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to create a reference with user created ID in second_poa
@@ -258,19 +258,19 @@ main (int argc, char **argv)
 
       CORBA::Object_var second_foo =
         second_poa->create_reference_with_id (second_foo_oid.in (),
-                                              "IDL:Foo:1.0" TAO_ENV_ARG_PARAMETER);
+                                              "IDL:Foo:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Invoke object_to_string on the references created in firstPOA and
       // secondPOA.
 
       CORBA::String_var first_foo_ior =
-        orb->object_to_string (first_foo.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (first_foo.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       CORBA::String_var second_foo_ior =
-        orb->object_to_string (second_foo.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (second_foo.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the ior's of first_foo and second_foo.
@@ -285,11 +285,11 @@ main (int argc, char **argv)
         return write_result;
 
       // Set the poa_manager state to active, ready to process requests.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB.
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
index 53ac5c7f696..37a8deb7ca3 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
@@ -33,7 +33,7 @@ ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb)
 PortableServer::Servant
 ServantActivator_i::incarnate (const PortableServer::ObjectId &oid,
                                PortableServer::POA_ptr poa
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -62,7 +62,7 @@ ServantActivator_i::etherealize (const PortableServer::ObjectId &oid,
                                  PortableServer::Servant servant,
                                  CORBA::Boolean,
                                  CORBA::Boolean remaining_activations
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If there are no remaining activations i.e ObjectIds associated
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
index 0ce43922984..60ebef0f510 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
@@ -38,7 +38,7 @@ public:
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr poa
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA with USE_SERVANT_MANAGER and
@@ -56,7 +56,7 @@ public:
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
                             CORBA::Boolean remaining_activations
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a MyFooServant for a MyFoo object
   // is deactivated. This occurs when the POA is destroyed or the
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
index 2155e074ab5..69130be8720 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
@@ -35,7 +35,7 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid,
                              PortableServer::POA_ptr poa,
                              const char * /* operation */,
                              PortableServer::ServantLocator::Cookie &cookie
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -74,7 +74,7 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid,
                               const char * /* operation */,
                               PortableServer::ServantLocator::Cookie cookie,
                               PortableServer::Servant servant
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check the passed servant with the cookie.
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
index 5efee2c24f8..f28a90d2ff6 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
@@ -43,7 +43,7 @@ public:
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
                                              PortableServer::ServantLocator::Cookie &the_cookie
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA whenever it receives a request
@@ -61,7 +61,7 @@ public:
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
                            PortableServer::Servant the_servant
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a MyFooServant completes a
   // request. As the Servant Loactor interface is used when the POA
diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
index c0c74fb87a4..75781ee9f81 100644
--- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
@@ -112,7 +112,7 @@ Server_i::write_iors_to_file (const char *first_ior,
 int
 Server_i::init (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -120,7 +120,7 @@ Server_i::init (int argc, char **argv)
       orb_ = CORBA::ORB_init (argc,
                               argv,
                               0
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -130,16 +130,16 @@ Server_i::init (int argc, char **argv)
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb_->resolve_initial_references ("RootPOA"
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the Object reference to a POA reference
       root_poa_ = PortableServer::POA::_narrow (obj.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of RootPOA
-      poa_manager_ = root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager_ = root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -163,7 +163,7 @@ Server_i::create_poa (const char *name,
 {
   PortableServer::POA_ptr my_poa = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       policies_.length (4);
@@ -172,21 +172,21 @@ Server_i::create_poa (const char *name,
       policies_[0] =
         root_poa_->create_id_assignment_policy
         (PortableServer::USER_ID
-         TAO_ENV_ARG_PARAMETER);
+         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy.
       policies_[1] =
         root_poa_->create_lifespan_policy
         (PortableServer::PERSISTENT
-         TAO_ENV_ARG_PARAMETER);
+         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy.
       policies_[2] =
         root_poa_->create_request_processing_policy
         (PortableServer::USE_SERVANT_MANAGER
-         TAO_ENV_ARG_PARAMETER);
+         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servant Retention Policy.
@@ -194,14 +194,14 @@ Server_i::create_poa (const char *name,
         policies_[3] =
           root_poa_->create_servant_retention_policy
           (PortableServer::RETAIN
-           TAO_ENV_ARG_PARAMETER);
+           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (servant_retention_policy == 0)
         policies_[3] =
           root_poa_->create_servant_retention_policy
           (PortableServer::NON_RETAIN
-           TAO_ENV_ARG_PARAMETER);
+           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create myPOA as the child of RootPOA with the above
@@ -211,7 +211,7 @@ Server_i::create_poa (const char *name,
       my_poa = root_poa_->create_POA (name,
                                       poa_manager_.in (),
                                       policies_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the policy objects as they have been passed to
@@ -221,7 +221,7 @@ Server_i::create_poa (const char *name,
            ++i)
         {
           CORBA::Policy_ptr policy = policies_[i];
-          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -241,7 +241,7 @@ Server_i::create_poa (const char *name,
 int
 Server_i::create_activator (PortableServer::POA_var first_poa)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // An Servant Activator object is created which will activate
@@ -253,7 +253,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
       // Set ServantActivator_i object as the servant_manager of
       // firstPOA.
       first_poa->set_servant_manager (servant_activator_impl_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous line:
@@ -262,7 +262,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
       //   servant_activator_impl_->_this ();
       //
       // first_poa->set_servant_manager (servant_activator.in (),
-      //                                 TAO_ENV_SINGLE_ARG_PARAMETER);
+      //                                 ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a reference with user created ID in firstPOA which
@@ -276,7 +276,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 
       first_foo_ = first_poa->create_reference_with_id (first_foo_oid.in (),
                                                         "IDL:Foo:1.0"
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -294,7 +294,7 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 int
 Server_i::create_locator (PortableServer::POA_var second_poa)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // An Servant Locator object is created which will activate
@@ -306,7 +306,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       // Set ServantLocator_i object as the servant Manager of
       // secondPOA.
       second_poa->set_servant_manager (servant_locator_impl_
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       // For the code above, we're using the CORBA 3.0 servant manager
       // semantics supported by TAO.  For CORBA 2.x ORBs you'd need to
       // use the following code in place of the previous line:
@@ -314,7 +314,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       //   servant_loator_impl_->_this ();
       //
       // second_poa->set_servant_manager (servant_locator_impl_,
-      //                                  TAO_ENV_SINGLE_ARG_PARAMETER);
+      //                                  ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to create a reference with user created ID in second_poa
@@ -328,7 +328,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       second_foo_ = second_poa->create_reference_with_id
         (second_foo_oid.in (),
          "IDL:Foo:1.0"
-         TAO_ENV_ARG_PARAMETER);
+         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -346,7 +346,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 int
 Server_i::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Invoke object_to_string on the references created in firstPOA
@@ -354,12 +354,12 @@ Server_i::run (void)
 
       CORBA::String_var first_foo_ior =
         orb_->object_to_string (first_foo_.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_foo_ior =
         orb_->object_to_string (second_foo_.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the ior's of first_foo and second_foo.
@@ -376,15 +376,15 @@ Server_i::run (void)
 
       // Set the poa_manager state to active, ready to process
       // requests.
-      poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Run the ORB.
-      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/examples/POA/Reference_Counted_Servant/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
index 448d2d6ff3e..1c8a0812a1f 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/server.cpp
+++ b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
@@ -108,7 +108,7 @@ write_iors_to_file (const char *ior)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -116,7 +116,7 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -126,18 +126,18 @@ main (int argc, char **argv)
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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 a servant.
@@ -149,16 +149,16 @@ main (int argc, char **argv)
                       -1);
 
       // Get Object Reference for the foo_impl object.
-      Foo_var foo = foo_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Foo_var foo = foo_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This means that the ownership of <foo_impl> now belongs to
       // the POA.
-      foo_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      foo_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringyfy all the object references and print them out.
-      CORBA::String_var ior = orb->object_to_string (foo.in () TAO_ENV_ARG_PARAMETER);
+      CORBA::String_var ior = orb->object_to_string (foo.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -169,10 +169,10 @@ main (int argc, char **argv)
       if (write_result != 0)
         return write_result;
 
-      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_CATCHANY
diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp
index 007bbf9aa05..d9c6a8ba94b 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.cpp
+++ b/TAO/examples/POA/RootPOA/RootPOA.cpp
@@ -26,30 +26,30 @@ ACE_RCSID(RootPOA, RootPOA, "$Id$")
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initilize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Resolve the initial references for the name RootPOA thus getting
       // an object of type CORBA::Object.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // apply _narrow on the object of type CORBA::Object, to make it
       // a POA class Object.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the name of the root POA.
       CORBA::String_var poa_name =
-        root_poa->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/POA/TIE/Foo_i.cpp b/TAO/examples/POA/TIE/Foo_i.cpp
index 65d50eaa5e9..918fe3f149d 100644
--- a/TAO/examples/POA/TIE/Foo_i.cpp
+++ b/TAO/examples/POA/TIE/Foo_i.cpp
@@ -26,7 +26,7 @@ ACE_RCSID(TIE, Foo_i, "$Id$")
 
 // Return this->value
 CORBA::Long
-Tie_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Tie_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
@@ -42,7 +42,7 @@ A_i::A_i (CORBA::Long value,
 
 // Return this->value
 CORBA::Long
-A_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+A_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
@@ -50,7 +50,7 @@ A_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-A_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+A_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -65,7 +65,7 @@ Outer_i::B_i::B_i (CORBA::Long value,
 
 // Return this->value
 CORBA::Long
-Outer_i::B_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Outer_i::B_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
@@ -73,7 +73,7 @@ Outer_i::B_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-Outer_i::B_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Outer_i::B_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -88,7 +88,7 @@ Outer_i::Inner_i::C_i::C_i (CORBA::Long value,
 
 // Return this->value
 CORBA::Long
-Outer_i::Inner_i::C_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Outer_i::Inner_i::C_i::doit (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
@@ -96,7 +96,7 @@ Outer_i::Inner_i::C_i::doit (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-Outer_i::Inner_i::C_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Outer_i::Inner_i::C_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/examples/POA/TIE/Foo_i.h b/TAO/examples/POA/TIE/Foo_i.h
index 1b3e190bd97..218597d4e3e 100644
--- a/TAO/examples/POA/TIE/Foo_i.h
+++ b/TAO/examples/POA/TIE/Foo_i.h
@@ -25,7 +25,7 @@ public:
   Tie_i (CORBA::Long value);
 
   // Simple doit method
-  virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -41,11 +41,11 @@ public:
        PortableServer::POA_ptr poa);
 
   // Simple doit method
-  virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
 
@@ -67,11 +67,11 @@ public:
          PortableServer::POA_ptr poa);
 
     // Simple doit method
-    virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL)
+    virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Returns the Default POA of this Servant object
-    virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+    virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
   protected:
 
@@ -93,11 +93,11 @@ public:
            PortableServer::POA_ptr poa);
 
       // Simple doit method
-      virtual CORBA::Long doit (TAO_ENV_SINGLE_ARG_DECL)
+      virtual CORBA::Long doit (ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
       // Returns the Default POA of this Servant object
-      virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+      virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
     protected:
 
diff --git a/TAO/examples/POA/TIE/client.cpp b/TAO/examples/POA/TIE/client.cpp
index 3629894c231..25dd5ef60af 100644
--- a/TAO/examples/POA/TIE/client.cpp
+++ b/TAO/examples/POA/TIE/client.cpp
@@ -110,27 +110,27 @@ class Test
 public:
   static void run (CORBA::ORB_ptr orb,
                    char *IOR
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
   {
     if (IOR != 0)
       {
         // Get an object reference from the argument string.
-        CORBA::Object_var object = orb->string_to_object (IOR TAO_ENV_ARG_PARAMETER);
+        CORBA::Object_var object = orb->string_to_object (IOR ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
-        /*if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0)
+        /*if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0)
           {
-            TAO_ENV_ARG_PARAMETER.print_exception ("CORBA::ORB::string_to_object");
+            ACE_ENV_ARG_PARAMETER.print_exception ("CORBA::ORB::string_to_object");
             return;
           }
         */
         // Try to narrow the object reference to a reference.
-        T_var foo = T::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        T_var foo = T::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
-        /*if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0)
+        /*if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0)
           {
-            TAO_ENV_ARG_PARAMETER.print_exception ("_narrow");
+            ACE_ENV_ARG_PARAMETER.print_exception ("_narrow");
             return;
           }
         */
@@ -145,7 +145,7 @@ public:
         for (i = 0; i < iterations ; i++)
           {
             // Invoke the doit() method on the reference.
-            result = foo->doit (TAO_ENV_SINGLE_ARG_PARAMETER);
+            result = foo->doit (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_CHECK;
           }
 
@@ -156,9 +156,9 @@ public:
         // compute average time.
         print_stats (elapsed_time, i);
 
-        /*if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0)
+        /*if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0)
           {
-            TAO_ENV_ARG_PARAMETER.print_exception ("doit");
+            ACE_ENV_ARG_PARAMETER.print_exception ("doit");
             return;
           }
         */
@@ -173,11 +173,11 @@ public:
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
         // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -189,32 +189,32 @@ main (int argc, char **argv)
 
       Test<A, A_var>::run (orb.in (),
                            IOR[i++]
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test<Outer::B, Outer::B_var>::run (orb.in (),
                                          IOR[i++]
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (),
                                                        IOR[i++]
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test<A, A_var>::run (orb.in (),
                            IOR[i++]
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test<Outer::B, Outer::B_var>::run (orb.in (),
                                          IOR[i++]
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test<Outer::Inner::C, Outer::Inner::C_var>::run (orb.in (),
                                                        IOR[i++]
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp
index c34a7549e4e..18890eb8a55 100644
--- a/TAO/examples/POA/TIE/server.cpp
+++ b/TAO/examples/POA/TIE/server.cpp
@@ -22,7 +22,7 @@ ACE_RCSID(TIE, server, "$Id$")
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   char str[256];
 
@@ -31,26 +31,26 @@ main (int argc, char **argv)
       ACE_OS::strcpy (str, "CORBA::ORB_init");
 
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "PortableServer::POA::_narrow");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "PortableServer::POA::the_POAManager");
       // Get the POAManager of the RootPOA.
       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;
 
 
@@ -61,13 +61,13 @@ main (int argc, char **argv)
       ACE_OS::strcpy (str,"PortableServer::POA::create_lifespan_policy");
       // Lifespan policy
       policies[0] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "PortableServer::POA::create_implicit_activation_policy");
       // Implicit activation policy
       policies[1] =
-        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION TAO_ENV_ARG_PARAMETER);
+        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "PortableServer::POA::create_POA");
@@ -77,7 +77,7 @@ main (int argc, char **argv)
         root_poa->create_POA (name.c_str (),
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -89,7 +89,7 @@ main (int argc, char **argv)
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -119,34 +119,34 @@ main (int argc, char **argv)
 
       ACE_OS::strcpy (str, "POA_A::_this");
       // Get Object Reference for the a_impl object.
-      A_var a = a_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      A_var a = a_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       ACE_OS::strcpy (str, "POA_Outer::B::_this");
       // Get Object Reference for the b_impl object.
-      Outer::B_var b = b_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Outer::B_var b = b_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "POA_Outer::Inner::C::_this");
       // Get Object Reference for the c_impl object.
-      Outer::Inner::C_var c = c_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Outer::Inner::C_var c = c_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if defined (ACE_HAS_USING_KEYWORD)
       ACE_OS::strcpy (str, "POA_A::_this");
       // Get Object Reference for the a_tie_impl object.
-      A_var a_tie = a_tie_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      A_var a_tie = a_tie_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "POA_Outer::B::_this");
       // Get Object Reference for the a_tie_impl object.
-      Outer::B_var b_tie = b_tie_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Outer::B_var b_tie = b_tie_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::strcpy (str, "POA_Outer::C::_this");
       // Get Object Reference for the c_tie_impl object.
-      Outer::Inner::C_var c_tie = c_tie_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Outer::Inner::C_var c_tie = c_tie_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* ACE_HAS_USING_KEYWORD */
@@ -154,23 +154,23 @@ main (int argc, char **argv)
       ACE_OS::strcpy (str, "CORBA::ORB::object_to_string");
       // Stringyfy all the object references and print them out.
       CORBA::String_var first_ior =
-        orb->object_to_string (a.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (a.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var second_ior =
-        orb->object_to_string (b.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (b.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var third_ior =
-        orb->object_to_string (c.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (c.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if defined (ACE_HAS_USING_KEYWORD)
       // Stringyfy all the object references and print them out.
       CORBA::String_var forth_ior =
-        orb->object_to_string (a_tie.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (a_tie.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       FILE *output_file_1 = ACE_OS::fopen ("ior_1", "w");
@@ -203,13 +203,13 @@ main (int argc, char **argv)
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var fifth_ior =
-        orb->object_to_string (b_tie.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (b_tie.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       // Stringyfy all the object references and print them out.
       CORBA::String_var sixth_ior =
-        orb->object_to_string (c_tie.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (c_tie.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       FILE *output_file_5 = ACE_OS::fopen ("ior_5", "w");
@@ -229,10 +229,10 @@ main (int argc, char **argv)
 
 #endif /* ACE_HAS_USING_KEYWORD */
 
-      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_CATCHANY
diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
index 46c7be99dbd..2acbc958bdd 100644
--- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
@@ -67,7 +67,7 @@ Grid_Client_i::run (const char *name,
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -75,7 +75,7 @@ Grid_Client_i::run (const char *name,
 
       Grid_ptr grid = client->make_grid (width_,
                                          height_
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -91,7 +91,7 @@ Grid_Client_i::run (const char *name,
               grid->set (index_,
                          ctr,
                          (value_ + ctr)
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
             }
@@ -103,7 +103,7 @@ Grid_Client_i::run (const char *name,
       ACE_TRY_CHECK;
 
       if (client.shutdown () == 1) {
-        client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index 29f586b7808..0502f60e8df 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -63,7 +63,7 @@ void
 Grid_i::set (CORBA::Short x,
              CORBA::Short y,
              CORBA::Long value
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -81,7 +81,7 @@ Grid_i::set (CORBA::Short x,
 CORBA::Long
 Grid_i::get (CORBA::Short x,
              CORBA::Short y
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -97,14 +97,14 @@ Grid_i::get (CORBA::Short x,
 // Access methods.
 
 CORBA::Short
-Grid_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->width_;
 }
 
 CORBA::Short
-Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_i::height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->height_;
@@ -112,7 +112,7 @@ Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Grid_i::width (CORBA::Short x
-               TAO_ENV_ARG_DECL_NOT_USED)
+               ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->width_ = x;
@@ -120,7 +120,7 @@ Grid_i::width (CORBA::Short x
 
 void
 Grid_i::height (CORBA::Short y
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->height_ = y;
@@ -128,7 +128,7 @@ Grid_i::height (CORBA::Short y
 
 // Destroy the grid
 void
-Grid_i::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
+Grid_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Delete the array.
@@ -180,7 +180,7 @@ Grid_Factory_i::~Grid_Factory_i (void)
 Grid_ptr
 Grid_Factory_i::make_grid (CORBA::Short width,
                            CORBA::Short height
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -215,7 +215,7 @@ Grid_Factory_i::make_grid (CORBA::Short width,
   grid_ptr->set_pool (pool_t_);
 
   // Register the Grid pointer.
-  return grid_ptr->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return grid_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // Set the ORB pointer.
@@ -228,7 +228,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 
 // Shutdown.
 void
-Grid_Factory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_Factory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -240,7 +240,7 @@ Grid_Factory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Grid_Factory_i::cleanup (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_Factory_i::cleanup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *name = "Array";
diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h
index 8598f2a4658..50bf997a2c5 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.h
+++ b/TAO/examples/Persistent_Grid/Grid_i.h
@@ -43,15 +43,15 @@ public:
 
   virtual Grid_ptr make_grid (CORBA::Short,
                               CORBA::Short
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function creates and returns a <Grid>.
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
-  virtual void cleanup (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
+  virtual void cleanup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Do a clean up of the memory map
 
@@ -98,40 +98,40 @@ public:
   ~Grid_i (void);
   // Destructor
 
-  virtual CORBA::Short width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Short width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the width of the grid
 
-  virtual CORBA::Short height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Short height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the height of the grid
 
   virtual void width (CORBA::Short
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the width of the grid.
 
   virtual void height (CORBA::Short
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the height of the grid.
 
   virtual void set (CORBA::Short,
                     CORBA::Short,
                     CORBA::Long
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Sets the grid value.
 
   virtual CORBA::Long get (CORBA::Short,
                            CORBA::Short
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Gets the grid value.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the grid.
 
diff --git a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
index 7aeb5702ea6..3eac4a3d7a2 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
@@ -58,14 +58,14 @@ Persistent_Client_i::run (const char *name,
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Make the Grid.
       Grid_ptr grid = client->make_grid (width_,
                                          height_
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -78,7 +78,7 @@ Persistent_Client_i::run (const char *name,
             {
               CORBA::Long ret_val = grid->get (index_,
                                                ctr
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
@@ -87,12 +87,12 @@ Persistent_Client_i::run (const char *name,
         }
 
       if (client.shutdown () == 1) {
-        client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
       if (this->remove_ == 1) {
-        client->cleanup (TAO_ENV_SINGLE_ARG_PARAMETER);
+        client->cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
diff --git a/TAO/examples/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp
index 50b9a858961..02eacbebccd 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.cpp
+++ b/TAO/examples/Persistent_Grid/Simple_util.cpp
@@ -69,14 +69,14 @@ template <class Servant> int
 Server<Servant>::init (const char *servant_name,
                        int argc,
                        char *argv[]
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
                                          "child_poa"
-                                         TAO_ENV_ARG_PARAMETER) == -1)
+                                         ACE_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -109,7 +109,7 @@ Server<Servant>::init (const char *servant_name,
       CORBA::String_var str  =
         this->orb_manager_.activate_under_child_poa (servant_name,
                                                      &this->servant_
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -138,10 +138,10 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant> int
-Server<Servant>::run (TAO_ENV_SINGLE_ARG_DECL)
+Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL)
 {
     // Run the main event loop for the ORB.
-  int ret = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (ret == -1)
@@ -245,7 +245,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
   this->argc_ = argc;
   this->argv_ = argv;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -253,7 +253,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     0
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -263,7 +263,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
       if(this->ior_ != 0)
         {
           CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER);
+            this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
@@ -273,7 +273,7 @@ Client<InterfaceObj, Var>::init (const char * /*name*/,
                                this->ior_),
                               -1);
           this->server_ = InterfaceObj::_narrow (server_object.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index e95c2f3173c..f1491f00151 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -47,7 +47,7 @@ public:
   int init (const char *servant_name,
             int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Server state - parsing arguments and waiting.
   // interface_name is the name used to register the Servant.
 
@@ -55,7 +55,7 @@ public:
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
  protected:
@@ -120,7 +120,7 @@ public:
   void shutdown (int);
   // Fills in the shutdwon flag.
 
-  int obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Initialize naming service
 
 protected:
diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp
index 76fa1e1d145..4a31cc0403e 100644
--- a/TAO/examples/Persistent_Grid/server.cpp
+++ b/TAO/examples/Persistent_Grid/server.cpp
@@ -13,18 +13,18 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tGrid server\n\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       if (server.init ("Grid",
                        argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER) == -1)
+                       ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
index 1200d20bd2d..e0d2194384f 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
@@ -37,7 +37,7 @@ UDP_Client_i::svc (void)
   client_name += "_";
   client_name += pid;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -51,7 +51,7 @@ UDP_Client_i::svc (void)
           udp_->invoke (corba_client_name.in (),
                         udpHandler_.inout (),
                         i
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
@@ -64,7 +64,7 @@ UDP_Client_i::svc (void)
         }
 
       // shut down remote ORB
-      udp_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      udp_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (0, 500); // 50ms
diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp
index 1027ecb86f8..2011f010dcc 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp
@@ -30,7 +30,7 @@ void
 UDP_i::invoke (const char * client_name,
                UDP_ptr udpHandler,
                CORBA::Long request_id
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -62,7 +62,7 @@ UDP_i::invoke (const char * client_name,
           udpHandler->invoke (client_name,
                               UDP::_nil (),
                               request_id
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -78,7 +78,7 @@ UDP_i::invoke (const char * client_name,
 // Shutdown.
 
 void
-UDP_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+UDP_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h
index 4ed19a5aa01..3ed48cd85a2 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h
+++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h
@@ -47,10 +47,10 @@ public:
   virtual void invoke (const char *client_name,
                        UDP_ptr udpHandler,
                        CORBA::Long request_id
-                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Shutdown the server.
diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.cpp b/TAO/examples/PluggableUDP/tests/Basic/client.cpp
index 90cd6bfcc2d..f7db9081cbd 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/client.cpp
@@ -79,18 +79,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->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       UDP_var udp_var =
-        UDP::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        UDP::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (udp_var.in ()))
@@ -102,7 +102,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -111,14 +111,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate reply handler
@@ -128,7 +128,7 @@ main (int argc, char *argv[])
       udp_i.orb (orb.in ());
 
       UDP_var udpHandler_var =
-        udp_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        udp_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate client
@@ -143,17 +143,17 @@ main (int argc, char *argv[])
 
       // ORB loop, will be shut down by our client thread
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         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;
 
       client->wait ();
diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.cpp b/TAO/examples/PluggableUDP/tests/Basic/server.cpp
index 0397c8a3c7e..c550d02c525 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/server.cpp
@@ -66,11 +66,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -79,11 +79,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       // Install a persistent POA in order to achieve a persistent IOR
@@ -92,11 +92,11 @@ main (int argc, char *argv[])
       policies.length (2);
       policies[0] =
         root_poa->create_lifespan_policy(PortableServer::PERSISTENT
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policies[1] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -104,13 +104,13 @@ main (int argc, char *argv[])
         root_poa->create_POA("persistent",
                              poa_manager.in (),
                              policies
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -125,25 +125,25 @@ main (int argc, char *argv[])
 
       persistent_poa->activate_object_with_id (id.in (),
                                                &udp_i
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
         persistent_poa->id_to_reference (id.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
-      UDP_var udp_var = UDP::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+      UDP_var udp_var = UDP::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
 
-      // UDP_var udp_var = udp_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      // UDP_var udp_var = udp_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (udp_var.in ()))
         ACE_DEBUG ((LM_DEBUG,
                     "Failed to narrow correct object reference.\n"));
 
       CORBA::String_var ior =
-        orb->object_to_string (udp_var.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (udp_var.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -161,7 +161,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /*
@@ -171,7 +171,7 @@ main (int argc, char *argv[])
       udpHandler_i.orb (orb.in ());
 
       UDP_var udpHandler_var =
-        udpHandler_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        udpHandler_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate client
@@ -182,17 +182,17 @@ main (int argc, char *argv[])
       client->activate ();
       */
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         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;
 
       //delete client;
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
index 75639141928..f80fd02751a 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
@@ -48,11 +48,11 @@ UDP_PerformanceClient::svc ()
       CORBA::String_var corba_client_name =
         CORBA::string_dup (client_name.c_str ());
 
-      UDP_var udpHandler_var = udpHandler_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      UDP_var udpHandler_var = udpHandler_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       udp_->setResponseHandler (udpHandler_var.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_High_Res_Timer timer;
@@ -71,7 +71,7 @@ UDP_PerformanceClient::svc ()
             {
               udp_->invoke (corba_client_name.in (),
                             j
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
 
@@ -93,7 +93,7 @@ UDP_PerformanceClient::svc ()
 
           // Reset expected request ID
           udp_->reset (corba_client_name.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Give the reset a chance to propagate back to us
@@ -155,7 +155,7 @@ UDP_PerformanceClient::svc ()
         }
 
       // shut down remote ORB
-      udp_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      udp_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (0, 50); // 50ms
@@ -163,7 +163,7 @@ UDP_PerformanceClient::svc ()
 
       // Shut down local ORB, trigger the end of the ORB event loop
             // in the main thread.
-      orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+      orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
index 409902492b7..025db630473 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp
@@ -30,7 +30,7 @@ UDP_i::orb (CORBA::ORB_ptr orb)
 
 void
 UDP_i::setResponseHandler (UDP_ptr udpHandler
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (udpHandler))
@@ -43,7 +43,7 @@ UDP_i::setResponseHandler (UDP_ptr udpHandler
 void
 UDP_i::invoke (const char * client_name,
                CORBA::Long request_id
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -80,7 +80,7 @@ UDP_i::invoke (const char * client_name,
         {
           responseHandler_->invoke (client_name,
                                     request_id
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -96,7 +96,7 @@ UDP_i::invoke (const char * client_name,
 
 void
 UDP_i::reset (const char * client_name
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -109,7 +109,7 @@ UDP_i::reset (const char * client_name
       if (!CORBA::is_nil (responseHandler_.in ()))
         {
           responseHandler_->reset (client_name
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -124,7 +124,7 @@ UDP_i::reset (const char * client_name
 // Shutdown.
 
 void
-UDP_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+UDP_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -134,7 +134,7 @@ UDP_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_TRY
     {
       // Instruct the ORB to shutdown.
-      this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
index 292d4bff2bb..5d5d773ee25 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h
@@ -39,20 +39,20 @@ public:
   // Destructor
 
   virtual void setResponseHandler (UDP_ptr udpHandler
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void invoke (const char *client_name,
                        CORBA::Long request_id
-                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void reset (const char * client_name
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Shutdown the server.
diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
index 995ef1c8a14..07bb98914ee 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
@@ -78,18 +78,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "PerformanceClient" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "PerformanceClient" 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;
 
       UDP_var udp_var =
-        UDP::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        UDP::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (udp_var.in ()))
@@ -103,7 +103,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -112,14 +112,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate reply handler
@@ -129,7 +129,7 @@ main (int argc, char *argv[])
       udp_i.orb (orb.in ());
 
       UDP_var udpHandler_var =
-        udp_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        udp_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate client
@@ -143,17 +143,17 @@ main (int argc, char *argv[])
       client->activate ();
 
       // ORB loop, will be shut down by our client thread
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);  // Fetch responses
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);  // Fetch responses
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "ORB finished\n"));
 
       root_poa->destroy (1, // ethernalize objects
                          0  // wait for completion
-                         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;
 
       // it is save to delete the client, because the client was actually
diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
index e2ca027a6e2..594220abce1 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
@@ -68,7 +68,7 @@ static void *svc (void *arg)
 
   ACE_TRY_NEW_ENV
     {
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -86,11 +86,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "PerformanceServer" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "PerformanceServer" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -99,11 +99,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       // Install a persistent POA in order to achieve a persistent IOR
@@ -113,25 +113,25 @@ main (int argc, char *argv[])
       policies.length (2);
       policies[0] =
         root_poa->create_lifespan_policy(PortableServer::PERSISTENT
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policies[1] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var persistent_poa =
         root_poa->create_POA("persistent",
                              poa_manager.in (),
                              policies
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -146,16 +146,16 @@ main (int argc, char *argv[])
 
       persistent_poa->activate_object_with_id (id.in (),
                                                &udp_i
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
         persistent_poa->id_to_reference (id.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
-      UDP_var udp_var = UDP::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+      UDP_var udp_var = UDP::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (udp_var.in ()))
@@ -163,7 +163,7 @@ main (int argc, char *argv[])
                     "Failed to narrow correct object reference.\n"));
 
       CORBA::String_var ior =
-        orb->object_to_string (udp_var.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (udp_var.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -181,7 +181,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (orb_threads > 1)
@@ -189,17 +189,17 @@ main (int argc, char *argv[])
                                                   svc,
                                                   orb.in ());
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "ORB finished\n"));
 
       root_poa->destroy (1, // ethernalize objects
                          0  // wait for completion
-                         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_Thread_Manager::instance ()->wait ();
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
index 7358ff679cb..8ac9cf12210 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
@@ -69,15 +69,15 @@ int main (int argc, char *argv[])
           CORBA::ORB_init (argc,
                            argv,
                            "ORB_Test_Client"
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->string_to_object (iorFile TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (iorFile ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -90,7 +90,7 @@ int main (int argc, char *argv[])
 
       CORBA::String_var string =
         orb->object_to_string (server.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -103,7 +103,7 @@ int main (int argc, char *argv[])
 
       //ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -143,7 +143,7 @@ Client::svc (void)
 
       // This sets up the connector, so that we do not incur
       // the overhead on the first call in the loop.
-      server_->sendCharSeq (charSeq TAO_ENV_ARG_PARAMETER);
+      server_->sendCharSeq (charSeq ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       timer.start ();
@@ -153,10 +153,10 @@ Client::svc (void)
         {
           client_count++;
 
-          server_->sendCharSeq (charSeq TAO_ENV_ARG_PARAMETER);
+          server_->sendCharSeq (charSeq ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          //server_->sendOctetSeq (octetSeq TAO_ENV_ARG_PARAMETER);
+          //server_->sendOctetSeq (octetSeq ACE_ENV_ARG_PARAMETER);
 
           //ACE_DEBUG ((LM_DEBUG, "."));
         }
@@ -177,7 +177,7 @@ Client::svc (void)
                   dur / this->niterations_,
                   1000000 / (dur / this->niterations_)));
 
-      server_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
index d8931bf0556..5c6e538d760 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
@@ -39,11 +39,11 @@ int main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "ORB_Test_Server" TAO_ENV_ARG_PARAMETER);
+                         "ORB_Test_Server" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -52,26 +52,26 @@ int main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       Simple_Server_i server_impl (orb.in ());
 
-      PortableServer::ObjectId_var oidServer = root_poa->activate_object (&server_impl TAO_ENV_ARG_PARAMETER);
+      PortableServer::ObjectId_var oidServer = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Object_var objOne = root_poa->id_to_reference (oidServer.in () TAO_ENV_ARG_PARAMETER);
+      CORBA::Object_var objOne = root_poa->id_to_reference (oidServer.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Simple_Server_var server = Simple_Server::_narrow (objOne.in () TAO_ENV_ARG_PARAMETER);
+      Simple_Server_var server = Simple_Server::_narrow (objOne.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -89,18 +89,18 @@ int main (int argc, char *argv[])
                 ACE_OS::fclose (output_file);
               }
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
index fa6a8f0d36e..e9ad3018cc1 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp
@@ -10,7 +10,7 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 }
 
 void
-Simple_Server_i::sendCharSeq (const Char_Seq & TAO_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::sendCharSeq (const Char_Seq & ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Simple_Server_count++;
@@ -18,7 +18,7 @@ Simple_Server_i::sendCharSeq (const Char_Seq & TAO_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-Simple_Server_i::sendOctetSeq (const Octet_Seq & TAO_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::sendOctetSeq (const Octet_Seq & ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Simple_Server_count++;
@@ -27,7 +27,7 @@ Simple_Server_i::sendOctetSeq (const Octet_Seq & TAO_ENV_ARG_DECL_NOT_USED)
 
 CORBA::Long
 Simple_Server_i::get_number (CORBA::Long
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Long tmp = Simple_Server_count;
@@ -36,14 +36,14 @@ Simple_Server_i::get_number (CORBA::Long
 }
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "Simple_Server_i::shutdown\n"));
   ACE_TRY
     {
-      this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
index fe54f70163b..27dccfeb62d 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h
@@ -31,16 +31,16 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void sendCharSeq (const Char_Seq & charSeq TAO_ENV_ARG_DECL_NOT_USED)
+  void sendCharSeq (const Char_Seq & charSeq ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void sendOctetSeq (const Octet_Seq & octetSeq TAO_ENV_ARG_DECL_NOT_USED)
+  void sendOctetSeq (const Octet_Seq & octetSeq ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Long get_number (CORBA::Long num TAO_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long get_number (CORBA::Long num ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index cc164b10346..c7a76c7a97f 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -35,7 +35,7 @@ Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void)
       factory_Finder_Name[0].id = CORBA::string_dup ("IDL_Quoter");
       factory_Finder_Name[1].id = CORBA::string_dup ("Quoter_Factory_Finder");
       if (this->quoterNamingContext_var_.ptr () != 0)
-        this->quoterNamingContext_var_->unbind (factory_Finder_Name TAO_ENV_ARG_PARAMETER);
+        this->quoterNamingContext_var_->unbind (factory_Finder_Name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -49,7 +49,7 @@ Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void)
 int
 Quoter_Factory_Finder_Server::init (int argc,
                                     char *argv[]
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   const char *exception_message = "Null Message";
 
@@ -58,7 +58,7 @@ Quoter_Factory_Finder_Server::init (int argc,
       exception_message = "While ORB_Manager::init";
       if (this->orb_manager_.init (argc,
                                    argv
-                                   TAO_ENV_ARG_PARAMETER) == -1)
+                                   ACE_ENV_ARG_PARAMETER) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
                            "init"),
@@ -67,7 +67,7 @@ Quoter_Factory_Finder_Server::init (int argc,
 
       // Activate the POA manager
       exception_message = "While activating the POA manager";
-      int result = this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      int result = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
@@ -88,7 +88,7 @@ Quoter_Factory_Finder_Server::init (int argc,
       exception_message = "Failure while activating the Quoter Factory Finder Impl";
       CORBA::String_var str  =
         this->orb_manager_.activate (this->quoter_Factory_Finder_i_ptr_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the IOR.
@@ -102,7 +102,7 @@ Quoter_Factory_Finder_Server::init (int argc,
       // Get the Naming Service object reference.
       exception_message = "While resolving the Name Service";
       CORBA::Object_var namingObj_var =
-        orb_manager_.orb()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (namingObj_var.in ()))
@@ -113,7 +113,7 @@ Quoter_Factory_Finder_Server::init (int argc,
       exception_message = "While narrowing the Naming Context";
       CosNaming::NamingContext_var namingContext_var =
         CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the IDL_Quoter naming context.
@@ -123,13 +123,13 @@ Quoter_Factory_Finder_Server::init (int argc,
 
       exception_message = "While resolving the Quoter Naming Context";
       CORBA::Object_var quoterNamingObj_var =
-        namingContext_var->resolve (quoterContextName TAO_ENV_ARG_PARAMETER);
+        namingContext_var->resolve (quoterContextName ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While narrowing the Quoter Naming Context";
       quoterNamingContext_var_ =
         CosNaming::NamingContext::_narrow (quoterNamingObj_var.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -143,13 +143,13 @@ Quoter_Factory_Finder_Server::init (int argc,
       quoter_Factory_Finder_Name_[0].id = CORBA::string_dup ("Quoter_Factory_Finder");
 
       exception_message = "Factory_Factory::_this";
-      CORBA::Object_var ff_obj = this->quoter_Factory_Finder_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Object_var ff_obj = this->quoter_Factory_Finder_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While binding the Factory Finder";
       quoterNamingContext_var_->bind (quoter_Factory_Finder_Name_,
                                       ff_obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -168,13 +168,13 @@ Quoter_Factory_Finder_Server::init (int argc,
 }
 
 int
-Quoter_Factory_Finder_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+Quoter_Factory_Finder_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nQuoter Example: Quoter_Factory_Finder_Server is running\n"));
 
-  orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -223,14 +223,14 @@ main (int argc, char *argv [])
 
   ACE_TRY_NEW_ENV
     {
-      int result = quoter_Factory_Finder_Server.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int result = quoter_Factory_Finder_Server.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
         return 1;
       else
         {
-          quoter_Factory_Finder_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          quoter_Factory_Finder_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h
index 44844e12947..3d9e89ca85d 100644
--- a/TAO/examples/Quoter/Factory_Finder.h
+++ b/TAO/examples/Quoter/Factory_Finder.h
@@ -37,10 +37,10 @@ public:
   ~Quoter_Factory_Finder_Server (void);
   // Destructor
 
-  int init (int argc, char *argv[] TAO_ENV_ARG_DECL);
+  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Initialize the Quoter_Server state - parsing arguments and ...
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
   u_int parse_args (void);
diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp
index 023e2ec6c8d..9720df205c5 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.cpp
+++ b/TAO/examples/Quoter/Factory_Finder_i.cpp
@@ -38,7 +38,7 @@ Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void)
 
 CosLifeCycle::Factories *
 Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory))
 {
@@ -54,7 +54,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key
     // Get the Naming Service object reference.
     exception_message = "While resolving the Name Service";
     CORBA::Object_var namingObj_var =
-      orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+      orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (CORBA::is_nil (namingObj_var.in ()))
@@ -65,7 +65,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key
     exception_message = "While narrowing the Naming Context";
     CosNaming::NamingContext_var namingContext_var =
       CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // Take the key supplied to search for a Quoter Factory
@@ -74,7 +74,7 @@ Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key
     // Try to get a reference to a Quoter Factory
     exception_message = "While resolving the Factory Object";
     CORBA::Object_var quoterFactoryObject_var =
-      namingContext_var->resolve (factoryName TAO_ENV_ARG_PARAMETER);
+      namingContext_var->resolve (factoryName ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // Check if it is a valid Quoter Factory reference
diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h
index 8d7beeea56c..97695c7c9b2 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.h
+++ b/TAO/examples/Quoter/Factory_Finder_i.h
@@ -29,7 +29,7 @@ public:
   ~Quoter_Factory_Finder_i (void);
 
   virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key
-                                                    TAO_ENV_ARG_DECL)
+                                                    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory));
   // Returns a sequence of Factories if factories matching the
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index f4329dbf36d..acb7858daf1 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -35,7 +35,7 @@ Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void)
       generic_Factory_Name[0].id = CORBA::string_dup ("IDL_Quoter");
       generic_Factory_Name[1].id = CORBA::string_dup ("Quoter_Generic_Factory");
       if (this->quoterNamingContext_var_.ptr () != 0)
-        this->quoterNamingContext_var_->unbind (generic_Factory_Name TAO_ENV_ARG_PARAMETER);
+        this->quoterNamingContext_var_->unbind (generic_Factory_Name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -52,7 +52,7 @@ Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void)
 int
 Quoter_Generic_Factory_Server::init (int argc,
                                      char *argv[]
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   const char *exception_message = "Null Message";
 
@@ -61,7 +61,7 @@ Quoter_Generic_Factory_Server::init (int argc,
       int result = 0;
       // Initialize the ORB Manager
       exception_message = "While initing the orb_manager";
-      result = this->orb_manager_.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      result = this->orb_manager_.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
@@ -69,7 +69,7 @@ Quoter_Generic_Factory_Server::init (int argc,
 
       // Activate the POA manager
       exception_message = "While activating the POA manager";
-      result = this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
@@ -88,7 +88,7 @@ Quoter_Generic_Factory_Server::init (int argc,
       exception_message = "While activating the Generic Factory";
       CORBA::String_var str  =
         this->orb_manager_.activate (this->quoter_Generic_Factory_i_ptr_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the IOR.
@@ -103,7 +103,7 @@ Quoter_Generic_Factory_Server::init (int argc,
       // Get the Naming Service object reference.
       exception_message = "While getting the Naming Service Reference";
       CORBA::Object_var namingObj_var =
-        orb_manager_.orb()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (namingObj_var.in ()))
@@ -114,7 +114,7 @@ Quoter_Generic_Factory_Server::init (int argc,
       exception_message = "While narrowing the Naming Context";
       CosNaming::NamingContext_var namingContext_var =
         CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (namingContext_var.in ()))
@@ -134,13 +134,13 @@ Quoter_Generic_Factory_Server::init (int argc,
       exception_message = "While resolving the Quoter";
       CORBA::Object_var quoterNamingObj_var =
         namingContext_var->resolve (quoterContextName
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While narrowing the Quoter";
       quoterNamingContext_var_ =
         CosNaming::NamingContext::_narrow (quoterNamingObj_var.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -154,13 +154,13 @@ Quoter_Generic_Factory_Server::init (int argc,
       quoter_Generic_Factory_Name[0].id = CORBA::string_dup ("Quoter_Generic_Factory");
 
       exception_message = "Generic_Factory::_this";
-      CORBA::Object_var gf_obj = this->quoter_Generic_Factory_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Object_var gf_obj = this->quoter_Generic_Factory_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While binding the Generic Factory";
       quoterNamingContext_var_->bind (quoter_Generic_Factory_Name,
                                       gf_obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -181,20 +181,20 @@ Quoter_Generic_Factory_Server::init (int argc,
         exception_message = "While resolving the Life Cycle Service";
         CORBA::Object_var life_Cycle_Service_Obj_var =
           namingContext_var->resolve (life_Cycle_Service_Name
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         exception_message = "While narrowing the Life Cycle Service";
         LifeCycleService::Life_Cycle_Service_var  life_Cycle_Service_var =
           LifeCycleService::Life_Cycle_Service::_narrow (life_Cycle_Service_Obj_var.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (this->debug_level_ >= 2)
           ACE_DEBUG ((LM_DEBUG, "Generic_Factory: Have a proper reference to Life Cycle Service.\n"));
 
         exception_message = "While _this on Generic Factory";
-        CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER);
+        CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         exception_message = "While registering the generic factory";
@@ -202,7 +202,7 @@ Quoter_Generic_Factory_Server::init (int argc,
                                                   "Bryan 503",               // location
                                                   "Generic Factory",         // description
                                                   object_var.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (this->debug_level_ >= 2)
@@ -224,13 +224,13 @@ Quoter_Generic_Factory_Server::init (int argc,
 }
 
 int
-Quoter_Generic_Factory_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+Quoter_Generic_Factory_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nQuoter Example: Quoter_Generic_Factory_Server is running\n"));
 
-  orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -284,11 +284,11 @@ main (int argc, char *argv [])
     {
       if (quoter_Generic_Factory_Server.init (argc,
                                               argv
-                                              TAO_ENV_ARG_PARAMETER) == -1)
+                                              ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          quoter_Generic_Factory_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          quoter_Generic_Factory_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h
index 0c1de6c0cd5..1d5950ebb27 100644
--- a/TAO/examples/Quoter/Generic_Factory.h
+++ b/TAO/examples/Quoter/Generic_Factory.h
@@ -39,10 +39,10 @@ public:
 
   int init (int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Quoter_Server state - parsing arguments and ...
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
   u_int parse_args (void);
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp
index d22e7ee8e87..bf8002d1ff4 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.cpp
+++ b/TAO/examples/Quoter/Generic_Factory_i.cpp
@@ -34,7 +34,7 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void)
 
 CORBA::Boolean
 Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -44,7 +44,7 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &
 
 CosNaming::NamingContext_ptr
 Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
 {
   CosNaming::NamingContext_var quoterNamingContext_var;
   ACE_TRY
@@ -55,7 +55,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
 
       // Get the Naming Service object reference.
       CORBA::Object_var namingObj_var =
-        orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (namingObj_var.in ()))
@@ -65,7 +65,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
       // Narrow the object reference to a Naming Context.
       CosNaming::NamingContext_var namingContext_var =
         CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name quoterContextName (1);  // max = 1
@@ -74,12 +74,12 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
 
       // Get the IDL_Quoter naming context.
       CORBA::Object_var quoterNamingObj_var =
-        namingContext_var->resolve (quoterContextName TAO_ENV_ARG_PARAMETER);
+        namingContext_var->resolve (quoterContextName ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       quoterNamingContext_var =
         CosNaming::NamingContext::_narrow (quoterNamingObj_var.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -96,7 +96,7 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k
 CORBA::Object_ptr
 Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
                                          const CosLifeCycle::Criteria &
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::InvalidCriteria,
@@ -107,7 +107,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
     {
       CosNaming::NamingContext_var quoterNamingContext_var =
         this->get_naming_context (factory_key
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ** now a proper reference to the quoter naming context is
@@ -119,7 +119,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
 
       // Try to get a reference to a Quoter Factory
       CORBA::Object_var quoterFactoryObject_var =
-        quoterNamingContext_var->resolve (factory_Name TAO_ENV_ARG_PARAMETER);
+        quoterNamingContext_var->resolve (factory_Name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We were able to get a reference to Quoter Factory.
@@ -131,7 +131,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
 
       Stock::Quoter_Factory_var factory_var =
         Stock::Quoter_Factory::_narrow (quoterFactoryObject_var.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory_var.in ()))
@@ -147,7 +147,7 @@ Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key,
       // Now retrieve the Quoter obj ref corresponding to the key.
       quoter_var =
         factory_var->create_quoter ("test"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ > 1)
diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h
index e0477100101..b03ee673647 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.h
+++ b/TAO/examples/Quoter/Generic_Factory_i.h
@@ -30,14 +30,14 @@ public:
   ~Quoter_Generic_Factory_i (void);
 
   CORBA::Boolean supports (const CosLifeCycle::Key &factory_key
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns true if the Generic Factory is able to forward a request
   // for creating an object described by the <factory_key>.
 
   CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
                                    const CosLifeCycle::Criteria &the_criteria
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::InvalidCriteria,
@@ -48,7 +48,7 @@ public:
 
 private:
   CosNaming::NamingContext_ptr get_naming_context (const CosLifeCycle::Key &factory_key
-                                                   TAO_ENV_ARG_DECL_NOT_USED);
+                                                   ACE_ENV_ARG_DECL_NOT_USED);
   // a helper to get the proper naming context.
 
   int debug_level_;
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index d24ba43056e..1b9d5a93819 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -45,7 +45,7 @@ Quoter_Factory_i::~Quoter_Factory_i (void)
 
 // Initialize everything in the factory
 
-int Quoter_Factory_i::init (TAO_ENV_SINGLE_ARG_DECL)
+int Quoter_Factory_i::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_RETURN (this->my_quoters_,
                   Quoter_i *[this->quoter_num_],
@@ -62,18 +62,18 @@ int Quoter_Factory_i::init (TAO_ENV_SINGLE_ARG_DECL)
       const char *location_string = "POA::activate";
       ACE_TRY
         {
-          this->poa_ptr_->activate_object (this->my_quoters_[i] TAO_ENV_ARG_PARAMETER);
+          this->poa_ptr_->activate_object (this->my_quoters_[i] ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           location_string = "_this";
-          Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this(TAO_ENV_SINGLE_ARG_PARAMETER);
+          Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           location_string = "CORBA::ORB::object_to_string";
           // Stringify the object reference and print it out.
           CORBA::String_var quoter_ior =
             TAO_ORB_Core_instance()->orb()->object_to_string (quoter_var.in ()
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -93,7 +93,7 @@ int Quoter_Factory_i::init (TAO_ENV_SINGLE_ARG_DECL)
 
 Stock::Quoter_ptr
 Quoter_Factory_i::create_quoter (const char *
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Stock::Invalid_Quoter))
 {
@@ -102,7 +102,7 @@ Quoter_Factory_i::create_quoter (const char *
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Quoter %d Created\n", this->next_quoter_));
 
-  return my_quoters_[this->next_quoter_]->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return my_quoters_[this->next_quoter_]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
@@ -131,7 +131,7 @@ Quoter_i::~Quoter_i (void)
 
 CORBA::Long
 Quoter_i::get_quote (char const *
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Stock::Invalid_Stock,
                        Stock::Invalid_Quoter))
@@ -145,7 +145,7 @@ Quoter_i::get_quote (char const *
 CosLifeCycle::LifeCycleObject_ptr
 Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there,
                 const CosLifeCycle::Criteria &/*the_criteria*/
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::NotCopyable,
@@ -177,7 +177,7 @@ CosLifeCycle::LifeCycleObject::_nil ();
       // Find an appropriate factory over there.
       exception_message = "While trying to find a factory.\n";
       CosLifeCycle::Factories *factories_ptr =
-        there->find_factories (factoryKey TAO_ENV_ARG_PARAMETER);
+        there->find_factories (factoryKey ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now it is known that there is at least one factory.
@@ -192,7 +192,7 @@ CosLifeCycle::LifeCycleObject::_nil ();
         exception_message = "While narrowing.\n";
         CosLifeCycle::GenericFactory_var generic_Factory_var =
           CosLifeCycle::GenericFactory::_narrow (generic_FactoryObj_ptr
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (CORBA::is_nil (generic_Factory_var.in ()))
@@ -215,11 +215,11 @@ CosLifeCycle::LifeCycleObject::_nil ();
           CORBA::Object_var quoterObject_var =
             generic_Factory_var->create_object (genericFactoryName,
                                                 criteria
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           exception_message = "While narrowing object";
-          quoter_var = Stock::Quoter::_narrow (quoterObject_var.in() TAO_ENV_ARG_PARAMETER);
+          quoter_var = Stock::Quoter::_narrow (quoterObject_var.in() ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (quoter_var.in ()))
@@ -272,7 +272,7 @@ CosLifeCycle::LifeCycleObject::_nil ();
 void
 Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
                 const CosLifeCycle::Criteria & /* the_criteria */
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::NotMovable,
@@ -289,7 +289,7 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
 // Removes the object.  Once we shut down the ORB we can call it a day.
 
 void
-Quoter_i::remove (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Quoter_i::remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NotRemovable))
 {
diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h
index 6408ad5f0bc..b7e1e2b7e5f 100644
--- a/TAO/examples/Quoter/Quoter_i.h
+++ b/TAO/examples/Quoter/Quoter_i.h
@@ -44,7 +44,7 @@ public:
   // Destructor
 
   virtual CORBA::Long get_quote (const char *stock_name
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Stock::Invalid_Stock,
                        Stock::Invalid_Quoter));
@@ -54,7 +54,7 @@ public:
 
   virtual CosLifeCycle::LifeCycleObject_ptr copy (CosLifeCycle::FactoryFinder_ptr there,
                                                   const CosLifeCycle::Criteria &the_criteria
-                                                  TAO_ENV_ARG_DECL)
+                                                  ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::NotCopyable,
@@ -64,7 +64,7 @@ public:
 
   virtual void move (CosLifeCycle::FactoryFinder_ptr there,
                      const CosLifeCycle::Criteria &the_criteria
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::NotMovable,
@@ -72,7 +72,7 @@ public:
                        CosLifeCycle::CannotMeetCriteria));
   // Move this object using <there>
 
-  virtual void remove (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void remove (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NotRemovable));
   // Removes the object.
@@ -105,11 +105,11 @@ public:
   ~Quoter_Factory_i (void);
   // Destructor.
 
-  int init (TAO_ENV_SINGLE_ARG_DECL);
+  int init (ACE_ENV_SINGLE_ARG_DECL);
   // Initialize everything in the factory
 
   virtual Stock::Quoter_ptr create_quoter (const char *name
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Stock::Invalid_Quoter));
   // Return the quoter by the id <name>.
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index c5f8aaad712..a685c33fdeb 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -89,7 +89,7 @@ Quoter_Client::run (void)
   ACE_TRY_NEW_ENV
     {
       exception_message = "While using get_quote ()";
-      CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware" TAO_ENV_ARG_PARAMETER);
+      CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 1)
@@ -102,7 +102,7 @@ Quoter_Client::run (void)
       CORBA::Object_var quoterObj_var =
         this->quoter_var_->copy (factory_Finder_var_.in (),
                                  criteria
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (quoterObj_var.in()))
@@ -114,7 +114,7 @@ Quoter_Client::run (void)
       exception_message = "While narrowing the quoter";
       Stock::Quoter_var copied_quoter_var =
         Stock::Quoter::_narrow (quoterObj_var.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (copied_quoter_var.in()))
@@ -126,7 +126,7 @@ Quoter_Client::run (void)
         ACE_DEBUG ((LM_DEBUG, "Quoter Client: Copied object.\n"));
 
       exception_message = "While using get_quote () on copied object";
-      q = copied_quoter_var->get_quote ("ACE Hardware" TAO_ENV_ARG_PARAMETER);
+      q = copied_quoter_var->get_quote ("ACE Hardware" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 1)
@@ -163,7 +163,7 @@ Quoter_Client::init_naming_service (void)
     {
       // Resolve the Naming Service
       CORBA::Object_var naming_obj =
-        orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -173,7 +173,7 @@ Quoter_Client::init_naming_service (void)
 
       exception_message = "While narrowing the naming context";
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -190,7 +190,7 @@ Quoter_Client::init_naming_service (void)
       exception_message = "While resolving the factory finder";
       CORBA::Object_var factory_obj =
         naming_context->resolve (quoterFactoryFinderName
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -199,7 +199,7 @@ Quoter_Client::init_naming_service (void)
       exception_message = "While narrowing the factory finder";
       factory_Finder_var_ =
         Stock::Quoter_Factory_Finder::_narrow (factory_obj.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory_Finder_var_.in ()))
@@ -233,7 +233,7 @@ Quoter_Client::init_naming_service (void)
       // Find an appropriate factory over there.
       exception_message = "While finding factories";
       CosLifeCycle::Factories *factories_ptr =
-          factory_Finder_var_->find_factories (factoryName TAO_ENV_ARG_PARAMETER);
+          factory_Finder_var_->find_factories (factoryName ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (factories_ptr == 0)
@@ -263,7 +263,7 @@ Quoter_Client::init_naming_service (void)
       exception_message = "While narrowing the factory";
       generic_Factory_var_ =
         CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->generic_Factory_var_.in ()))
@@ -308,7 +308,7 @@ Quoter_Client::init (int argc, char **argv)
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     "internet"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -338,10 +338,10 @@ Quoter_Client::init (int argc, char **argv)
       CORBA::Object_var quoterObject_var =
         this->generic_Factory_var_->create_object (genericFactoryName,
                                                    criteria
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in() TAO_ENV_ARG_PARAMETER);
+      this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp
index f0c7b9680ca..d2dfcd160bd 100644
--- a/TAO/examples/Quoter/server.cpp
+++ b/TAO/examples/Quoter/server.cpp
@@ -62,13 +62,13 @@ Quoter_Server::parse_args (void)
 int
 Quoter_Server::init (int argc,
                     char* argv[]
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   const char *exception_message = "Null Message";
   ACE_TRY
     {
       exception_message = "While ORB Manager init";
-      int result = this->orb_manager_.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int result = this->orb_manager_.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
@@ -91,19 +91,19 @@ Quoter_Server::init (int argc,
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        this->orb_manager_.orb()->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        this->orb_manager_.orb()->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       exception_message = "While narrowing the root pos";
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       exception_message = "While getting 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;
 
       ACE_NEW_RETURN (quoter_Factory_i_ptr_,
@@ -112,7 +112,7 @@ Quoter_Server::init (int argc,
                       0);
 
       exception_message = "While initing the quoter factory";
-      quoter_Factory_i_ptr_->init (TAO_ENV_SINGLE_ARG_PARAMETER);
+      quoter_Factory_i_ptr_->init (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var quoter_Factory_oid =
@@ -121,22 +121,22 @@ Quoter_Server::init (int argc,
       exception_message = "While activating quoter factory";
       root_poa->activate_object_with_id (quoter_Factory_oid.in (),
                                          quoter_Factory_i_ptr_
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get Object reference for first_foo_impl object.
       exception_message = "While quoter_Factor::_this";
-      Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringify the object reference and print it out.
       exception_message = "While object_to_string";
       CORBA::String_var quoter_Factory_ior =
-        this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in () TAO_ENV_ARG_PARAMETER);
+        this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While activating the POA Manager";
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the IOR.
@@ -151,7 +151,7 @@ Quoter_Server::init (int argc,
     }
   ACE_ENDTRY;
 
-  return this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
@@ -159,7 +159,7 @@ Quoter_Server::init (int argc,
 // and Quoter_factory object.
 
 int
-Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+Quoter_Server::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   const char *exception_message = "Null Message";
   ACE_TRY
@@ -167,7 +167,7 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
       CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance()->orb();
 
       CORBA::Object_var naming_obj =
-        orb_ptr->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb_ptr->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -177,7 +177,7 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 
       exception_message = "While narrowing naming context";
       namingContext_var_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name quoterContextName (1);
@@ -186,7 +186,7 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 
       exception_message = "While binding a new context";
       CosNaming::NamingContext_var quoterNameContext =
-        namingContext_var_->bind_new_context (quoterContextName TAO_ENV_ARG_PARAMETER);
+        namingContext_var_->bind_new_context (quoterContextName ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //Register the quoter_factory name with the IDL_quoter Naming
@@ -196,13 +196,13 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
       quoterFactoryContextName[0].id = CORBA::string_dup ("Quoter_Factory");
 
       exception_message = "While using factory _this";
-      Stock::Quoter_Factory_var quoter_factory_var = quoter_Factory_i_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Stock::Quoter_Factory_var quoter_factory_var = quoter_Factory_i_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While binding factory";
       quoterNameContext->bind (quoterFactoryContextName,
                                quoter_factory_var.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -217,13 +217,13 @@ Quoter_Server::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Quoter_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+Quoter_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nQuoter Example: Quoter_Server is running\n"));
 
-  orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -239,12 +239,12 @@ Quoter_Server::~Quoter_Server (void)
       factory_name[0].id = CORBA::string_dup ("IDL_Quoter");
       factory_name[1].id = CORBA::string_dup ("Quoter_Factory");
       if (this->namingContext_var_.ptr () != 0)
-        this->namingContext_var_->unbind (factory_name TAO_ENV_ARG_PARAMETER);
+        this->namingContext_var_->unbind (factory_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       factory_name.length (1);
       if (this->namingContext_var_.ptr () != 0)
-        this->namingContext_var_->unbind (factory_name TAO_ENV_ARG_PARAMETER);
+        this->namingContext_var_->unbind (factory_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -265,13 +265,13 @@ main (int argc, char *argv[])
 
   ACE_TRY_NEW_ENV
     {
-      int result = quoter_server.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int result = quoter_server.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
         return 1;
 
-      quoter_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      quoter_server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index b3b238981b0..fe681790c66 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -52,17 +52,17 @@ public:
   ~Quoter_Server (void);
   // Destructor
 
-  int init (int argc, char *argv[] TAO_ENV_ARG_DECL);
+  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Initialize the Quoter_Server state - parsing arguments and ...
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the server.
 
 private:
   int parse_args (void);
   // Parses the commandline arguments.
 
-  int init_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  int init_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Initializes the name server and registers cubit factory with the
   // name server.
 
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index b24c3cb9360..1d9a3966392 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -67,63 +67,63 @@ Activity::current (void)
 
 int
 Activity::init (int& argc, char *argv []
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   this->orb_ =
     CORBA::ORB_init (argc,
                      argv,
                      ""
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->init_sched ();
 
   CORBA::Object_var object =
     orb_->resolve_initial_references ("RootPOA"
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   root_poa_ =
     PortableServer::POA::_narrow (object.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-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_CHECK_RETURN (-1);
 
   object =
     orb_->resolve_initial_references ("RTORB"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->rt_orb_ =
     RTCORBA::RTORB::_narrow (object.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   object =
     orb_->resolve_initial_references ("RTCurrent"
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   current_ =
     RTCORBA::Current::_narrow (object.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Activity::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+Activity::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Need to check return value for errors.
@@ -134,7 +134,7 @@ Activity::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 
   this->naming_ =
     CosNaming::NamingContextExt::_narrow (naming_obj.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   //@@tmp hack, otherwise crashes on exit!..??
@@ -143,7 +143,7 @@ Activity::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Activity::activate_poa_list (TAO_ENV_SINGLE_ARG_DECL)
+Activity::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL)
 {
   POA_LIST list;
   int count = builder_->poa_list (list);
@@ -151,13 +151,13 @@ Activity::activate_poa_list (TAO_ENV_SINGLE_ARG_DECL)
   for (int i = 0; i < count; ++i)
     {
       list[i]->activate (this->rt_orb_.in(), this->root_poa_.in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Activity::activate_job_list (TAO_ENV_SINGLE_ARG_DECL)
+Activity::activate_job_list (ACE_ENV_SINGLE_ARG_DECL)
 {
   JOB_LIST list;
   int count = builder_->job_list (list);
@@ -173,7 +173,7 @@ Activity::activate_job_list (TAO_ENV_SINGLE_ARG_DECL)
       // find your poa
       PortableServer::POA_var host_poa =
         root_poa_->find_POA (job->poa ().c_str (), 0
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       PortableServer::ServantBase_var servant_var (job);
@@ -182,29 +182,29 @@ Activity::activate_job_list (TAO_ENV_SINGLE_ARG_DECL)
       PortableServer::ObjectId_var id;
 
       id = host_poa->activate_object (job
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Object_var server =
         host_poa->id_to_reference (id.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var ior =
         orb_->object_to_string (server.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       const ACE_CString &job_name = job->name ();
 
       CosNaming::Name_var name =
         this->naming_->to_name (job_name.c_str ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->naming_->rebind (name.in (),
                              server.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -217,7 +217,7 @@ Activity::activate_job_list (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Activity::activate_schedule (TAO_ENV_SINGLE_ARG_DECL)
+Activity::activate_schedule (ACE_ENV_SINGLE_ARG_DECL)
 {
   TASK_LIST list;
   int count = builder_->task_list (list);
@@ -240,10 +240,10 @@ Activity::activate_schedule (TAO_ENV_SINGLE_ARG_DECL)
       name[0].id = CORBA::string_dup (task->job ());
 
       CORBA::Object_var obj =
-                this->naming_->resolve (name TAO_ENV_ARG_PARAMETER);
+                this->naming_->resolve (name ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      Job_var job = Job::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+      Job_var job = Job::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (TAO_debug_level > 0)
@@ -252,12 +252,12 @@ Activity::activate_schedule (TAO_ENV_SINGLE_ARG_DECL)
           // PriorityModelPolicy.
           CORBA::Policy_var policy =
             job->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           RTCORBA::PriorityModelPolicy_var priority_policy =
             RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           if (CORBA::is_nil (priority_policy.in ()))
@@ -266,7 +266,7 @@ Activity::activate_schedule (TAO_ENV_SINGLE_ARG_DECL)
           else
             {
               RTCORBA::PriorityModel priority_model =
-                priority_policy->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+                priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               if (priority_model == RTCORBA::CLIENT_PROPAGATED)
@@ -341,28 +341,28 @@ Activity::check_ifexit (void)
 
 CORBA::Short
 Activity::get_server_priority (CORBA::Object_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)
     return -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);
 }
 
 int
@@ -429,25 +429,25 @@ Activity::init_sched (void)
 }
 
 void
-Activity::run (int argc, char *argv[] TAO_ENV_ARG_DECL)
+Activity::run (int argc, char *argv[] ACE_ENV_ARG_DECL)
 {
-  this->init (argc, argv TAO_ENV_ARG_PARAMETER);
+  this->init (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  if (this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
           return;
   ACE_CHECK;
 
-  this->activate_poa_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->activate_poa_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->activate_job_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->activate_job_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-   this->activate_schedule (TAO_ENV_SINGLE_ARG_PARAMETER);
+   this->activate_schedule (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   orb_->destroy ();
@@ -467,7 +467,7 @@ main (int argc, char *argv[])
 
   ACE_TRY_NEW_ENV
     {
-      ACTIVITY::instance()->run (argc, argv TAO_ENV_ARG_PARAMETER);
+      ACTIVITY::instance()->run (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h
index 04e8827f948..a449a9d016d 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.h
+++ b/TAO/examples/RTCORBA/Activity/Activity.h
@@ -43,14 +43,14 @@ private:
 
 public:
   /// initialize the ORB et. al.
-  int init (int& argc, char *argv [] TAO_ENV_ARG_DECL);
+  int init (int& argc, char *argv [] ACE_ENV_ARG_DECL);
 
 
   /// Activate the tasks, jobs, poas.
-  void run (int argc, char *argv[] TAO_ENV_ARG_DECL);
+  void run (int argc, char *argv[] ACE_ENV_ARG_DECL);
 
   /// Resolve the naming service.
-  int resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
 
   /// = Accessors
   CORBA::ORB_ptr orb (void);
@@ -61,7 +61,7 @@ public:
 
   /// Returns priority if server declared model else -1
   CORBA::Short get_server_priority (CORBA::Object_ptr server
-                                    TAO_ENV_ARG_DECL);
+                                    ACE_ENV_ARG_DECL);
   /// = Callbacks
   /// Task ended notification
   void task_ended (Periodic_Task* ended_task);
@@ -75,13 +75,13 @@ public:
 
   /// = Activation methods.
   /// Activate the POA's
-  void activate_poa_list (TAO_ENV_SINGLE_ARG_DECL);
+  void activate_poa_list (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Activate the task list.
-  void activate_schedule (TAO_ENV_SINGLE_ARG_DECL);
+  void activate_schedule (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Activate the Job's
-  void activate_job_list (TAO_ENV_SINGLE_ARG_DECL);
+  void activate_job_list (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Check if we should process exit
   void check_ifexit (void);
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp
index dd9cb6a1056..69320dc5323 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.cpp
+++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp
@@ -35,7 +35,7 @@ Job_i::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-Job_i::work (CORBA::ULong work TAO_ENV_ARG_DECL_NOT_USED)
+Job_i::work (CORBA::ULong work ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static CORBA::ULong prime_number = 9619;
@@ -52,7 +52,7 @@ Job_i::work (CORBA::ULong work TAO_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-Job_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Job_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACTIVITY::instance()->job_ended (this);
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h
index f6be6e6211c..c8645d2c054 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.h
+++ b/TAO/examples/RTCORBA/Activity/Job_i.h
@@ -37,12 +37,12 @@ class Job_i : public POA_Job, public virtual PortableServer::RefCountServantBase
   const ACE_CString& poa (void);
 
   /// = inteface Job method implementation.
-  virtual void work (CORBA::ULong work TAO_ENV_ARG_DECL)
+  virtual void work (CORBA::ULong work ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
index 68213ab504e..2776d3d4fe4 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
@@ -106,7 +106,7 @@ POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL)
+POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
 {
 
   /*
@@ -133,7 +133,7 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
   priority_model_policy =
     rt_orb->create_priority_model_policy (priority_model_,
                                           server_priority_
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (lanes_.length () != 0)
@@ -155,14 +155,14 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
                                               allow_request_buffering,
                                               max_buffered_requests,
                                               max_request_buffer_size
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
 
       // Create a thread-pool policy.
       lanes_policy =
         rt_orb->create_threadpool_policy (threadpool_id
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
     }
@@ -172,7 +172,7 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
       // Create a bands policy.
       bands_policy =
         rt_orb->create_priority_banded_connection_policy (this->bands_
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -208,13 +208,13 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_
 
   // Get the POA Manager.
   PortableServer::POAManager_var poa_manager =
-    parent_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    parent_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   parent_poa->create_POA (POA_name_.c_str (),
                           poa_manager.in (),
                           poa_policy_list
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h
index b4f95140766..d0cb57630dd 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.h
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h
@@ -35,7 +35,7 @@ class POA_Holder
 
   /// Activate the new POA using the parameters initialized before.
   void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
 
  protected:
   /// = POA create options.
diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
index 16690bc5a9e..49beaae62f5 100644
--- a/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Thread_Task.cpp
@@ -48,10 +48,10 @@ Thread_Task::svc (void)
   // if debugging, dump the priority that we're actually at.
   if (TAO_debug_level > 0)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       // Get the priority of the current thread.
       RTCORBA::Priority prio =
-        ACTIVITY::instance()->current ()->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ACTIVITY::instance()->current ()->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (prio == this->task_priority_)
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 4a9b205d073..a7a8d5c6d63 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -86,25 +86,25 @@ Server<Servant>::test_for_ins (CORBA::String_var ior)
                 this->ins_,
                 ior.in ()));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Object_var table_object =
         orb->resolve_initial_references ("IORTable"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
         IORTable::Table::_narrow (table_object.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
           ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
         }
 
-      adapter->bind (this->ins_, ior.in () TAO_ENV_ARG_PARAMETER);
+      adapter->bind (this->ins_, ior.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -120,14 +120,14 @@ template <class Servant> int
 Server<Servant>::init (const char *servant_name,
                        int argc,
                        char *argv[]
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
                                          "child_poa"
-                                         TAO_ENV_ARG_PARAMETER) == -1)
+                                         ACE_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -171,7 +171,7 @@ Server<Servant>::init (const char *servant_name,
       CORBA::String_var str  =
         this->orb_manager_.activate_under_child_poa (servant_name,
                                                      &this->servant_
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -204,10 +204,10 @@ Server<Servant>::init (const char *servant_name,
 }
 
 template <class Servant>int
-Server<Servant>::run (TAO_ENV_SINGLE_ARG_DECL)
+Server<Servant>::run (ACE_ENV_SINGLE_ARG_DECL)
 {
     // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
                       -1);
@@ -229,20 +229,20 @@ Server<Servant>::register_name (void)
   bindName.length (1);
   bindName[0].id = CORBA::string_dup (name);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   // (re)Bind the object.
   ACE_TRY
     {
-      CORBA::Object_var object = servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Object_var object = servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       naming_server_->rebind (bindName,
                               object.in()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test for INS.
@@ -374,7 +374,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
   this->argv_ = argv;
 
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -382,7 +382,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     0
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -392,7 +392,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
       if(this->ior_ != 0)
         {
           CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER);
+            this->orb_->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
@@ -402,7 +402,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
                                this->ior_),
                               -1);
           this->server_ = INTERFACE_OBJECT::_narrow (server_object.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (this->naming_ == 1)
@@ -411,7 +411,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
           ACE_DEBUG((LM_DEBUG,
                      "Using the Naming Service \n"));
           this->name_ = ACE_const_cast (char *, name);
-          int retv = this->obtain_initial_references (TAO_ENV_SINGLE_ARG_PARAMETER);
+          int retv = this->obtain_initial_references (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (retv ==-1)
             return -1;
@@ -436,7 +436,7 @@ Client<INTERFACE_OBJECT, Var>::init (const char *name,
 
 
 template <class INTERFACE_OBJECT, class Var> int
-Client<INTERFACE_OBJECT, Var>::obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL)
+Client<INTERFACE_OBJECT, Var>::obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL)
 {
 
   ACE_TRY
@@ -455,11 +455,11 @@ Client<INTERFACE_OBJECT, Var>::obtain_initial_references (TAO_ENV_SINGLE_ARG_DEC
       CORBA::string_dup (this->name_);
       CORBA::Object_var obj =
         naming_client_->resolve (server_name
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->server_ = INTERFACE_OBJECT::_narrow (obj.in ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 83c3431521a..fcda75c826f 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -48,7 +48,7 @@ public:
   int init (const char *servant_name,
             int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Server state - parsing arguments and waiting.
   // interface_name is the name used to register the Servant.
 
@@ -56,7 +56,7 @@ public:
   // After calling <init>, this method will register the server with
   // the TAO Naming Service using the servant_name passed to <init>.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
   int test_for_ins (CORBA::String_var ior);
@@ -127,7 +127,7 @@ public:
   void shutdown (int);
   // Fills in the shutdwon flag.
 
-  int obtain_initial_references (TAO_ENV_SINGLE_ARG_DECL);
+  int obtain_initial_references (ACE_ENV_SINGLE_ARG_DECL);
   // Initialize naming service
 
 protected:
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index 02be9d03647..d42cfd37b55 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -51,7 +51,7 @@ AccountManager_i::set_orb_manager (TAO_ORB_Manager *orb_manager)
 Bank::Account_ptr
 AccountManager_i::open (const char *name,
                         CORBA::Float initial_balance
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Account_i *result = 0;
@@ -99,13 +99,13 @@ AccountManager_i::open (const char *name,
 
 void
 AccountManager_i::close (Bank::Account_ptr account
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       CORBA::String_var name =
-        CORBA::string_dup (account->name (TAO_ENV_SINGLE_ARG_PARAMETER));
+        CORBA::string_dup (account->name (ACE_ENV_SINGLE_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -130,7 +130,7 @@ AccountManager_i::close (Bank::Account_ptr account
 }
 
 void
-AccountManager_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+AccountManager_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index d3883ae9036..ba871e1a77f 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -55,17 +55,17 @@ public:
 
   virtual Bank::Account_ptr open (const char *name,
                                   CORBA::Float initial_balance
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the Account interface with the given name from the server.
   // Put the initial balance specified in the new account.
 
   virtual void close (Bank::Account_ptr
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Close the given account.
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
diff --git a/TAO/examples/Simple/bank/Account_i.cpp b/TAO/examples/Simple/bank/Account_i.cpp
index 5e04b7c3b67..2f150afc54a 100644
--- a/TAO/examples/Simple/bank/Account_i.cpp
+++ b/TAO/examples/Simple/bank/Account_i.cpp
@@ -37,7 +37,7 @@ Account_i::orb (CORBA::ORB_ptr o)
 // Return the current balance on the server.
 
 CORBA::Float
-Account_i::balance (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Account_i::balance (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return balance_;
@@ -45,7 +45,7 @@ Account_i::balance (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Account_i::deposit (CORBA::Float deposit
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   balance_ += deposit;
@@ -53,7 +53,7 @@ Account_i::deposit (CORBA::Float deposit
 
 void
 Account_i::withdraw (CORBA::Float withdrawl
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Bank::Account::Overdraft))
 {
@@ -64,7 +64,7 @@ Account_i::withdraw (CORBA::Float withdrawl
 }
 
 char *
-Account_i::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Account_i::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.in ());
@@ -72,7 +72,7 @@ Account_i::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Account_i::name (const char *name
-                 TAO_ENV_ARG_DECL_NOT_USED)
+                 ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->name_ = CORBA::string_dup (name);
diff --git a/TAO/examples/Simple/bank/Account_i.h b/TAO/examples/Simple/bank/Account_i.h
index 6108e950ffc..1190a811220 100644
--- a/TAO/examples/Simple/bank/Account_i.h
+++ b/TAO/examples/Simple/bank/Account_i.h
@@ -42,27 +42,27 @@ public:
   ~Account_i (void);
   // Destructor.
 
-  virtual CORBA::Float balance (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Float balance (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Get the current balance in the account.
 
-  virtual char *name (TAO_ENV_SINGLE_ARG_DECL)
+  virtual char *name (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the name of the <Account> holder.
 
   virtual void name (const char *name
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Set the name of the <Account> holder.
 
   virtual void deposit (CORBA::Float
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deposit money in the account.
 
   virtual void withdraw (CORBA::Float
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Bank::Account::Overdraft));
   // Withdraw money in the account.
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp
index fa5c5974368..420febc8e7f 100644
--- a/TAO/examples/Simple/bank/Bank_Client_i.cpp
+++ b/TAO/examples/Simple/bank/Bank_Client_i.cpp
@@ -32,7 +32,7 @@ Bank_Client_i::run (const char *name,
     {
       this->check_accounts ();
       if (client.shutdown () == 1)
-        client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -52,17 +52,17 @@ Bank_Client_i::check_accounts (void )
     {
       ACE_DEBUG ((LM_DEBUG,
                   "\nTests for account with same name\n"));
-      this->test_for_same_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->test_for_same_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\nTests for account with different names\n"));
-      this->test_for_different_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->test_for_different_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\nTests for overdrafts\n"));
-      this->test_for_overdraft (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->test_for_overdraft (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -78,7 +78,7 @@ Bank_Client_i::check_accounts (void )
 // a same name can be opened
 
 void
-Bank_Client_i::test_for_same_name (TAO_ENV_SINGLE_ARG_DECL)
+Bank_Client_i::test_for_same_name (ACE_ENV_SINGLE_ARG_DECL)
 {
 
   const char *name = "Name";
@@ -86,25 +86,25 @@ Bank_Client_i::test_for_same_name (TAO_ENV_SINGLE_ARG_DECL)
 
   Bank::Account_var acct_id1 = client->open (name,
                                              initial_bal
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
 
   Bank::Account_var acct_id2 = client->open (name,
                                              initial_bal
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
 
   ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *) acct_id2.in ()) != 0);
 
   client->close (acct_id1.in ()
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 
   client->close (acct_id2.in ()
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 }
 
 // This method tests whether an account with different names can be opened
 
 void
-Bank_Client_i::test_for_different_name (TAO_ENV_SINGLE_ARG_DECL)
+Bank_Client_i::test_for_different_name (ACE_ENV_SINGLE_ARG_DECL)
 {
   const char *name1 = "Name1";
   const char *name2 = "Name2";
@@ -113,39 +113,39 @@ Bank_Client_i::test_for_different_name (TAO_ENV_SINGLE_ARG_DECL)
 
   Bank::Account_var acct_id1 = client->open (name1,
                                              initial_bal
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
 
   Bank::Account_var acct_id2 = client->open (name2,
                                              initial_bal
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *)acct_id2.in ()) == 0);
 
   client->close (acct_id1.in ()
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 
   client->close (acct_id2.in ()
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 }
 
 // This method tests the Overdraft exception.
 
 void
-Bank_Client_i::test_for_overdraft (TAO_ENV_SINGLE_ARG_DECL)
+Bank_Client_i::test_for_overdraft (ACE_ENV_SINGLE_ARG_DECL)
 {
 
   CORBA::Float initial_bal = 100.0;
   const char *name = "Name";
-  Bank::Account_var acct_id = client->open (name, initial_bal TAO_ENV_ARG_PARAMETER);
+  Bank::Account_var acct_id = client->open (name, initial_bal ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  acct_id->deposit (100.00 TAO_ENV_ARG_PARAMETER);
+  acct_id->deposit (100.00 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Float bal = acct_id->balance (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Float bal = acct_id->balance (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   acct_id->withdraw (bal + 20);
 
-  client->close (acct_id.in () TAO_ENV_ARG_PARAMETER);
+  client->close (acct_id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.h b/TAO/examples/Simple/bank/Bank_Client_i.h
index b8f398daf6e..7f1a4084c8c 100644
--- a/TAO/examples/Simple/bank/Bank_Client_i.h
+++ b/TAO/examples/Simple/bank/Bank_Client_i.h
@@ -13,9 +13,9 @@
 //    This class implements the  interface calls for RMI.
 //
 // = AUTHOR
-//    
+//
 //   Balachandran Natarajan <bala@cs.wustl.edu>
-//    
+//
 // ============================================================================
 
 #ifndef BANK_CLIENT_I_H
@@ -50,15 +50,15 @@ private:
   int check_accounts (void);
   // Method that calls all the test functions
 
-  void test_for_different_name (TAO_ENV_SINGLE_ARG_DECL);
+  void test_for_different_name (ACE_ENV_SINGLE_ARG_DECL);
   // Tests if accounts opened with different names return a different account
   // reference.
 
-  void test_for_same_name (TAO_ENV_SINGLE_ARG_DECL);
-  // Tests if accounts opened with the same name return the same 
+  void test_for_same_name (ACE_ENV_SINGLE_ARG_DECL);
+  // Tests if accounts opened with the same name return the same
   // object reference.
-  
-  void test_for_overdraft (TAO_ENV_SINGLE_ARG_DECL);
+
+  void test_for_overdraft (ACE_ENV_SINGLE_ARG_DECL);
   // Tests for the Overdraft Exception when the client tries to
   // withdraw more money than the current balance.
 };
diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp
index cc28654f821..48c04693ff4 100644
--- a/TAO/examples/Simple/bank/server.cpp
+++ b/TAO/examples/Simple/bank/server.cpp
@@ -17,11 +17,11 @@ main (int argc, char *argv[])
       if (server.init ("Bank",
                        argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER) == -1)
+                       ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.cpp b/TAO/examples/Simple/chat/Broadcaster_i.cpp
index 9a3a71e375e..c3be95aab27 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.cpp
+++ b/TAO/examples/Simple/chat/Broadcaster_i.cpp
@@ -43,7 +43,7 @@ Broadcaster_i::~Broadcaster_i (void)
 void
 Broadcaster_i::add (Receiver_ptr receiver,
                     const char *nickname
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotAdd
@@ -68,7 +68,7 @@ Broadcaster_i::add (Receiver_ptr receiver,
   ACE_TRY
     {
       this->broadcast (broadcast_string.fast_rep ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -82,7 +82,7 @@ Broadcaster_i::add (Receiver_ptr receiver,
 
 void
 Broadcaster_i::remove (Receiver_ptr receiver
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotRemove
@@ -118,14 +118,14 @@ Broadcaster_i::remove (Receiver_ptr receiver
     + " ****\n";
 
   this->broadcast (broadcast_string.fast_rep ()
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Broadcaster_i::say (Receiver_ptr receiver,
                     const char *text
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
  ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -152,7 +152,7 @@ Broadcaster_i::say (Receiver_ptr receiver,
       ACE_CString broadcast_string ("[" + sender_nickname + "] " + text);
 
       this->broadcast (broadcast_string.fast_rep ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -166,7 +166,7 @@ Broadcaster_i::say (Receiver_ptr receiver,
 
 void
 Broadcaster_i::broadcast (const char *text
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   // Broadcast the message to all registered clients.
 
@@ -177,7 +177,7 @@ Broadcaster_i::broadcast (const char *text
       ACE_TRY
         {
           (*iter).receiver_->message (text
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h
index 9ff5d1debb7..e85a573ea80 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.h
+++ b/TAO/examples/Simple/chat/Broadcaster_i.h
@@ -46,7 +46,7 @@ public:
 
   virtual void add (Receiver_ptr receiver,
                     const char *nickname
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotAdd
@@ -54,7 +54,7 @@ public:
   // Saves receiver references in a list.
 
   virtual void remove (Receiver_ptr receiver
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       Broadcaster::CannotRemove
@@ -63,7 +63,7 @@ public:
 
   virtual void say (Receiver_ptr receiver,
                     const char *text
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -74,7 +74,7 @@ public:
   // The ORB manager.
 
   void broadcast (const char* text
-                  TAO_ENV_ARG_DECL);
+                  ACE_ENV_ARG_DECL);
   // Broadcasts the text to all registered clients.
 
   class Receiver_Data
diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp
index 8bb32f85cf3..5467c3de9ff 100644
--- a/TAO/examples/Simple/chat/Client_i.cpp
+++ b/TAO/examples/Simple/chat/Client_i.cpp
@@ -88,7 +88,7 @@ Client_i::init (int argc, char *argv[])
       this->orb_manager_.init (argc,
                                argv,
                                0
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb = this->orb_manager_.orb ();
@@ -105,7 +105,7 @@ Client_i::init (int argc, char *argv[])
 
       CORBA::Object_var server_object =
         orb->string_to_object (this->ior_
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server_object.in ()))
@@ -115,7 +115,7 @@ Client_i::init (int argc, char *argv[])
                           -1);
 
       this->server_ = Broadcaster::_narrow (server_object.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -151,21 +151,21 @@ Client_i::run (void)
     {
       PortableServer::POAManager_var poa_manager =
         this->orb_manager_.poa_manager ();
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->receiver_var_ =
-        this->receiver_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->receiver_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register ourselves with the server.
       server_->add (this->receiver_var_.in (),
                     this->nickname_
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB.
-      this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -196,7 +196,7 @@ Client_i::handle_input (ACE_HANDLE)
         {
           // Remove ourselves from the server.
           this->server_->remove (this->receiver_var_.in ());
-          this->receiver_i_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->receiver_i_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
           return 0;
@@ -206,7 +206,7 @@ Client_i::handle_input (ACE_HANDLE)
       // the server.
       this->server_->say (this->receiver_var_.in (),
                           buf
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/Simple/chat/Receiver_i.cpp b/TAO/examples/Simple/chat/Receiver_i.cpp
index dbf9e772cb1..ac2ba71f635 100644
--- a/TAO/examples/Simple/chat/Receiver_i.cpp
+++ b/TAO/examples/Simple/chat/Receiver_i.cpp
@@ -29,7 +29,7 @@ Receiver_i::~Receiver_i (void)
 
 void
 Receiver_i::message (const char *msg
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -40,7 +40,7 @@ Receiver_i::message (const char *msg
 }
 
 void
-Receiver_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Receiver_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
  ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
diff --git a/TAO/examples/Simple/chat/Receiver_i.h b/TAO/examples/Simple/chat/Receiver_i.h
index d7cb7648bda..7c3a0767517 100644
--- a/TAO/examples/Simple/chat/Receiver_i.h
+++ b/TAO/examples/Simple/chat/Receiver_i.h
@@ -38,13 +38,13 @@ public:
   // Destructor.
 
   virtual void message (const char *msg
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
   // Receives a message string.
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
diff --git a/TAO/examples/Simple/chat/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp
index fa68b36aa10..19552c68eac 100644
--- a/TAO/examples/Simple/chat/Server_i.cpp
+++ b/TAO/examples/Simple/chat/Server_i.cpp
@@ -60,7 +60,7 @@ Server_i::parse_args (int argc, char *argv[])
 int
 Server_i::init (int argc,
                 char *argv[]
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // Parse the command line options.
   if (this-> parse_args(argc, argv) == -1)
@@ -68,7 +68,7 @@ Server_i::init (int argc,
 
   if (this->orb_manager_.init (argc,
                                argv
-                               TAO_ENV_ARG_PARAMETER) == -1)
+                               ACE_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "orb manager init failed\n"),
@@ -80,7 +80,7 @@ Server_i::init (int argc,
   // Activate the servant.
   CORBA::String_var str =
     this->orb_manager_.activate (&this->broadcaster_i_
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Write the IOR to a file.
@@ -89,13 +89,13 @@ Server_i::init (int argc,
 }
 
 int
-Server_i::run (TAO_ENV_SINGLE_ARG_DECL)
+Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Running chat server...\n"));
 
   // Run the main event loop for the ORB.
-  int ret = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int ret = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (ret == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h
index 48d2155adee..9214585fea1 100644
--- a/TAO/examples/Simple/chat/Server_i.h
+++ b/TAO/examples/Simple/chat/Server_i.h
@@ -40,10 +40,10 @@ public:
 
  int init (int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
  // Initialize the server.
 
- int run (TAO_ENV_SINGLE_ARG_DECL);
+ int run (ACE_ENV_SINGLE_ARG_DECL);
  // Run the ORB.
 
 private:
diff --git a/TAO/examples/Simple/chat/server.cpp b/TAO/examples/Simple/chat/server.cpp
index 09120b3fef0..66937b85a2e 100644
--- a/TAO/examples/Simple/chat/server.cpp
+++ b/TAO/examples/Simple/chat/server.cpp
@@ -27,13 +27,13 @@ main (int argc, char *argv[])
     {
       Server_i server_i;
 
-      int ret = server_i.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int ret = server_i.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "\n error in init.\n"),
                           1);
-      ret = server_i.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ret = server_i.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/examples/Simple/echo/Echo_Client_i.cpp b/TAO/examples/Simple/echo/Echo_Client_i.cpp
index 303b36b08cd..640992d852b 100644
--- a/TAO/examples/Simple/echo/Echo_Client_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_Client_i.cpp
@@ -27,7 +27,7 @@ Echo_Client_i::run (const char *name,
   if (client.init (name,argc, argv) == -1)
     return -1;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -43,7 +43,7 @@ Echo_Client_i::run (const char *name,
             break;
 
           CORBA::String_var s = client->echo_string (buf
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
@@ -52,7 +52,7 @@ Echo_Client_i::run (const char *name,
         }
 
       if (client.shutdown () == 1)
-        client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index dc65c299d82..2635c25d08c 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -34,7 +34,7 @@ Echo_i::orb (CORBA::ORB_ptr o)
 
 Echo::List *
 Echo_i::echo_list (const char *
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Echo::List_var list;
@@ -54,17 +54,17 @@ Echo_i::echo_list (const char *
   // Just do something to get a list of object references.
   list[CORBA::ULong(0)] =
     orb_->resolve_initial_references ("NameService"
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   list[CORBA::ULong(1)] =
     orb_->resolve_initial_references ("NameService"
-                                      TAO_ENV_ARG_PARAMETER);;
+                                      ACE_ENV_ARG_PARAMETER);;
   ACE_CHECK_RETURN (0);
 
   list[CORBA::ULong(2)] =
     orb_->resolve_initial_references ("NameService"
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return list._retn ();
@@ -74,7 +74,7 @@ Echo_i::echo_list (const char *
 
 char *
 Echo_i::echo_string (const char *mesg
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The pointer mesg was NULL, return.
@@ -100,7 +100,7 @@ Echo_i::echo_string (const char *mesg
 // Shutdown the server application.
 
 void
-Echo_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h
index a57fc92d49d..333ec8ebdf7 100644
--- a/TAO/examples/Simple/echo/Echo_i.h
+++ b/TAO/examples/Simple/echo/Echo_i.h
@@ -44,16 +44,16 @@ public:
   // Destructor.
 
   virtual Echo::List *echo_list (const char *mesg
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the mesg string back from the server.
 
   virtual char *echo_string (const char *mesg
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the mesg string back from the server.
 
- virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+ virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
    ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp
index da5802ac71f..61fedc66cc8 100644
--- a/TAO/examples/Simple/echo/server.cpp
+++ b/TAO/examples/Simple/echo/server.cpp
@@ -12,18 +12,18 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tEcho server\n\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       if (server.init ("Echo",
                        argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER) == -1)
+                       ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp
index 87f68f83547..0b9a48f6a69 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp
@@ -75,7 +75,7 @@ Grid_Client_i::run (const char *name,
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -83,7 +83,7 @@ Grid_Client_i::run (const char *name,
 
       Grid_ptr grid = client->make_grid (width_,
                                          height_
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -93,7 +93,7 @@ Grid_Client_i::run (const char *name,
       grid->set (setx_,
                  sety_,
                  value_
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -101,13 +101,13 @@ Grid_Client_i::run (const char *name,
 
       CORBA::Long ret_val = grid->get (setx_,
                                        sety_
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ASSERT (ret_val == value_);
 
       if (client.shutdown () == 1) {
-        client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
       ACE_UNUSED_ARG (ret_val);
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index 56dc3177fe7..75614a73df9 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -17,7 +17,7 @@ Grid_i::Grid_i (void)
 
 Grid_i::Grid_i (CORBA::Short x,
                 CORBA::Short y
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   : width_ (x),
     height_ (y)
 {
@@ -51,7 +51,7 @@ void
 Grid_i::set (CORBA::Short x,
              CORBA::Short y,
              CORBA::Long value
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -69,7 +69,7 @@ Grid_i::set (CORBA::Short x,
 CORBA::Long
 Grid_i::get (CORBA::Short x,
              CORBA::Short y
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Grid::RANGE_ERROR))
 {
@@ -85,14 +85,14 @@ Grid_i::get (CORBA::Short x,
 // Access methods.
 
 CORBA::Short
-Grid_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->width_;
 }
 
 CORBA::Short
-Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_i::height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->height_;
@@ -100,7 +100,7 @@ Grid_i::height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Grid_i::width (CORBA::Short x
-               TAO_ENV_ARG_DECL_NOT_USED)
+               ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->width_ = x;
@@ -108,7 +108,7 @@ Grid_i::width (CORBA::Short x
 
 void
 Grid_i::height (CORBA::Short y
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->height_ = y;
@@ -117,7 +117,7 @@ Grid_i::height (CORBA::Short y
 // Destroy the grid
 
 void
-Grid_i::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_i::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Delete the array.
@@ -143,7 +143,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 // Shutdown.
 
 void
-Grid_Factory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Grid_Factory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -181,7 +181,7 @@ Grid_Factory_i::~Grid_Factory_i (void)
 Grid_ptr
 Grid_Factory_i::make_grid (CORBA::Short width,
                            CORBA::Short height
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Grid_i *grid_ptr = 0;
@@ -200,12 +200,12 @@ Grid_Factory_i::make_grid (CORBA::Short width,
   // This attempts to create a new Grid_i and throws an exception and
   // returns a null value if it fails
   ACE_NEW_THROW_EX (grid_ptr,
-                    Grid_i (width, height TAO_ENV_ARG_PARAMETER),
+                    Grid_i (width, height ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (Grid::_nil ());
 
   // Register the Grid pointer.
-  Grid_ptr gptr = grid_ptr->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  Grid_ptr gptr = grid_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return gptr;
 }
diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h
index 6b307072ec3..b0e59875924 100644
--- a/TAO/examples/Simple/grid/Grid_i.h
+++ b/TAO/examples/Simple/grid/Grid_i.h
@@ -36,46 +36,46 @@ public:
 
   Grid_i (CORBA::Short,
           CORBA::Short
-          TAO_ENV_ARG_DECL_NOT_USED);
+          ACE_ENV_ARG_DECL_NOT_USED);
   // Constructor.
 
   ~Grid_i (void);
   // Destructor
 
-  virtual CORBA::Short width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Short width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the width of the grid
 
-  virtual CORBA::Short height (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Short height (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns the height of the grid
 
   virtual void width (CORBA::Short
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the width of the grid.
 
   virtual void height (CORBA::Short
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets the height of the grid.
 
   virtual void set (CORBA::Short,
                     CORBA::Short,
                     CORBA::Long
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Sets the grid value.
 
   virtual CORBA::Long get (CORBA::Short,
                            CORBA::Short
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Grid::RANGE_ERROR));
   // Gets the grid value.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Destroy the grid.
@@ -108,11 +108,11 @@ public:
 
   virtual Grid_ptr make_grid (CORBA::Short,
                               CORBA::Short
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function creates and returns a <Grid>.
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the server.
 
diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp
index 77592bc8f36..09ad64e8ef3 100644
--- a/TAO/examples/Simple/grid/server.cpp
+++ b/TAO/examples/Simple/grid/server.cpp
@@ -12,18 +12,18 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tGrid server\n\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       if (server.init ("Grid",
                        argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER) == -1)
+                       ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index abed3c23fc4..1796289bad4 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -32,7 +32,7 @@ DLL_ORB::svc (void)
   ACE_TRY_NEW_ENV
     {
       // Run the ORB event loop in its own thread.
-      this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -70,7 +70,7 @@ DLL_ORB::init (int argc, char *argv[])
       // Initialize the ORB.
       this->orb_manager_.init (argc,
                                argv
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if defined (ACE_HAS_THREADS)
@@ -155,7 +155,7 @@ Time_Date_Servant::init (int argc, char *argv[])
                           -1);
 
       CORBA::String_var str = orb->orb_manager_.activate (&servant_
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->ior_output_file_)
diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
index aed8f602682..40bb4c947d8 100644
--- a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
@@ -37,7 +37,7 @@ Time_Date_Client_i::run (const char *name,
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -45,7 +45,7 @@ Time_Date_Client_i::run (const char *name,
 
       // Get the time & date in binary format.
       client_->bin_date (l
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -55,7 +55,7 @@ Time_Date_Client_i::run (const char *name,
       // Get the time & date in string format.
       CORBA::String_var str_var;
       client_->str_date (str_var.out()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp
index cd46a87417e..1b4cc0854e9 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp
@@ -22,7 +22,7 @@ Time_Date_i::~Time_Date_i (void)
 
 void
 Time_Date_i::bin_date (CORBA::Long_out time_date
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   time_date = ACE_OS::time (0);
@@ -32,7 +32,7 @@ Time_Date_i::bin_date (CORBA::Long_out time_date
 
 void
 Time_Date_i::str_date (CORBA::String_out time_date
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const time_t time = ACE_OS::time (0);
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.h b/TAO/examples/Simple/time-date/Time_Date_i.h
index 30475dd5968..1b727cd2cf9 100644
--- a/TAO/examples/Simple/time-date/Time_Date_i.h
+++ b/TAO/examples/Simple/time-date/Time_Date_i.h
@@ -39,13 +39,13 @@ public:
   // Destructor
 
   virtual void bin_date (CORBA::Long_out time_date
-                         TAO_ENV_ARG_DECL_NOT_USED)
+                         ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Obtain the time and date in binary format.
 
   virtual void str_date (CORBA::String_out time_date
-                         TAO_ENV_ARG_DECL_NOT_USED)
+                         ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Obtain the time and date in string format.
 
diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp
index c32a015f0e5..8ec47f9b5c5 100644
--- a/TAO/examples/Simple/time/Time_Client_i.cpp
+++ b/TAO/examples/Simple/time/Time_Client_i.cpp
@@ -30,9 +30,9 @@ Time_Client_i::run (const char *name,
   ACE_TRY
     {
       //Make the RMI.
-      CORBA::Long timedate = client->current_time (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Long timedate = client->current_time (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       // Print out value
       char *ascii_timedate =
         ACE_OS::ctime (ACE_reinterpret_cast (time_t *,
@@ -42,7 +42,7 @@ Time_Client_i::run (const char *name,
                   ascii_timedate));
 
       if (client.shutdown () == 1)
-        client->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+        client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -51,7 +51,7 @@ Time_Client_i::run (const char *name,
       return -1;
     }
   ACE_ENDTRY;
-  
+
 
   return 0;
 }
diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp
index 13c0494ecd2..758603bb25b 100644
--- a/TAO/examples/Simple/time/Time_i.cpp
+++ b/TAO/examples/Simple/time/Time_i.cpp
@@ -35,7 +35,7 @@ Time_i::orb (CORBA::ORB_ptr o)
 // Return the current date/time on the server.
 
 CORBA::Long
-Time_i::current_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Time_i::current_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Long (ACE_OS::time (0));
@@ -43,8 +43,8 @@ Time_i::current_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // Shutdown.
 
-void 
-Time_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
+void
+Time_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h
index caa7cebeada..82514034cca 100644
--- a/TAO/examples/Simple/time/Time_i.h
+++ b/TAO/examples/Simple/time/Time_i.h
@@ -43,11 +43,11 @@ public:
   ~Time_i (void);
   // Destructor
 
-  virtual CORBA::Long current_time (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long current_time (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the current time/date on the server
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Shutdown the server.
diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp
index d0a1720923f..5cdd40fbec2 100644
--- a/TAO/examples/Simple/time/server.cpp
+++ b/TAO/examples/Simple/time/server.cpp
@@ -12,18 +12,18 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tTime and Date server\n\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       if (server.init ("Time",
                        argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER) == -1)
+                       ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
index 1d687e512e9..a8a39910057 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
@@ -72,7 +72,7 @@ DOVE_Supplier::init (void)
     // Connect to the RootPOA.
     CORBA::Object_var poaObject_var =
       TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA"
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (CORBA::is_nil (poaObject_var.in ()))
@@ -81,18 +81,18 @@ DOVE_Supplier::init (void)
                         -1);
 
     this->root_POA_var_ =
-      PortableServer::POA::_narrow (poaObject_var.in () TAO_ENV_ARG_PARAMETER);
+      PortableServer::POA::_narrow (poaObject_var.in () ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     this->poa_manager_ =
-       root_POA_var_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+       root_POA_var_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // Get the Naming Service object reference.
     CORBA::Object_var namingObj_var =
       TAO_ORB_Core_instance()->orb()->resolve_initial_references (
           "NameService"
-          TAO_ENV_ARG_PARAMETER);
+          ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (CORBA::is_nil (namingObj_var.in ()))
@@ -102,7 +102,7 @@ DOVE_Supplier::init (void)
 
     this->namingContext_var_ =
       CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
   }
   ACE_CATCHANY
@@ -273,7 +273,7 @@ DOVE_Supplier::notify (CORBA::Any &message)
 
     // Now we invoke a RPC
     this->current_connection_params_->proxyPushConsumer_var_->push (events
-                                                                    TAO_ENV_ARG_PARAMETER);
+                                                                    ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
   }
   ACE_CATCHANY
@@ -343,12 +343,12 @@ DOVE_Supplier::get_Scheduler ()
 
       CORBA::Object_var objref =
           namingContext_var_->resolve (schedule_name
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->current_connection_params_->scheduler_var_ =
         RtecScheduler::Scheduler::_narrow(objref.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -378,12 +378,12 @@ DOVE_Supplier::get_EventChannel ()
       CORBA::string_dup (this->current_connection_params_->es_name_);
 
     CORBA::Object_var eventServiceObj_var =
-      this->namingContext_var_->resolve (channel_name TAO_ENV_ARG_PARAMETER);
+      this->namingContext_var_->resolve (channel_name ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     this->current_connection_params_->eventChannel_var_ =
        RtecEventChannelAdmin::EventChannel::_narrow (eventServiceObj_var.in()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (CORBA::is_nil (this->current_connection_params_->eventChannel_var_.in()))
@@ -413,7 +413,7 @@ DOVE_Supplier::connect_Supplier ()
       this->current_connection_params_->
         scheduler_var_->
           create (this->current_connection_params_->pod_rt_info_.entry_point
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
 
     ACE_TRY_CHECK;
 
@@ -431,7 +431,7 @@ DOVE_Supplier::connect_Supplier ()
            this->current_connection_params_->pod_rt_info_.threads,
            ACE_static_cast (RtecScheduler::Info_Type_t,
                             this->current_connection_params_->pod_rt_info_.info_type)
-           TAO_ENV_ARG_PARAMETER);
+           ACE_ENV_ARG_PARAMETER);
 
     ACE_TRY_CHECK;
 
@@ -455,17 +455,17 @@ DOVE_Supplier::connect_Supplier ()
 
     // = Connect as a supplier.
     this->current_connection_params_->supplierAdmin_var_ =
-      this->current_connection_params_->eventChannel_var_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->current_connection_params_->eventChannel_var_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     this->current_connection_params_->proxyPushConsumer_var_ =
-      this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->current_connection_params_->supplierAdmin_var_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // In calling _this we get back an object reference and register
     // the servant with the POA.
     RtecEventComm::PushSupplier_var pushSupplier_var =
-      this->internal_DOVE_Supplier_ptr_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->internal_DOVE_Supplier_ptr_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // Connect the supplier to the proxy consumer.
@@ -473,7 +473,7 @@ DOVE_Supplier::connect_Supplier ()
     this->current_connection_params_->
       proxyPushConsumer_var_->connect_push_supplier (pushSupplier_var.in (),
                                                      qos
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
   }
   ACE_CATCHANY
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
index 259919ec604..fc6b9de6843 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h
@@ -45,9 +45,9 @@ public:
   int init (void);
   // Initialize the ORB and the connection to the Name Service
 
-  int connect (const char * MIB_name = 0, 
+  int connect (const char * MIB_name = 0,
                const char* es_name = 0,
-               const char * ss_name = 0, 
+               const char * ss_name = 0,
                ACE_Scheduler_Factory::POD_RT_Info * pod_rt_info = 0);
   // Connect to the event service.
 
@@ -77,7 +77,7 @@ private:
 
   public:
 
-    virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
     }
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index 8e753eaf732..6f0f6f22c35 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -99,7 +99,7 @@ DualEC_Supplier::DualEC_Supplier (int argc, char** argv)
       this->channel_lo_name_[0].id = CORBA::string_dup ("DUAL_EC_LO");
       ACE_TRY_CHECK;
 
-      this->terminator_ = terminator_impl_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->terminator_ = terminator_impl_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -151,15 +151,15 @@ DualEC_Supplier::~DualEC_Supplier ()
       this->weapons_Supplier_.disconnect ();
 
       // Unbind the schedulers from the NS.
-      this->naming_context_->unbind (this->sched_hi_name_ TAO_ENV_ARG_PARAMETER);
+      this->naming_context_->unbind (this->sched_hi_name_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      this->naming_context_->unbind (this->sched_lo_name_ TAO_ENV_ARG_PARAMETER);
+      this->naming_context_->unbind (this->sched_lo_name_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Unbind the ECs from the NS.
-      this->naming_context_->unbind (this->channel_hi_name_ TAO_ENV_ARG_PARAMETER);
+      this->naming_context_->unbind (this->channel_hi_name_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      this->naming_context_->unbind (this->channel_lo_name_ TAO_ENV_ARG_PARAMETER);
+      this->naming_context_->unbind (this->channel_lo_name_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -182,7 +182,7 @@ DualEC_Supplier::init ()
   {
     // Connect to the RootPOA.
     CORBA::Object_var poaObject_var =
-      TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+      TAO_ORB_Core_instance()->orb()->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (CORBA::is_nil (poaObject_var.in ()))
@@ -191,21 +191,21 @@ DualEC_Supplier::init ()
                         1);
 
     this->root_POA_var_ =
-      PortableServer::POA::_narrow (poaObject_var.in () TAO_ENV_ARG_PARAMETER);
+      PortableServer::POA::_narrow (poaObject_var.in () ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     this->poa_manager_ =
-       root_POA_var_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+       root_POA_var_->the_POAManager (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;
 
     // Get the Naming Service object reference.
     CORBA::Object_var namingObj_var =
       TAO_ORB_Core_instance()->orb()->resolve_initial_references (
           "NameService"
-          TAO_ENV_ARG_PARAMETER);
+          ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (CORBA::is_nil (namingObj_var.in ()))
@@ -215,7 +215,7 @@ DualEC_Supplier::init ()
 
     this->naming_context_ =
       CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
   }
@@ -299,7 +299,7 @@ DualEC_Supplier::init ()
 // Private class that implements a termination servant.
 
 void
-DualEC_Supplier::Terminator::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+DualEC_Supplier::Terminator::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
@@ -497,24 +497,24 @@ DualEC_Supplier::create_schedulers (void)
                           ACE_Config_Scheduler,
                           -1);
 
-          this->sched_hi_ = sched_hi_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->sched_hi_ = sched_hi_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_NEW_RETURN (this->sched_lo_impl_,
                           ACE_Config_Scheduler,
                           -1);
 
-          this->sched_lo_ = sched_lo_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->sched_lo_ = sched_lo_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Register Scheduling Service Implementations with Naming Service
 
           this->naming_context_->bind (this ->sched_hi_name_,
-                                       this->sched_hi_.in () TAO_ENV_ARG_PARAMETER);
+                                       this->sched_hi_.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           naming_context_->bind (this->sched_lo_name_,
-                                 this->sched_lo_.in () TAO_ENV_ARG_PARAMETER);
+                                 this->sched_lo_.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Register high and low priority rt_infos with the
@@ -523,7 +523,7 @@ DualEC_Supplier::create_schedulers (void)
           this->sched_hi_rt_info_hi_ =
             this->sched_hi_->
               create (this->rt_info_dummy_hi_.entry_point
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -541,14 +541,14 @@ DualEC_Supplier::create_schedulers (void)
                  this->rt_info_dummy_hi_.threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
                                   this->rt_info_dummy_hi_.info_type)
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
           this->sched_hi_rt_info_lo_ =
             this->sched_hi_->
               create (this->rt_info_dummy_lo_.entry_point
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -566,14 +566,14 @@ DualEC_Supplier::create_schedulers (void)
                  this->rt_info_dummy_lo_.threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
                                   this->rt_info_dummy_lo_.info_type)
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
           this->sched_hi_rt_info_hi_ =
             this->sched_lo_->
               create (this->rt_info_dummy_hi_.entry_point
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -591,14 +591,14 @@ DualEC_Supplier::create_schedulers (void)
                  this->rt_info_dummy_hi_.threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
                                   this->rt_info_dummy_hi_.info_type)
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
           this->sched_hi_rt_info_lo_ =
             this->sched_lo_->
               create (this->rt_info_dummy_lo_.entry_point
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -616,7 +616,7 @@ DualEC_Supplier::create_schedulers (void)
                  this->rt_info_dummy_lo_.threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
                                   this->rt_info_dummy_lo_.info_type)
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -651,7 +651,7 @@ DualEC_Supplier::create_event_channels (void)
                                         &default_module_factory_),
                       -1);
 
-      this->ec_hi_ = ec_hi_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->ec_hi_ = ec_hi_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_NEW_RETURN (this->ec_lo_impl_,
@@ -661,17 +661,17 @@ DualEC_Supplier::create_event_channels (void)
                                         &default_module_factory_),
                       -1);
 
-      this->ec_lo_ = ec_lo_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->ec_lo_ = ec_lo_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register Event Service Implementations with Naming Service
 
       naming_context_->bind (this->channel_hi_name_,
-                             this->ec_hi_.in () TAO_ENV_ARG_PARAMETER);
+                             this->ec_hi_.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       naming_context_->bind (this->channel_lo_name_,
-                                     this->ec_lo_.in () TAO_ENV_ARG_PARAMETER);
+                                     this->ec_lo_.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
   }
@@ -711,7 +711,7 @@ DualEC_Supplier::compute_schedules (void)
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out_hi, configs_out_hi, anomalies_out_hi TAO_ENV_ARG_PARAMETER);
+             infos_out_hi, configs_out_hi, anomalies_out_hi ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           RtecScheduler::RT_Info_Set_out infos_out_lo (this->infos_lo_);
@@ -722,7 +722,7 @@ DualEC_Supplier::compute_schedules (void)
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out_lo, configs_out_lo, anomalies_out_lo TAO_ENV_ARG_PARAMETER);
+             infos_out_lo, configs_out_lo, anomalies_out_lo ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 #else  /* ! __SUNPRO_CC */
@@ -733,7 +733,7 @@ DualEC_Supplier::compute_schedules (void)
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
              this->infos_hi_.out (), this->configs_hi_.out (),
-             this->anomalies_hi_.out () TAO_ENV_ARG_PARAMETER);
+             this->anomalies_hi_.out () ACE_ENV_ARG_PARAMETER);
            ACE_TRY_CHECK;
 
           sched_lo_->compute_scheduling
@@ -742,7 +742,7 @@ DualEC_Supplier::compute_schedules (void)
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
              this->infos_lo_.out (), this->configs_lo_.out (),
-             this->anomalies_lo_.out () TAO_ENV_ARG_PARAMETER);
+             this->anomalies_lo_.out () ACE_ENV_ARG_PARAMETER);
            ACE_TRY_CHECK;
 
 #endif /* ! __SUNPRO_CC */
@@ -1153,7 +1153,7 @@ main (int argc, char *argv [])
 
       orb_Manager.init (argc,
                         argv
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
index 52f1f9c35ee..cb525dc896f 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h
@@ -85,7 +85,7 @@ private:
     // = DESCRIPTION
     // Private class that implements a termination servant.
   {
-    void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+    void shutdown (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   };
 
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index c279d60d2a4..c0a076e6792 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -59,7 +59,7 @@ int
 Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
                               const char *my_name)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Get a Scheduler.
@@ -68,7 +68,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
         ACE_Scheduler_Factory::server ();
 
       // Define Real-time information.
-      rt_info_ = server->create (my_name TAO_ENV_ARG_PARAMETER);
+      rt_info_ = server->create (my_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server->set (rt_info_,
@@ -81,7 +81,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
                    ORBSVCS_Time::zero (),
                    1,
                    RtecScheduler::OPERATION
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -100,14 +100,14 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
       // = Connect as a consumer.
 
       this->consumer_admin_ =
-        channel_admin_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        channel_admin_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain a pointer to a push supplier.  "suppliers" is
       // inherited from a base class.
 
       this->suppliers_ =
-        consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+        consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The _this function returns an object pointer. This is needed
@@ -115,12 +115,12 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
       // CORBA::Object.
 
       RtecEventComm::PushConsumer_var objref =
-        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->suppliers_->connect_push_consumer (objref.in (),
                                                dependencies.get_ConsumerQOS ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR, se)
@@ -141,7 +141,7 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
 }
 
 void
-Demo_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Demo_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -150,7 +150,7 @@ Demo_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Demo_Consumer::push (const RtecEventComm::EventSet &events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -177,18 +177,18 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events
             {
               // Use a temporary int to avoid overload ambiguities with
               // the enum.
-              int kind = events[i].data.any_value.type()->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+              int kind = events[i].data.any_value.type()->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              cout << "ID: " << events[i].data.any_value.type()->id(TAO_ENV_SINGLE_ARG_PARAMETER) << endl;
+              cout << "ID: " << events[i].data.any_value.type()->id(ACE_ENV_SINGLE_ARG_PARAMETER) << endl;
               ACE_TRY_CHECK;
-              cout << "Name: " << events[i].data.any_value.type()->name(TAO_ENV_SINGLE_ARG_PARAMETER) << endl;
+              cout << "Name: " << events[i].data.any_value.type()->name(ACE_ENV_SINGLE_ARG_PARAMETER) << endl;
               ACE_TRY_CHECK;
-              cout << "member_count: " << events[i].data.any_value.type()->member_count(TAO_ENV_SINGLE_ARG_PARAMETER) << endl;
+              cout << "member_count: " << events[i].data.any_value.type()->member_count(ACE_ENV_SINGLE_ARG_PARAMETER) << endl;
               ACE_TRY_CHECK;
               cout << "TCKind: " << kind << endl;
 
-              int ret = _tc_Navigation->equal (events[i].data.any_value.type() TAO_ENV_ARG_PARAMETER);
+              int ret = _tc_Navigation->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               if (ret)
                 {
@@ -196,7 +196,7 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events
                   cout << "Found a Navigation struct in the any: pos_lat = " << navigation_->position_latitude << endl;
                 }
               else {
-                ret = (_tc_Weapons->equal (events[i].data.any_value.type() TAO_ENV_ARG_PARAMETER));
+                ret = (_tc_Weapons->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER));
                 ACE_TRY_CHECK;
                 if (ret) {
                   Weapons *weapons_ = (Weapons*) events[i].data.any_value.value ();
@@ -221,7 +221,7 @@ Demo_Consumer::shutdown (void)
     {
       // Disconnect from the push supplier.
 
-      this->suppliers_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->suppliers_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "@@ we should shutdown here!!!\n"));
@@ -286,12 +286,12 @@ main (int argc, char *argv [])
       // Initialize ORB.
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA"
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -300,16 +300,16 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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::Object_var naming_obj =
         orb->resolve_initial_references ("NameService"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -319,7 +319,7 @@ main (int argc, char *argv [])
 
       CosNaming::NamingContext_var naming_context =
         CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::use_config (naming_context.in ());
@@ -335,11 +335,11 @@ main (int argc, char *argv [])
 
       CORBA::Object_var ec_obj =
         naming_context->resolve (channel_name
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in() TAO_ENV_ARG_PARAMETER);
+        RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ec.ptr() == 0)
@@ -360,19 +360,19 @@ main (int argc, char *argv [])
                            "Someone was feeling introverted.\n"),
                           -1);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       delete demo_consumer;
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
index bf2ace6ab79..0e0d931a3d9 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.h
@@ -46,13 +46,13 @@ public:
   // supplier.  Stores <my_name> for printing out messages.  Returns 0
   // on success, -1 on failure.
 
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The channel is disconnecting.
 
   // = (not protected to allow short-circuiting) protected:
   virtual void push (const RtecEventComm::EventSet &events
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // If the <events>[0] is a notification, prints out the data from
   // the supplier.  If its a shutdown message, the consumer
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
index 9944b1012ff..1d42b0c1598 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
@@ -447,7 +447,7 @@ main (int argc, char *argv [])
 
       orb_Manager.init (argc,
                         argv
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index d6582abfbbe..6bf504cefdb 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -493,7 +493,7 @@ main (int argc, char *argv [])
 
       orb_Manager.init (argc,
                         argv
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp
index e8dbba5999a..b811e0b9aca 100644
--- a/TAO/examples/TypeCode_Creation/main.cpp
+++ b/TAO/examples/TypeCode_Creation/main.cpp
@@ -13,13 +13,13 @@ int main(int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             ""
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::TypeCode_var iface_tc =
         orb->create_interface_tc (CORBA::string_dup ("IDL:iface:1.0"),
                                   CORBA::string_dup ("iface")
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ULong length = 5;
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
                                                           "foo",
                                                           CORBA::_tc_short,
                                                           foo_members
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       length = 2;
@@ -95,12 +95,12 @@ int main(int argc, char *argv[])
       CORBA::TypeCode_var bar_tc = orb->create_struct_tc ("IDL:bar:1.0",
                                                           "bar",
                                                           bar_members
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check for equality with the typecode created by the IDL compiler.
       CORBA::Boolean eq = bar_tc->equal (_tc_bar
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!eq)
diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp
index 20e1d865e99..3fcc3f4abff 100644
--- a/TAO/examples/mfc/client.cpp
+++ b/TAO/examples/mfc/client.cpp
@@ -15,19 +15,19 @@ main (int argc, char *argv[])
       CORBA::ORB_var the_orb = CORBA::ORB_init (argc,
                                                 argv,
                                                 orb_name
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var orb_obj =
-        the_orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        the_orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var the_root_poa =
-        PortableServer::POA::_narrow (orb_obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (orb_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var the_poa_manager =
-        the_root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        the_root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Retrieving the servants IOR from a file
@@ -37,13 +37,13 @@ main (int argc, char *argv[])
         "file://ior.txt";
 
       orb_obj =
-        the_orb->string_to_object (filename TAO_ENV_ARG_PARAMETER);
+        the_orb->string_to_object (filename ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       cout << "Narrowing the IOR!" << endl;
 
       W32_Test_Interface_var mycall =
-        W32_Test_Interface::_narrow (orb_obj.in () TAO_ENV_ARG_PARAMETER);
+        W32_Test_Interface::_narrow (orb_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       cout << "Sending the Request!" << endl;
diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp
index 961d501be4d..e9ff39967c4 100644
--- a/TAO/examples/mfc/server.cpp
+++ b/TAO/examples/mfc/server.cpp
@@ -50,22 +50,22 @@ spawn_my_orb_thread (void *)
         CORBA::ORB_init (__argc,
                          __argv,
                          orb_name
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var orb_obj =
-        the_orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        the_orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var the_root_poa =
-        PortableServer::POA::_narrow (orb_obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (orb_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var the_poa_manager =
-        the_root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        the_root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      the_poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      the_poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initializing the NamingService
@@ -75,7 +75,7 @@ spawn_my_orb_thread (void *)
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        the_orb->object_to_string (orb_servant.in () TAO_ENV_ARG_PARAMETER);
+        the_orb->object_to_string (orb_servant.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       FILE *output_file = ACE_OS::fopen ("ior.txt",
@@ -85,7 +85,7 @@ spawn_my_orb_thread (void *)
                        ior.in ());
       ACE_OS::fclose (output_file);
 
-      the_orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      the_orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -125,11 +125,11 @@ CServerApp::~CServerApp()
         CORBA::ORB_init (argc,
                          argv,
                          orb_name
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       the_shutdown_orb->shutdown (0, // wait_for_completion
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Thread_Manager::instance ()->wait ();
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
index 63dbdbb1b89..89c26c4bd66 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
@@ -36,11 +36,11 @@ Concurrency_Service::Concurrency_Service (void)
 
 Concurrency_Service::Concurrency_Service (int argc,
                                           char** argv
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Concurrency_Service::Concurrency_Service (...)\n"));
-  this->init (argc, argv TAO_ENV_ARG_PARAMETER);
+  this->init (argc, argv ACE_ENV_ARG_PARAMETER);
 }
 
 int
@@ -86,14 +86,14 @@ Concurrency_Service::parse_args (void)
 int
 Concurrency_Service::init (int argc,
                            char **argv
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Concurrency_Service::init\n"));
   if (this->orb_manager_.init_child_poa (argc,
                                         argv,
                                         "child_poa"
-                                        TAO_ENV_ARG_PARAMETER) == -1)
+                                        ACE_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -109,7 +109,7 @@ Concurrency_Service::init (int argc,
                      -1);
   CORBA::String_var str =
     this->orb_manager_.activate (this->my_concurrency_server_.GetLockSetFactory ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
               str.in ()));
@@ -121,13 +121,13 @@ Concurrency_Service::init (int argc,
     }
 
   if (this->use_naming_service_)
-    return this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   return 0;
 }
 
 int
-Concurrency_Service::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+Concurrency_Service::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "Concurrency_Service::init_naming_service (...)\n"));
   CORBA::ORB_var orb;
@@ -141,7 +141,7 @@ Concurrency_Service::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
   if (result == -1)
     return result;
   lockset_factory_ =
-    this->my_concurrency_server_.GetLockSetFactory ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->my_concurrency_server_.GetLockSetFactory ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CosNaming::Name concurrency_context_name (1);
@@ -150,7 +150,7 @@ Concurrency_Service::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 
   this->concurrency_context_ =
     this->my_name_server_->bind_new_context (concurrency_context_name
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CosNaming::Name lockset_name (1);
@@ -158,7 +158,7 @@ Concurrency_Service::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
   lockset_name[0].id = CORBA::string_dup ("LockSetFactory");
   this->concurrency_context_->bind (lockset_name,
                                    lockset_factory_.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   return 0;
 }
@@ -166,12 +166,12 @@ Concurrency_Service::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 // Run the ORB event loop.
 
 int
-Concurrency_Service::run (TAO_ENV_SINGLE_ARG_DECL)
+Concurrency_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Concurrency_Service::run (...)\n"));
 
-  int retval = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int retval = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (retval == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -196,16 +196,16 @@ main (int argc, char ** argv)
   ACE_DEBUG ((LM_DEBUG,
               "\n \t Concurrency Service:SERVER \n \n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int r = concurrency_service.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int r = concurrency_service.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
         return 1;
 
-      concurrency_service.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      concurrency_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
index 2868e7fa379..05b037b7cd8 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
@@ -47,7 +47,7 @@ public:
 
   Concurrency_Service (int argc,
                        char **argv
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // Constructor taking the command-line arguments.
 
   ~Concurrency_Service (void);
@@ -55,17 +55,17 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Concurrency Service with the arguments.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the Concurrency_Service.
 
 private:
   int parse_args (void);
   // Parses the commandline arguments.
 
-  int init_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  int init_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Initialize the name server and register the concurency server
   // factory with it. Maybe later it will be convinient to register
   // the individual lock sets with the naming service. At present the
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index 8c91a5c6e69..57f220b3075 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -13,12 +13,12 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Intialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Call TAO_CEC_Event_Loader::init (argc, argv) from here.
@@ -41,11 +41,11 @@ main (int argc, char* argv[])
       //    to 1 by default or something like that...
       //    Don't worry about this change yet... Let's get all the changes
       //    in and then we can fix the EC shutdown problem...
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the ORB
-      orb->destroy(TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
index 90f3d797b03..ed59ff96747 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
@@ -18,11 +18,11 @@ main (int argc, char *argv[])
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil(naming_obj.in ()))
@@ -31,7 +31,7 @@ main (int argc, char *argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *name = 0;
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          infos_out, configs_out, anomalies_out
-         TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
+         ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #else  /* ! __SUNPRO_CC */
       ACE_Scheduler_Factory::server ()->compute_scheduling
         (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          infos.out (), configs.out (), anomalies.out ()
-         TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
+         ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #endif /* ! __SUNPRO_CC */
 
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 67c15f96355..36f0f90e886 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -55,7 +55,7 @@ Event_Service::run (int argc, char* argv[])
     {
       // Initialize ORB.
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv) == -1)
@@ -63,7 +63,7 @@ Event_Service::run (int argc, char* argv[])
 
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references("RootPOA"
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -71,18 +71,18 @@ Event_Service::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -90,7 +90,7 @@ Event_Service::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecScheduler::Scheduler_var scheduler;
@@ -112,22 +112,22 @@ Event_Service::run (int argc, char* argv[])
                               ACE_Config_Scheduler,
                               1);
 
-              scheduler = this->sched_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+              scheduler = this->sched_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Register the servant with the Naming Context....
               naming_context->rebind (schedule_name, scheduler.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             {
               CORBA::Object_var tmp =
-                naming_context->resolve (schedule_name TAO_ENV_ARG_PARAMETER);
+                naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               scheduler = RtecScheduler::Scheduler::_narrow (tmp.in ()
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -143,7 +143,7 @@ Event_Service::run (int argc, char* argv[])
                             TAO_EC_Event_Channel (attr),
                             1);
             this->ec_impl_ = ec;
-            ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+            ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
           break;
@@ -182,11 +182,11 @@ Event_Service::run (int argc, char* argv[])
       // forward all the requests to the underlying EC
       // implementation.
       RtecEventChannelAdmin::EventChannel_var ec =
-        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        this->orb_->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->ior_file_name_ != 0)
@@ -219,19 +219,19 @@ Event_Service::run (int argc, char* argv[])
       CosNaming::Name channel_name (1);
       channel_name.length (1);
       channel_name[0].id = CORBA::string_dup (this->service_name_);
-      naming_context->rebind (channel_name, ec.in () TAO_ENV_ARG_PARAMETER);
+      naming_context->rebind (channel_name, ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "%s; running event service\n", __FILE__));
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      naming_context->unbind (channel_name TAO_ENV_ARG_PARAMETER);
+      naming_context->unbind (channel_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (scheduler.in ()))
         {
-          naming_context->unbind (schedule_name TAO_ENV_ARG_PARAMETER);
+          naming_context->unbind (schedule_name ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -337,48 +337,48 @@ Event_Service::parse_args (int argc, char *argv [])
 
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-Event_Service::for_consumers (TAO_ENV_SINGLE_ARG_DECL)
+Event_Service::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->ec_impl_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->ec_impl_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-Event_Service::for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+Event_Service::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->ec_impl_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->ec_impl_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Event_Service::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Event_Service::destroy (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->ec_impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->orb_->shutdown ();
 }
 
 RtecEventChannelAdmin::Observer_Handle
 Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  return this->ec_impl_->append_observer (observer TAO_ENV_ARG_PARAMETER);
+  return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER);
 }
 
 void
 Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  this->ec_impl_->remove_observer (handle TAO_ENV_ARG_PARAMETER);
+  this->ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
index dd32fc469b1..c1846d29425 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.h
+++ b/TAO/orbsvcs/Event_Service/Event_Service.h
@@ -42,22 +42,22 @@ public:
 
   // = The RtecEventChannelAdmin::Event_Channel methods
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual RtecEventChannelAdmin::Observer_Handle
     append_observer (RtecEventChannelAdmin::Observer_ptr observer
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
diff --git a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp
index 227549eb3b9..e572cb5d162 100644
--- a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.cpp
@@ -23,7 +23,7 @@ TAO_AbstractInterfaceDef_i::~TAO_AbstractInterfaceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_AbstractInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_AbstractInterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_AbstractInterface;
@@ -31,18 +31,18 @@ TAO_AbstractInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Boolean
 TAO_AbstractInterfaceDef_i::is_a (const char *interface_id
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   return this->is_a_i (interface_id
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/AbstractBase:1.0") == 0)
@@ -51,6 +51,6 @@ TAO_AbstractInterfaceDef_i::is_a_i (const char *interface_id
     }
 
   return this->TAO_InterfaceDef_i::is_a_i (interface_id
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h
index 7bcb10f68c4..c70230831ec 100644
--- a/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/AbstractInterfaceDef_i.h
@@ -50,20 +50,20 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Boolean is_a (
       const char *interface_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *interface_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp b/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp
index 555df7e18e5..9188ace6df3 100644
--- a/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/AliasDef_i.cpp
@@ -22,23 +22,23 @@ TAO_AliasDef_i::~TAO_AliasDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_AliasDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_AliasDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Alias;
 }
 
 CORBA::TypeCode_ptr
-TAO_AliasDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AliasDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_AliasDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AliasDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -64,31 +64,31 @@ TAO_AliasDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
 
   TAO_IDLType_i *impl =
     this->repo_->servant_factory ()->create_idltype (ot_key
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  CORBA::TypeCode_var tc = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_alias_tc (id.c_str (),
                                                       name.c_str (),
                                                       tc.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_AliasDef_i::original_type_def (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AliasDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_AliasDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AliasDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString original_type;
@@ -113,32 +113,32 @@ TAO_AliasDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
                                                     original_type.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
   return CORBA_IDLType::_narrow (obj.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_AliasDef_i::original_type_def (CORBA_IDLType_ptr original_type_def
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->original_type_def_i (original_type_def
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_AliasDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (original_type_def
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var original_type =
diff --git a/TAO/orbsvcs/IFR_Service/AliasDef_i.h b/TAO/orbsvcs/IFR_Service/AliasDef_i.h
index e2d6535f5c1..e28db7455e2 100644
--- a/TAO/orbsvcs/IFR_Service/AliasDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/AliasDef_i.h
@@ -51,42 +51,42 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_IDLType_ptr original_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr original_type_def_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void original_type_def (
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void original_type_def_i (
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp b/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp
index 95dbe76c837..eb2709dbf92 100644
--- a/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ArrayDef_i.cpp
@@ -20,27 +20,27 @@ TAO_ArrayDef_i::~TAO_ArrayDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ArrayDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ArrayDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Array;
 }
 
 void
-TAO_ArrayDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_ArrayDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only if it is (w)string, fixed, array or sequence.
-  this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TString name;
@@ -54,43 +54,43 @@ TAO_ArrayDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_ArrayDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_ArrayDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var element_typecode =
-    this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  CORBA::ULong length = this->length_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong length = this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_array_tc (
                                          length,
                                          element_typecode.in ()
-                                         TAO_ENV_ARG_PARAMETER
+                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
 CORBA::ULong
-TAO_ArrayDef_i::length (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::length (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->length_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::ULong
-TAO_ArrayDef_i::length_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ArrayDef_i::length_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int length = 0;
@@ -103,18 +103,18 @@ TAO_ArrayDef_i::length_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_ArrayDef_i::length (CORBA::ULong length
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->length_i (length
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ArrayDef_i::length_i (CORBA::ULong length
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -123,16 +123,16 @@ TAO_ArrayDef_i::length_i (CORBA::ULong length
 }
 
 CORBA::TypeCode_ptr
-TAO_ArrayDef_i::element_type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::element_type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_ArrayDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -148,25 +148,25 @@ TAO_ArrayDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL)
 
   TAO_IDLType_i *impl =
     this->repo_->servant_factory ()->create_idltype (element_key
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_ArrayDef_i::element_type_def (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::element_type_def (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->element_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->element_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_ArrayDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ArrayDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -191,35 +191,35 @@ TAO_ArrayDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
                                                     element_path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
   return CORBA_IDLType::_narrow (obj.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ArrayDef_i::element_type_def (CORBA_IDLType_ptr element_type_def
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->element_type_def_i (element_type_def
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ArrayDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (element_type_def
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var new_element_path =
@@ -232,7 +232,7 @@ TAO_ArrayDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def
 
 void
 TAO_ArrayDef_i::destroy_element_type (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -267,12 +267,12 @@ TAO_ArrayDef_i::destroy_element_type (
     {
       TAO_IDLType_i *impl =
         this->repo_->servant_factory ()->create_idltype (element_key
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       auto_ptr<TAO_IDLType_i> safety (impl);
 
-      impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       break;
     }
diff --git a/TAO/orbsvcs/IFR_Service/ArrayDef_i.h b/TAO/orbsvcs/IFR_Service/ArrayDef_i.h
index 829ad7154db..5323355564c 100644
--- a/TAO/orbsvcs/IFR_Service/ArrayDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ArrayDef_i.h
@@ -50,89 +50,89 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::ULong length (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong length_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void length (
       CORBA::ULong length
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void length_i (
       CORBA::ULong length
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr element_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr element_type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr element_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr element_type_def_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void element_type_def (
       CORBA_IDLType_ptr element_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void element_type_def_i (
       CORBA_IDLType_ptr element_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   void destroy_element_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys an anonymous non-primitive element type.
diff --git a/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp b/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp
index fb94c9430cd..4bf09e2fcf8 100644
--- a/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp
@@ -24,23 +24,23 @@ TAO_AttributeDef_i::~TAO_AttributeDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_AttributeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_AttributeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Attribute;
 }
 
 CORBA_Contained::Description *
-TAO_AttributeDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_AttributeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -51,26 +51,26 @@ TAO_AttributeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  retval->value <<= this->make_description (TAO_ENV_SINGLE_ARG_PARAMETER);
+  retval->value <<= this->make_description (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return retval._retn ();
 }
 
 CORBA::TypeCode_ptr
-TAO_AttributeDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_AttributeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
@@ -86,25 +86,25 @@ TAO_AttributeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
 
   TAO_IDLType_i *impl =
     this->repo_->servant_factory ()->create_idltype (type_key
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_AttributeDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_AttributeDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
@@ -129,11 +129,11 @@ TAO_AttributeDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
                                                     type_path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
   CORBA_IDLType_var retval = CORBA_IDLType::_narrow (obj.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
   return retval._retn ();
@@ -141,23 +141,23 @@ TAO_AttributeDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_AttributeDef_i::type_def (CORBA_IDLType_ptr type_def
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->type_def_i (type_def
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (type_def
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var type_path =
@@ -169,16 +169,16 @@ TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def
 }
 
 CORBA::AttributeMode
-TAO_AttributeDef_i::mode (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::mode (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::ATTR_NORMAL);
 
-  return this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::AttributeMode
-TAO_AttributeDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_AttributeDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int mode = 0;
@@ -191,18 +191,18 @@ TAO_AttributeDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_AttributeDef_i::mode (CORBA::AttributeMode mode
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->mode_i (mode
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -211,15 +211,15 @@ TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode
 }
 
 CORBA_AttributeDescription
-TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::make_description (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_AttributeDescription ad;
 
-  ad.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ad.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ad);
 
-  ad.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ad.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ad);
 
   ACE_TString container_id;
@@ -230,13 +230,13 @@ TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL)
 
   ad.defined_in = container_id.c_str ();
 
-  ad.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ad.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ad);
 
-  ad.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ad.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ad);
 
-  ad.mode = this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ad.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ad);
 /*
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
@@ -321,7 +321,7 @@ TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL)
       TAO_ExceptionDef_i impl (this->repo_,
                                key);
 
-      get_ed.type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      get_ed.type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (ad);
 
       get_ed_seq[i] = get_ed;
@@ -405,7 +405,7 @@ TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL)
       TAO_ExceptionDef_i impl (this->repo_,
                                key);
 
-      put_ed.type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      put_ed.type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (ad);
 
       put_ed_seq[i] = put_ed;
@@ -417,7 +417,7 @@ TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA_ExceptionDefSeq *
-TAO_AttributeDef_i::get_exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::get_exceptions (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -482,11 +482,11 @@ TAO_AttributeDef_i::get_exceptions (TAO_ENV_SINGLE_ARG_DECL)
       CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception,
                                                         path.c_str ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[i] = CORBA_ExceptionDef::_narrow (obj.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -494,7 +494,7 @@ TAO_AttributeDef_i::get_exceptions (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA_ExceptionDefSeq *
-TAO_AttributeDef_i::put_exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AttributeDef_i::put_exceptions (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -559,11 +559,11 @@ TAO_AttributeDef_i::put_exceptions (TAO_ENV_SINGLE_ARG_DECL)
       CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception,
                                                         path.c_str ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[i] = CORBA_ExceptionDef::_narrow (obj.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
diff --git a/TAO/orbsvcs/IFR_Service/AttributeDef_i.h b/TAO/orbsvcs/IFR_Service/AttributeDef_i.h
index e0257965c6d..dba8eb077c1 100644
--- a/TAO/orbsvcs/IFR_Service/AttributeDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/AttributeDef_i.h
@@ -51,79 +51,79 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr type_def_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void type_def (
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void type_def_i (
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::AttributeMode mode (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::AttributeMode mode_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void mode (
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void mode_i (
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_AttributeDescription make_description (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Common code for InterfaceDef to call in
@@ -131,12 +131,12 @@ public:
 
   // These two are called by Contained::move().
   CORBA_ExceptionDefSeq *get_exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ExceptionDefSeq *put_exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp b/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp
index 58ea7753775..404cbceb9d2 100644
--- a/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ComponentDef_i.cpp
@@ -23,39 +23,39 @@ TAO_ComponentDef_i::~TAO_ComponentDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ComponentDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ComponentDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Component;
 }
 
 void
-TAO_ComponentDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_ComponentDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ComponentDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ComponentDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ComponentDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ComponentDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -63,16 +63,16 @@ TAO_ComponentDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SING
 }
 
 CORBA::TypeCode_ptr
-TAO_ComponentDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_ComponentDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ComponentDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -80,16 +80,16 @@ TAO_ComponentDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A
 }
 
 CORBA_InterfaceDefSeq *
-TAO_ComponentDef_i::supported_interfaces (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->supported_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDefSeq *
-TAO_ComponentDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ComponentDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -99,20 +99,20 @@ TAO_ComponentDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*
 void
 TAO_ComponentDef_i::supported_interfaces (
     const CORBA_InterfaceDefSeq &supported_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->supported_interfaces_i (supported_interfaces
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ComponentDef_i::supported_interfaces_i (
     const CORBA_InterfaceDefSeq & /* supported_interfaces */
-    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
+    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -120,16 +120,16 @@ TAO_ComponentDef_i::supported_interfaces_i (
 }
 
 IR::ComponentDef_ptr
-TAO_ComponentDef_i::base_component (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::base_component (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (IR::ComponentDef::_nil ());
 
-  return this->base_component_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->base_component_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::ComponentDef_ptr
-TAO_ComponentDef_i::base_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ComponentDef_i::base_component_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -137,16 +137,16 @@ TAO_ComponentDef_i::base_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_EN
 }
 
 IR::ProvidesDefSeq *
-TAO_ComponentDef_i::provides_interfaces (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::provides_interfaces (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->provides_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->provides_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::ProvidesDefSeq *
-TAO_ComponentDef_i::provides_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ComponentDef_i::provides_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -154,16 +154,16 @@ TAO_ComponentDef_i::provides_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* T
 }
 
 IR::UsesDefSeq *
-TAO_ComponentDef_i::uses_interfaces (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::uses_interfaces (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->uses_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->uses_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::UsesDefSeq *
-TAO_ComponentDef_i::uses_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ComponentDef_i::uses_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -171,16 +171,16 @@ TAO_ComponentDef_i::uses_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_E
 }
 
 IR::EmitsDefSeq *
-TAO_ComponentDef_i::emits_events (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::emits_events (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->emits_events_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->emits_events_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::EmitsDefSeq *
-TAO_ComponentDef_i::emits_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ComponentDef_i::emits_events_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -188,16 +188,16 @@ TAO_ComponentDef_i::emits_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_
 }
 
 IR::PublishesDefSeq *
-TAO_ComponentDef_i::publishes_events (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::publishes_events (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->publishes_events_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->publishes_events_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::PublishesDefSeq *
-TAO_ComponentDef_i::publishes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ComponentDef_i::publishes_events_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -205,16 +205,16 @@ TAO_ComponentDef_i::publishes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_
 }
 
 IR::ConsumesDefSeq *
-TAO_ComponentDef_i::consumes_events (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ComponentDef_i::consumes_events (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->consumes_events_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->consumes_events_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::ConsumesDefSeq *
-TAO_ComponentDef_i::consumes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ComponentDef_i::consumes_events_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -222,7 +222,7 @@ TAO_ComponentDef_i::consumes_events_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_E
 }
 
 CORBA::Boolean
-TAO_ComponentDef_i::is_basic (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ComponentDef_i::is_basic (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -235,7 +235,7 @@ TAO_ComponentDef_i::create_provides (
     const char *name,
     const char *version,
     CORBA_InterfaceDef_ptr interface_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -245,7 +245,7 @@ TAO_ComponentDef_i::create_provides (
                                   name,
                                   version,
                                   interface_type
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 IR::ProvidesDef_ptr
@@ -254,7 +254,7 @@ TAO_ComponentDef_i::create_provides_i (
     const char * /* name */,
     const char * /* version */,
     CORBA_InterfaceDef_ptr  /* interface_type */
-    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
+    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -268,7 +268,7 @@ TAO_ComponentDef_i::create_uses (const char *id,
                                  const char *version,
                                  CORBA_InterfaceDef_ptr interface_type,
                                  CORBA::Boolean is_multiple
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::UsesDef::_nil ());
@@ -278,7 +278,7 @@ TAO_ComponentDef_i::create_uses (const char *id,
                               version,
                               interface_type,
                               is_multiple
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 IR::UsesDef_ptr
@@ -287,7 +287,7 @@ TAO_ComponentDef_i::create_uses_i (const char * /* id */,
                                    const char * /* version */,
                                    CORBA_InterfaceDef_ptr  /* interface_type */,
                                    CORBA::Boolean /* is_multiple */
-                                   TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
+                                   ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -299,7 +299,7 @@ TAO_ComponentDef_i::create_emits (const char *id,
                                   const char *name,
                                   const char *version,
                                   CORBA_ValueDef_ptr value
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::EmitsDef::_nil ());
@@ -308,7 +308,7 @@ TAO_ComponentDef_i::create_emits (const char *id,
                                name,
                                version,
                                value
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 IR::EmitsDef_ptr
@@ -316,7 +316,7 @@ TAO_ComponentDef_i::create_emits_i (const char * /* id */,
                                     const char * /* name */,
                                     const char * /* version */,
                                     CORBA_ValueDef_ptr  /* value */
-                                    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                                    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -328,7 +328,7 @@ TAO_ComponentDef_i::create_publishes (const char *id,
                                       const char *name,
                                       const char *version,
                                       CORBA_ValueDef_ptr value
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::PublishesDef::_nil ());
@@ -337,7 +337,7 @@ TAO_ComponentDef_i::create_publishes (const char *id,
                                    name,
                                    version,
                                    value
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 IR::PublishesDef_ptr
@@ -345,7 +345,7 @@ TAO_ComponentDef_i::create_publishes_i (const char * /* id */,
                                         const char * /* name */,
                                         const char * /* version */,
                                         CORBA_ValueDef_ptr  /* value */
-                                        TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                                        ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -357,7 +357,7 @@ TAO_ComponentDef_i::create_consumes (const char *id,
                                      const char *name,
                                      const char *version,
                                      CORBA_ValueDef_ptr value
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::ConsumesDef::_nil ());
@@ -366,7 +366,7 @@ TAO_ComponentDef_i::create_consumes (const char *id,
                                   name,
                                   version,
                                   value
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 IR::ConsumesDef_ptr
@@ -374,7 +374,7 @@ TAO_ComponentDef_i::create_consumes_i (const char * /* id */,
                                        const char * /* name */,
                                        const char * /* version */,
                                        CORBA_ValueDef_ptr  /* value */
-                                       TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                                       ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/ComponentDef_i.h b/TAO/orbsvcs/IFR_Service/ComponentDef_i.h
index b133e020ab2..cd67aca14c1 100644
--- a/TAO/orbsvcs/IFR_Service/ComponentDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ComponentDef_i.h
@@ -52,136 +52,136 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_InterfaceDefSeq *supported_interfaces (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDefSeq *supported_interfaces_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void supported_interfaces (
       const CORBA_InterfaceDefSeq &supported_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void supported_interfaces_i (
       const CORBA_InterfaceDefSeq &supported_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::ComponentDef_ptr base_component (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::ComponentDef_ptr base_component_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::ProvidesDefSeq *provides_interfaces (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::ProvidesDefSeq *provides_interfaces_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::UsesDefSeq *uses_interfaces (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::UsesDefSeq *uses_interfaces_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::EmitsDefSeq *emits_events (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::EmitsDefSeq *emits_events_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::PublishesDefSeq *publishes_events (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::PublishesDefSeq *publishes_events_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::ConsumesDefSeq *consumes_events (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::ConsumesDefSeq *consumes_events_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_basic (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_basic_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -190,7 +190,7 @@ public:
       const char *name,
       const char *version,
       CORBA_InterfaceDef_ptr interface_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -199,7 +199,7 @@ public:
       const char *name,
       const char *version,
       CORBA_InterfaceDef_ptr interface_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -209,7 +209,7 @@ public:
       const char *version,
       CORBA_InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -219,7 +219,7 @@ public:
       const char *version,
       CORBA_InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -228,7 +228,7 @@ public:
       const char *name,
       const char *version,
       CORBA_ValueDef_ptr value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -237,7 +237,7 @@ public:
       const char *name,
       const char *version,
       CORBA_ValueDef_ptr value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -246,7 +246,7 @@ public:
       const char *name,
       const char *version,
       CORBA_ValueDef_ptr value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -255,7 +255,7 @@ public:
       const char *name,
       const char *version,
       CORBA_ValueDef_ptr value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -264,7 +264,7 @@ public:
       const char *name,
       const char *version,
       CORBA_ValueDef_ptr value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -273,7 +273,7 @@ public:
       const char *name,
       const char *version,
       CORBA_ValueDef_ptr value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp
index 20b5ee7ab3e..cbaeaae6da6 100644
--- a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.cpp
@@ -27,7 +27,7 @@ TAO_ComponentRepository_i::create_component (
     const char *version,
     IR::ComponentDef_ptr base_component,
     const CORBA_InterfaceDefSeq & supports_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -38,7 +38,7 @@ TAO_ComponentRepository_i::create_component (
                                    version,
                                    base_component,
                                    supports_interfaces
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 IR::ComponentDef_ptr
@@ -48,7 +48,7 @@ TAO_ComponentRepository_i::create_component_i (
     const char * /* version */,
     IR::ComponentDef_ptr /* base_component */,
     const CORBA_InterfaceDefSeq & /* supports_interfaces */
-    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
+    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -64,7 +64,7 @@ TAO_ComponentRepository_i::create_home (
     IR::HomeDef_ptr base_component,
     IR::ComponentDef_ptr managed_component,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -76,7 +76,7 @@ TAO_ComponentRepository_i::create_home (
                               base_component,
                               managed_component,
                               primary_key
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 IR::HomeDef_ptr
@@ -87,7 +87,7 @@ TAO_ComponentRepository_i::create_home_i (
     IR::HomeDef_ptr /* base_component */,
     IR::ComponentDef_ptr /* managed_component */,
     CORBA_ValueDef_ptr /* primary_key */
-    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
+    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h
index 32aae9cde29..304f4580544 100644
--- a/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h
+++ b/TAO/orbsvcs/IFR_Service/ComponentRepository_i.h
@@ -60,7 +60,7 @@ public:
       const char *version,
       IR::ComponentDef_ptr base_component,
       const CORBA_InterfaceDefSeq & supports_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -70,7 +70,7 @@ public:
       const char *version,
       IR::ComponentDef_ptr base_component,
       const CORBA_InterfaceDefSeq & supports_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -81,7 +81,7 @@ public:
       IR::HomeDef_ptr base_home,
       IR::ComponentDef_ptr managed_component,
       CORBA_ValueDef_ptr primary_key
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -92,7 +92,7 @@ public:
       IR::HomeDef_ptr base_home,
       IR::ComponentDef_ptr managed_component,
       CORBA_ValueDef_ptr primary_key
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp b/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp
index c522edbd8f3..c00c5737571 100644
--- a/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ConstantDef_i.cpp
@@ -23,23 +23,23 @@ TAO_ConstantDef_i::~TAO_ConstantDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ConstantDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ConstantDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Constant;
 }
 
 CORBA_Contained::Description *
-TAO_ConstantDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ConstantDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -50,15 +50,15 @@ TAO_ConstantDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_ConstantDescription cd;
 
-  cd.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  cd.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  cd.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  cd.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -69,13 +69,13 @@ TAO_ConstantDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 
   cd.defined_in = container_id.c_str ();
 
-  cd.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  cd.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  cd.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  cd.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Any_var val = this->value_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Any_var val = this->value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   cd.value = val.in ();
@@ -86,16 +86,16 @@ TAO_ConstantDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_ConstantDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_ConstantDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
@@ -111,25 +111,25 @@ TAO_ConstantDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
 
   TAO_IDLType_i *impl =
     this->repo_->servant_factory ()->create_idltype (type_key
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_ConstantDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_ConstantDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString type_path;
@@ -154,32 +154,32 @@ TAO_ConstantDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
                                                     type_path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
   return CORBA_IDLType::_narrow (obj.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ConstantDef_i::type_def (CORBA_IDLType_ptr type_def
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->type_def_i (type_def
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ConstantDef_i::type_def_i (CORBA_IDLType_ptr type_def
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (type_def
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var type_path =
@@ -191,19 +191,19 @@ TAO_ConstantDef_i::type_def_i (CORBA_IDLType_ptr type_def
 }
 
 CORBA::Any *
-TAO_ConstantDef_i::value (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::value (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->value_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Any *
-TAO_ConstantDef_i::value_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ConstantDef_i::value_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TypeCode_var tc = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   void *ref = 0;
@@ -239,21 +239,21 @@ TAO_ConstantDef_i::value_i (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_ConstantDef_i::value (const CORBA::Any &value
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->value_i (value
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ConstantDef_i::value_i (const CORBA::Any &value
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TypeCode_var my_tc = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var my_tc = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var val_tc = value.type ();
@@ -263,7 +263,7 @@ TAO_ConstantDef_i::value_i (const CORBA::Any &value
 
   ACE_Message_Block *mb = value._tao_get_cdr ();
 
-  CORBA::TCKind kind = val_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = val_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   switch (kind)
diff --git a/TAO/orbsvcs/IFR_Service/ConstantDef_i.h b/TAO/orbsvcs/IFR_Service/ConstantDef_i.h
index e2ad2105210..05b997877db 100644
--- a/TAO/orbsvcs/IFR_Service/ConstantDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ConstantDef_i.h
@@ -50,74 +50,74 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr type_def_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void type_def (
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void type_def_i (
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any *value (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Any *value_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void value (
       const CORBA::Any &value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void value_i (
       const CORBA::Any &value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp
index 9710a5fb7ee..e03833001b3 100644
--- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp
@@ -21,39 +21,39 @@ TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ConsumesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ConsumesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Consumes;
 }
 
-void 
-TAO_ConsumesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+void
+TAO_ConsumesDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_ConsumesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+void
+TAO_ConsumesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ConsumesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ConsumesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ConsumesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ConsumesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h
index 20c1acf586d..854462108ed 100644
--- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h
@@ -51,30 +51,30 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.cpp b/TAO/orbsvcs/IFR_Service/Contained_i.cpp
index 44414e16b2a..a4cf9266e73 100644
--- a/TAO/orbsvcs/IFR_Service/Contained_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/Contained_i.cpp
@@ -20,16 +20,16 @@ TAO_Contained_i::~TAO_Contained_i (void)
 }
 
 void
-TAO_Contained_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -85,16 +85,16 @@ TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-TAO_Contained_i::id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::id (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
-TAO_Contained_i::id_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::id_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
@@ -107,18 +107,18 @@ TAO_Contained_i::id_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_Contained_i::id (const char *id
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->id_i (id
-              TAO_ENV_ARG_PARAMETER);
+              ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Contained_i::id_i (const char *id
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString tmp;
@@ -162,16 +162,16 @@ TAO_Contained_i::id_i (const char *id
 }
 
 char *
-TAO_Contained_i::name (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::name (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
-TAO_Contained_i::name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
@@ -183,16 +183,16 @@ TAO_Contained_i::name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-TAO_Contained_i::version (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::version (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
-TAO_Contained_i::version_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::version_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
@@ -205,23 +205,23 @@ TAO_Contained_i::version_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_Contained_i::name (const char *name
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->name_i (name
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Contained_i::name_i (const char *name
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check if name already exists in this container.
   CORBA::Boolean exists = this->name_exists (name
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (exists)
@@ -253,18 +253,18 @@ TAO_Contained_i::name_i (const char *name
 
 void
 TAO_Contained_i::version (const char *version
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->version_i (version
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Contained_i::version_i (const char *version
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_string_value (this->section_key_,
@@ -273,16 +273,16 @@ TAO_Contained_i::version_i (const char *version
 }
 
 CORBA_Container_ptr
-TAO_Contained_i::defined_in (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::defined_in (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_Container::_nil ());
 
-  return this->defined_in_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->defined_in_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Container_ptr
-TAO_Contained_i::defined_in_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::defined_in_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString container_id;
@@ -315,27 +315,27 @@ TAO_Contained_i::defined_in_i (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
                                                     container_path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_Container::_nil ());
 
   CORBA_Container_var retval = CORBA_Container::_narrow (obj.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_Container::_nil ());
 
   return retval._retn ();
 }
 
 char *
-TAO_Contained_i::absolute_name (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::absolute_name (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->absolute_name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->absolute_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
-TAO_Contained_i::absolute_name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::absolute_name_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString absolute_name;
@@ -347,16 +347,16 @@ TAO_Contained_i::absolute_name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA_Repository_ptr
-TAO_Contained_i::containing_repository (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Contained_i::containing_repository (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_Repository::_nil ());
 
-  return this->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->containing_repository_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Repository_ptr
-TAO_Contained_i::containing_repository_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Contained_i::containing_repository_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->repo_->repo_objref ();
@@ -366,7 +366,7 @@ void
 TAO_Contained_i::move (CORBA_Container_ptr new_container,
                        const char *new_name,
                        const char *new_version
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
@@ -375,12 +375,12 @@ TAO_Contained_i::move (CORBA_Container_ptr new_container,
                 new_name,
                 new_version,
                 1
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_Contained_i::name_exists (const char *name
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString container_id;
@@ -391,7 +391,7 @@ TAO_Contained_i::name_exists (const char *name
   if (container_id == "")
     {
       return this->repo_->name_exists (name
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
     }
 
   ACE_TString container_path;
@@ -485,15 +485,15 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                          const char *new_name,
                          const char *new_version,
                          CORBA::Boolean cleanup
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Repository_var my_repo =
-    this->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->containing_repository_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::DefinitionKind container_dk =
-    new_container->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+    new_container->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_Configuration_Section_Key container_key;
@@ -516,7 +516,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
     {
       PortableServer::ObjectId_var oid =
         this->repo_->ir_poa ()->reference_to_id (new_container
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var container_path =
@@ -529,13 +529,13 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
 
       TAO_Contained_i *impl =
         this->repo_->servant_factory ()->create_contained (container_key
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       auto_ptr<TAO_Contained_i> safety (impl);
 
       CORBA_Repository_var your_repo =
-        impl->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+        impl->containing_repository_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (my_repo.in () != your_repo.in ())
@@ -545,14 +545,14 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
 
       container_impl =
         this->repo_->servant_factory ()->create_container (container_key
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  CORBA::DefinitionKind my_dk = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind my_dk = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // If an exception is thrown, this must be restored.
@@ -576,7 +576,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_EnumDef_i impl (this->repo_,
                               this->section_key_);
 
-          CORBA_EnumMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA_EnumMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Struct
@@ -586,7 +586,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
               this->move_pre_process (new_container,
                                       my_path.c_str (),
                                       new_name
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -595,7 +595,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                            new_name,
                                            new_version,
                                            members.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -604,14 +604,14 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_AliasDef_i impl (this->repo_,
                                this->section_key_);
 
-          CORBA_IDLType_var otype = impl.original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA_IDLType_var otype = impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           container_impl->create_alias_i (id.in (),
                                           new_name,
                                           new_version,
                                           otype.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -620,7 +620,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           container_impl->create_native_i (id.in (),
                                            new_name,
                                            new_version
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -629,14 +629,14 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_ValueBoxDef_i impl (this->repo_,
                                   this->section_key_);
 
-          CORBA_IDLType_var otype = impl.original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA_IDLType_var otype = impl.original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           container_impl->create_value_box_i (id.in (),
                                               new_name,
                                               new_version,
                                               otype.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -645,7 +645,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_StructDef_i impl (this->repo_,
                                 this->section_key_);
 
-          CORBA_StructMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA_StructMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Struct
@@ -655,7 +655,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
               this->move_pre_process (new_container,
                                       my_path.c_str (),
                                       new_name
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -664,11 +664,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                              new_name,
                                              new_version,
                                              members.in ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->move_contents (new_defn.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -678,10 +678,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                this->section_key_);
 
           CORBA_IDLType_var disc_type =
-            impl.discriminator_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+            impl.discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA_UnionMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA_UnionMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Struct
@@ -691,7 +691,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
               this->move_pre_process (new_container,
                                       my_path.c_str (),
                                       new_name
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -701,11 +701,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                             new_version,
                                             disc_type.in (),
                                             members.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->move_contents (new_defn.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -715,11 +715,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
             container_impl->create_module_i (id.in (),
                                              new_name,
                                              new_version
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->move_contents (new_defn.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -728,7 +728,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_ExceptionDef_i impl (this->repo_,
                                    this->section_key_);
 
-          CORBA_StructMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA_StructMemberSeq_var members = impl.members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_ExceptionDef_var new_defn =
@@ -736,11 +736,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                                 new_name,
                                                 new_version,
                                                 members.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->move_contents (new_defn.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -750,7 +750,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                    this->section_key_);
 
           CORBA_InterfaceDefSeq_var bases =
-            impl.base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+            impl.base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_InterfaceDef_var new_defn =
@@ -758,11 +758,11 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                                 new_name,
                                                 new_version,
                                                 bases.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->move_contents (new_defn.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -771,10 +771,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_ConstantDef_i impl (this->repo_,
                                   this->section_key_);
 
-          CORBA_IDLType_var type_def = impl.type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA_IDLType_var type_def = impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::Any_var value = impl.value_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::Any_var value = impl.value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           container_impl->create_constant_i (id.in (),
@@ -782,7 +782,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                              new_version,
                                              type_def.in (),
                                              value.in ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -791,10 +791,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_AttributeDef_i impl (this->repo_,
                                    this->section_key_);
 
-          CORBA_IDLType_var type_def = impl.type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA_IDLType_var type_def = impl.type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::AttributeMode mode = impl.mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::AttributeMode mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Interface)
@@ -807,7 +807,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                        new_version,
                                        type_def.in (),
                                        mode
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
             }
@@ -821,7 +821,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                        new_version,
                                        type_def.in (),
                                        mode
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
             }
@@ -835,20 +835,20 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_OperationDef_i impl (this->repo_,
                                    this->section_key_);
 
-          CORBA_IDLType_var result = impl.result_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA_IDLType_var result = impl.result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::OperationMode mode = impl.mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::OperationMode mode = impl.mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA_ParDescriptionSeq_var params = impl.params_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA_ParDescriptionSeq_var params = impl.params_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_ExceptionDefSeq_var exceptions =
-            impl.exceptions_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+            impl.exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA_ContextIdSeq_var contexts = impl.contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA_ContextIdSeq_var contexts = impl.contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Interface)
@@ -864,7 +864,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                        params.in (),
                                        exceptions.in (),
                                        contexts.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
             }
@@ -881,7 +881,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                        params.in (),
                                        exceptions.in (),
                                        contexts.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
             }
@@ -967,12 +967,12 @@ void
 TAO_Contained_i::move_pre_process (CORBA_Container_ptr container,
                                    const char *contained_path,
                                    const char *name
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var container_oid =
     this->repo_->ir_poa ()->reference_to_id (container
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var container_path =
@@ -1027,7 +1027,7 @@ TAO_Contained_i::move_pre_process (CORBA_Container_ptr container,
 
 void
 TAO_Contained_i::move_contents (CORBA_Container_ptr new_container
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -1070,7 +1070,7 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container
               TAO_Contained_i *impl =
                 this->repo_->servant_factory ()->create_contained (
                                                      defn_key
-                                                     TAO_ENV_ARG_PARAMETER
+                                                     ACE_ENV_ARG_PARAMETER
                                                    );
               ACE_CHECK;
 
@@ -1080,13 +1080,13 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container
                             name.c_str (),
                             version.c_str (),
                             0
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
     }
 
-  CORBA::DefinitionKind kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Specific to InterfaceDef_i and ValueDef_i
@@ -1131,7 +1131,7 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container
                            name.c_str (),
                            version.c_str (),
                            0
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -1174,7 +1174,7 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container
                            name.c_str (),
                            version.c_str (),
                            0
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.h b/TAO/orbsvcs/IFR_Service/Contained_i.h
index 299288402e9..bcc023d9457 100644
--- a/TAO/orbsvcs/IFR_Service/Contained_i.h
+++ b/TAO/orbsvcs/IFR_Service/Contained_i.h
@@ -51,120 +51,120 @@ public:
   // Destructor.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *id_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void id (
       const char *id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void id_i (
       const char *id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *name_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void name (
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void name_i (
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *version_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void version (
       const char *version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void version_i (
       const char *version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Container_ptr defined_in_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *absolute_name_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Repository_ptr containing_repository_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
@@ -173,7 +173,7 @@ public:
       CORBA_Container_ptr new_container,
       const char *new_name,
       const char *new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -183,7 +183,7 @@ protected:
       const char *new_name,
       const char *new_version,
       CORBA::Boolean cleanup
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Engine for move() with an extra 'cleanup'
@@ -194,7 +194,7 @@ protected:
 private:
   CORBA::Boolean name_exists (
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Check if <name> already exists in our container
@@ -209,7 +209,7 @@ private:
       CORBA_Container_ptr container,
       const char *contained_path,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Mangle the names of references that are also
@@ -219,7 +219,7 @@ private:
 
   void move_contents (
       CORBA_Container_ptr new_container
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Recursively calls move_i for definitions,
diff --git a/TAO/orbsvcs/IFR_Service/Container_i.cpp b/TAO/orbsvcs/IFR_Service/Container_i.cpp
index c3bbfcc8e0f..88e98631ddf 100644
--- a/TAO/orbsvcs/IFR_Service/Container_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/Container_i.cpp
@@ -21,16 +21,16 @@ TAO_Container_i::~TAO_Container_i (void)
 }
 
 void
-TAO_Container_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Container_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int index = 0;
@@ -77,12 +77,12 @@ TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
             {
               TAO_IDLType_i *impl =
                 this->repo_->servant_factory ()->create_idltype (entry_key
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
 
               auto_ptr<TAO_IDLType_i> safety (impl);
 
-              CORBA::DefinitionKind def_kind = impl->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+              CORBA::DefinitionKind def_kind = impl->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               switch (def_kind)
@@ -95,7 +95,7 @@ TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
                 case CORBA::dk_Fixed:
                 case CORBA::dk_Array:
                 case CORBA::dk_Sequence:
-                  impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+                  impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_CHECK;
                   break;
                 default:
@@ -146,12 +146,12 @@ TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
 
           TAO_Contained_i *impl =
             this->repo_->servant_factory ()->create_contained (defn_key
-                                                               TAO_ENV_ARG_PARAMETER);
+                                                               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           auto_ptr<TAO_Contained_i> safety (impl);
 
-          impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -163,18 +163,18 @@ TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA_Contained_ptr
 TAO_Container_i::lookup (const char *search_name
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   return this->lookup_i (search_name
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_Contained_ptr
 TAO_Container_i::lookup_i (const char *search_name
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key iter_key;
@@ -378,30 +378,30 @@ TAO_Container_i::lookup_i (const char *search_name
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_Contained::_nil ());
 
   return CORBA_Contained::_narrow (obj.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ContainedSeq *
 TAO_Container_i::contents (CORBA::DefinitionKind limit_type,
                            CORBA::Boolean exclude_inherited
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   return this->contents_i (limit_type,
                            exclude_inherited
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ContainedSeq *
 TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
                              CORBA::Boolean exclude_inherited
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (limit_type == CORBA::dk_none)
@@ -467,7 +467,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
 
   // Base interfaces
 
-  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (def_kind == CORBA::dk_Interface)
@@ -483,7 +483,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
                                     path_queue,
                                     limit_type,
                                     exclude_inherited
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
     }
@@ -511,12 +511,12 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
       CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (next_kind,
                                                         next_path.c_str ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CORBA_Contained_var next_cont =
         CORBA_Contained::_narrow (obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[j] = next_cont._retn ();
@@ -530,7 +530,7 @@ TAO_Container_i::lookup_name (const char *search_name,
                               CORBA::Long levels_to_search,
                               CORBA::DefinitionKind limit_type,
                               CORBA::Boolean exclude_inherited
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
@@ -539,7 +539,7 @@ TAO_Container_i::lookup_name (const char *search_name,
                               levels_to_search,
                               limit_type,
                               exclude_inherited
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ContainedSeq *
@@ -547,7 +547,7 @@ TAO_Container_i::lookup_name_i (const char *search_name,
                                 CORBA::Long levels_to_search,
                                 CORBA::DefinitionKind limit_type,
                                 CORBA::Boolean exclude_inherited
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -559,7 +559,7 @@ TAO_Container_i::lookup_name_i (const char *search_name,
                                levels_to_search,
                                limit_type,
                                exclude_inherited
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 
   size_t size = kind_queue.size ();
 
@@ -583,12 +583,12 @@ TAO_Container_i::lookup_name_i (const char *search_name,
       CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (next_kind,
                                                         next_path.c_str ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CORBA_Contained_var next_cont =
         CORBA_Contained::_narrow (obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[i] = next_cont._retn ();
@@ -601,7 +601,7 @@ CORBA_Container::DescriptionSeq *
 TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type,
                                     CORBA::Boolean exclude_inherited,
                                     CORBA::Long max_returned_objs
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
@@ -609,19 +609,19 @@ TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type,
   return this->describe_contents_i (limit_type,
                                     exclude_inherited,
                                     max_returned_objs
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_Container::DescriptionSeq *
 TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
                                       CORBA::Boolean exclude_inherited,
                                       CORBA::Long max_returned_objs
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_ContainedSeq_var contents = this->contents_i (limit_type,
                                                       exclude_inherited
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = contents->length ();
@@ -654,7 +654,7 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
   for (CORBA::ULong i = 0; i < ret_len; i++)
     {
       oid = this->repo_->ir_poa ()->reference_to_id (contents[i]
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       contained_path =
@@ -667,12 +667,12 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
 
       impl =
         this->repo_->servant_factory ()->create_contained (contained_key
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_Contained_i> safety (impl);
 
-      desc = impl->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      desc = impl->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[i].contained_object =
@@ -690,7 +690,7 @@ CORBA_ModuleDef_ptr
 TAO_Container_i::create_module (const char *id,
                                 const char *name,
                                 const char *version
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ModuleDef::_nil ());
@@ -698,18 +698,18 @@ TAO_Container_i::create_module (const char *id,
   return this->create_module_i (id,
                                 name,
                                 version
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ModuleDef_ptr
 TAO_Container_i::create_module_i (const char *id,
                                   const char *name,
                                   const char *version
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Module
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ());
 
   if (!legal_op)
@@ -717,7 +717,7 @@ TAO_Container_i::create_module_i (const char *id,
 
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ());
 
   if (bad_params)
@@ -752,11 +752,11 @@ TAO_Container_i::create_module_i (const char *id,
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Module,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ());
 
   return CORBA_ModuleDef::_narrow (obj.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ConstantDef_ptr
@@ -765,7 +765,7 @@ TAO_Container_i::create_constant (const char *id,
                                   const char *version,
                                   CORBA_IDLType_ptr type,
                                   const CORBA::Any &value
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ConstantDef::_nil ());
@@ -775,7 +775,7 @@ TAO_Container_i::create_constant (const char *id,
                                   version,
                                   type,
                                   value
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ConstantDef_ptr
@@ -784,11 +784,11 @@ TAO_Container_i::create_constant_i (const char *id,
                                     const char *version,
                                     CORBA_IDLType_ptr type,
                                     const CORBA::Any &value
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Constant
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
   if (!legal_op)
@@ -796,7 +796,7 @@ TAO_Container_i::create_constant_i (const char *id,
 
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
   if (bad_params)
@@ -823,7 +823,7 @@ TAO_Container_i::create_constant_i (const char *id,
   // Get the path to our type and store it.
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (type
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
   CORBA::String_var type_path =
@@ -838,7 +838,7 @@ TAO_Container_i::create_constant_i (const char *id,
 
   CORBA::TypeCode_var val_tc = value.type ();
 
-  CORBA::TCKind kind = val_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = val_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
   switch (kind)
@@ -869,11 +869,11 @@ TAO_Container_i::create_constant_i (const char *id,
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Constant,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
   return CORBA_ConstantDef::_narrow (obj.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructDef_ptr
@@ -881,7 +881,7 @@ TAO_Container_i::create_struct (const char *id,
                                 const char *name,
                                 const char *version,
                                 const CORBA_StructMemberSeq &members
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_StructDef::_nil ());
@@ -890,7 +890,7 @@ TAO_Container_i::create_struct (const char *id,
                                 name,
                                 version,
                                 members
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructDef_ptr
@@ -898,11 +898,11 @@ TAO_Container_i::create_struct_i (const char *id,
                                   const char *name,
                                   const char *version,
                                   const CORBA_StructMemberSeq &members
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Struct
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
   if (!legal_op)
@@ -910,7 +910,7 @@ TAO_Container_i::create_struct_i (const char *id,
 
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
   if (bad_params)
@@ -963,7 +963,7 @@ TAO_Container_i::create_struct_i (const char *id,
 
       PortableServer::ObjectId_var oid =
         this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
       CORBA::String_var member_path =
@@ -974,7 +974,7 @@ TAO_Container_i::create_struct_i (const char *id,
                                                 member_path.in ());
     }
 
-  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
   if (def_kind == CORBA::dk_Struct
@@ -989,11 +989,11 @@ TAO_Container_i::create_struct_i (const char *id,
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Struct,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
   return CORBA_StructDef::_narrow (obj.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_UnionDef_ptr
@@ -1002,7 +1002,7 @@ TAO_Container_i::create_union (const char *id,
                                const char *version,
                                CORBA_IDLType_ptr discriminator_type,
                                const CORBA_UnionMemberSeq &members
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_UnionDef::_nil ());
@@ -1012,7 +1012,7 @@ TAO_Container_i::create_union (const char *id,
                                version,
                                discriminator_type,
                                members
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_UnionDef_ptr
@@ -1021,11 +1021,11 @@ TAO_Container_i::create_union_i (const char *id,
                                  const char *version,
                                  CORBA_IDLType_ptr discriminator_type,
                                  const CORBA_UnionMemberSeq &members
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Union
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
   if (!legal_op)
@@ -1033,7 +1033,7 @@ TAO_Container_i::create_union_i (const char *id,
 
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
   if (bad_params)
@@ -1059,7 +1059,7 @@ TAO_Container_i::create_union_i (const char *id,
   // Add a field to hold the path to the discriminator type.
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (discriminator_type
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
   CORBA::String_var disc_path =
@@ -1099,7 +1099,7 @@ TAO_Container_i::create_union_i (const char *id,
 
       PortableServer::ObjectId_var oid =
         this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
       CORBA::String_var member_path =
@@ -1111,10 +1111,10 @@ TAO_Container_i::create_union_i (const char *id,
 
       this->store_label (member_key,
                          members[i].label
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
     }
 
-  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
   if (def_kind == CORBA::dk_Struct
@@ -1129,11 +1129,11 @@ TAO_Container_i::create_union_i (const char *id,
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Union,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
   return CORBA_UnionDef::_narrow (obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_EnumDef_ptr
@@ -1141,7 +1141,7 @@ TAO_Container_i::create_enum (const char *id,
                               const char *name,
                               const char *version,
                               const CORBA_EnumMemberSeq &members
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_EnumDef::_nil ());
@@ -1150,7 +1150,7 @@ TAO_Container_i::create_enum (const char *id,
                               name,
                               version,
                               members
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_EnumDef_ptr
@@ -1158,11 +1158,11 @@ TAO_Container_i::create_enum_i (const char *id,
                                 const char *name,
                                 const char *version,
                                 const CORBA_EnumMemberSeq &members
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Enum
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
 
   if (!legal_op)
@@ -1170,7 +1170,7 @@ TAO_Container_i::create_enum_i (const char *id,
 
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
 
   if (bad_params)
@@ -1215,7 +1215,7 @@ TAO_Container_i::create_enum_i (const char *id,
                                                 members[i].in ());
     }
 
-  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
 
   if (def_kind == CORBA::dk_Struct
@@ -1230,11 +1230,11 @@ TAO_Container_i::create_enum_i (const char *id,
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Enum,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
 
   return CORBA_EnumDef::_narrow (obj.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_AliasDef_ptr
@@ -1242,7 +1242,7 @@ TAO_Container_i::create_alias (const char *id,
                                const char *name,
                                const char *version,
                                CORBA_IDLType_ptr original_type
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_AliasDef::_nil ());
@@ -1251,7 +1251,7 @@ TAO_Container_i::create_alias (const char *id,
                                name,
                                version,
                                original_type
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_AliasDef_ptr
@@ -1259,11 +1259,11 @@ TAO_Container_i::create_alias_i (const char *id,
                                  const char *name,
                                  const char *version,
                                  CORBA_IDLType_ptr original_type
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Alias
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
 
   if (!legal_op)
@@ -1271,7 +1271,7 @@ TAO_Container_i::create_alias_i (const char *id,
 
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
 
   if (bad_params)
@@ -1297,7 +1297,7 @@ TAO_Container_i::create_alias_i (const char *id,
   // Get the path to our original type and store it.
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (original_type
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
 
   CORBA::String_var unalias_path =
@@ -1311,11 +1311,11 @@ TAO_Container_i::create_alias_i (const char *id,
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Alias,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
 
   return CORBA_AliasDef::_narrow (obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef_ptr
@@ -1323,7 +1323,7 @@ TAO_Container_i::create_interface (const char *id,
                                    const char *name,
                                    const char *version,
                                    const CORBA_InterfaceDefSeq &base_interfaces
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_InterfaceDef::_nil ());
@@ -1332,7 +1332,7 @@ TAO_Container_i::create_interface (const char *id,
                                    name,
                                    version,
                                    base_interfaces
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef_ptr
@@ -1340,11 +1340,11 @@ TAO_Container_i::create_interface_i (const char *id,
                                      const char *name,
                                      const char *version,
                                      const CORBA_InterfaceDefSeq &base_interfaces
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Interface
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
   if (!legal_op)
@@ -1352,7 +1352,7 @@ TAO_Container_i::create_interface_i (const char *id,
 
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
   if (bad_params)
@@ -1392,7 +1392,7 @@ TAO_Container_i::create_interface_i (const char *id,
         {
           PortableServer::ObjectId_var oid =
             this->repo_->ir_poa ()->reference_to_id (base_interfaces[i]
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
           CORBA::String_var inherited_path =
@@ -1410,11 +1410,11 @@ TAO_Container_i::create_interface_i (const char *id,
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Interface,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
   return CORBA_InterfaceDef::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueDef_ptr
@@ -1428,7 +1428,7 @@ TAO_Container_i::create_value (const char *id,
                                const CORBA_ValueDefSeq &abstract_base_values,
                                const CORBA_InterfaceDefSeq &supported_interfaces,
                                const CORBA_InitializerSeq &initializers
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueDef::_nil ());
@@ -1443,7 +1443,7 @@ TAO_Container_i::create_value (const char *id,
                                abstract_base_values,
                                supported_interfaces,
                                initializers
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueDef_ptr
@@ -1457,7 +1457,7 @@ TAO_Container_i::create_value_i (const char * /* id */,
                                  const CORBA_ValueDefSeq & /* abstract_base_values */,
                                  const CORBA_InterfaceDefSeq & /* supported_interfaces */,
                                  const CORBA_InitializerSeq & /* initializers */
-                                 TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                                 ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -1469,7 +1469,7 @@ TAO_Container_i::create_value_box (const char *id,
                                    const char *name,
                                    const char *version,
                                    CORBA_IDLType_ptr original_type_def
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueBoxDef::_nil ());
@@ -1478,7 +1478,7 @@ TAO_Container_i::create_value_box (const char *id,
                                    name,
                                    version,
                                    original_type_def
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueBoxDef_ptr
@@ -1486,11 +1486,11 @@ TAO_Container_i::create_value_box_i (const char *id,
                                      const char *name,
                                      const char *version,
                                      CORBA_IDLType_ptr original_type_def
-                                     TAO_ENV_ARG_DECL )
+                                     ACE_ENV_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (CORBA::dk_ValueBox
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
 
   if (!legal_op)
@@ -1498,7 +1498,7 @@ TAO_Container_i::create_value_box_i (const char *id,
 
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
 
   if (bad_params)
@@ -1524,7 +1524,7 @@ TAO_Container_i::create_value_box_i (const char *id,
   // Get the path to our original type and store it.
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (original_type_def
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
 
   CORBA::String_var boxed_path =
@@ -1538,11 +1538,11 @@ TAO_Container_i::create_value_box_i (const char *id,
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_ValueBox,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
 
   return CORBA_ValueBoxDef::_narrow (obj.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ExceptionDef_ptr
@@ -1550,7 +1550,7 @@ TAO_Container_i::create_exception (const char *id,
                                    const char *name,
                                    const char *version,
                                    const CORBA_StructMemberSeq &members
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ExceptionDef::_nil ());
@@ -1559,7 +1559,7 @@ TAO_Container_i::create_exception (const char *id,
                                    name,
                                    version,
                                    members
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ExceptionDef_ptr
@@ -1567,11 +1567,11 @@ TAO_Container_i::create_exception_i (const char *id,
                                      const char *name,
                                      const char *version,
                                      const CORBA_StructMemberSeq &members
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Exception
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
 
   if (!legal_op)
@@ -1579,7 +1579,7 @@ TAO_Container_i::create_exception_i (const char *id,
 
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
 
   if (bad_params)
@@ -1630,7 +1630,7 @@ TAO_Container_i::create_exception_i (const char *id,
 
       PortableServer::ObjectId_var oid =
         this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
 
       CORBA::String_var member_path =
@@ -1645,18 +1645,18 @@ TAO_Container_i::create_exception_i (const char *id,
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
 
   return CORBA_ExceptionDef::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_NativeDef_ptr
 TAO_Container_i::create_native (const char *id,
                                 const char *name,
                                 const char *version
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_NativeDef::_nil ());
@@ -1664,18 +1664,18 @@ TAO_Container_i::create_native (const char *id,
   return this->create_native_i (id,
                                 name,
                                 version
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_NativeDef_ptr
 TAO_Container_i::create_native_i (const char *id,
                                   const char *name,
                                   const char *version
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Native
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_NativeDef::_nil ());
 
   if (!legal_op)
@@ -1683,7 +1683,7 @@ TAO_Container_i::create_native_i (const char *id,
 
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_NativeDef::_nil ());
 
   if (bad_params)
@@ -1710,11 +1710,11 @@ TAO_Container_i::create_native_i (const char *id,
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Native,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_NativeDef::_nil ());
 
   return CORBA_NativeDef::_narrow (obj.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_AbstractInterfaceDef_ptr
@@ -1723,7 +1723,7 @@ TAO_Container_i::create_abstract_interface (
     const char *name,
     const char *version,
     const CORBA_AbstractInterfaceDefSeq &base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1733,7 +1733,7 @@ TAO_Container_i::create_abstract_interface (
                                             name,
                                             version,
                                             base_interfaces
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_AbstractInterfaceDef_ptr
@@ -1742,13 +1742,13 @@ TAO_Container_i::create_abstract_interface_i (
     const char *name,
     const char *version,
     const CORBA_AbstractInterfaceDefSeq &base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (
       CORBA::dk_AbstractInterface
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
 
@@ -1757,7 +1757,7 @@ TAO_Container_i::create_abstract_interface_i (
 
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
 
   if (bad_params)
@@ -1797,7 +1797,7 @@ TAO_Container_i::create_abstract_interface_i (
         {
           PortableServer::ObjectId_var oid =
             this->repo_->ir_poa ()->reference_to_id (base_interfaces[i]
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
 
           CORBA::String_var inherited_path =
@@ -1815,11 +1815,11 @@ TAO_Container_i::create_abstract_interface_i (
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_AbstractInterface,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
 
   return CORBA_AbstractInterfaceDef::_narrow (obj.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_LocalInterfaceDef_ptr
@@ -1828,7 +1828,7 @@ TAO_Container_i::create_local_interface (
     const char *name,
     const char *version,
     const CORBA_InterfaceDefSeq &base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1838,7 +1838,7 @@ TAO_Container_i::create_local_interface (
                                          name,
                                          version,
                                          base_interfaces
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_LocalInterfaceDef_ptr
@@ -1847,12 +1847,12 @@ TAO_Container_i::create_local_interface_i (
     const char *name,
     const char *version,
     const CORBA_InterfaceDefSeq &base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (CORBA::dk_LocalInterface
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
 
   if (!legal_op)
@@ -1860,7 +1860,7 @@ TAO_Container_i::create_local_interface_i (
 
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
 
   if (bad_params)
@@ -1900,7 +1900,7 @@ TAO_Container_i::create_local_interface_i (
         {
           PortableServer::ObjectId_var oid =
             this->repo_->ir_poa ()->reference_to_id (base_interfaces[i]
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
 
           CORBA::String_var inherited_path =
@@ -1918,16 +1918,16 @@ TAO_Container_i::create_local_interface_i (
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_LocalInterface,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
 
   return CORBA_LocalInterfaceDef::_narrow (obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_Container_i::name_exists (const char *name
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int index = 0;
@@ -2003,7 +2003,7 @@ TAO_Container_i::name_exists (const char *name
     }
 
   // If we are an interface, check the inherited members.
-  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   if (def_kind == CORBA::dk_Interface)
@@ -2060,7 +2060,7 @@ TAO_Container_i::lookup_name_recursive (
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
 {
   ACE_Configuration_Section_Key defns_key;
@@ -2125,7 +2125,7 @@ TAO_Container_i::lookup_name_recursive (
               TAO_Container_i *impl =
                 this->repo_->servant_factory ()->create_container (
                                                      defn_key
-                                                     TAO_ENV_ARG_PARAMETER
+                                                     ACE_ENV_ARG_PARAMETER
                                                    );
               ACE_CHECK;
 
@@ -2143,13 +2143,13 @@ TAO_Container_i::lookup_name_recursive (
                                               : levels_to_search - 1,
                                            limit_type,
                                            exclude_inherited
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
     }
 
-  CORBA::DefinitionKind kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind == CORBA::dk_Interface || kind == CORBA::dk_Value)
@@ -2378,7 +2378,7 @@ TAO_Container_i::lookup_op (
 
 CORBA::Boolean
 TAO_Container_i::id_exists (const char *id
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The repo id must not already exist.
@@ -2400,16 +2400,16 @@ TAO_Container_i::id_exists (const char *id
 CORBA::Boolean
 TAO_Container_i::pre_exist (const char *id,
                             const char *name
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean exist = this->id_exists (id TAO_ENV_ARG_PARAMETER);
+  CORBA::Boolean exist = this->id_exists (id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   if (exist)
     return 1;
 
-  return name_exists (name TAO_ENV_ARG_PARAMETER);
+  return name_exists (name ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_TString
@@ -2516,10 +2516,10 @@ TAO_Container_i::create_common (
 
 CORBA::Boolean
 TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::DefinitionKind my_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind my_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   int error_flag = 0;
@@ -2579,12 +2579,12 @@ TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind
 void
 TAO_Container_i::store_label (ACE_Configuration_Section_Key key,
                               const CORBA::Any &value
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var tc = value.type ();
 
-  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_InputCDR cdr (value._tao_get_cdr (),
diff --git a/TAO/orbsvcs/IFR_Service/Container_i.h b/TAO/orbsvcs/IFR_Service/Container_i.h
index df454997d72..e3435b72c31 100644
--- a/TAO/orbsvcs/IFR_Service/Container_i.h
+++ b/TAO/orbsvcs/IFR_Service/Container_i.h
@@ -54,39 +54,39 @@ public:
   // Destructor.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove our contents.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained_ptr lookup (
       const char *search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Contained_ptr lookup_i (
       const char *search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ContainedSeq *contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ContainedSeq *contents_i (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -95,7 +95,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -104,7 +104,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -112,7 +112,7 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -120,7 +120,7 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -128,7 +128,7 @@ public:
       const char *id,
       const char *name,
       const char *version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -136,7 +136,7 @@ public:
       const char *id,
       const char *name,
       const char *version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -146,7 +146,7 @@ public:
       const char *version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -156,7 +156,7 @@ public:
       const char *version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -165,7 +165,7 @@ public:
       const char *name,
       const char *version,
       const CORBA_StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -174,7 +174,7 @@ public:
       const char *name,
       const char *version,
       const CORBA_StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -184,7 +184,7 @@ public:
       const char *version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -194,7 +194,7 @@ public:
       const char *version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -203,7 +203,7 @@ public:
       const char *name,
       const char *version,
       const CORBA_EnumMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -212,7 +212,7 @@ public:
       const char *name,
       const char *version,
       const CORBA_EnumMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -221,7 +221,7 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -230,7 +230,7 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -239,7 +239,7 @@ public:
       const char *name,
       const char *version,
       const CORBA_InterfaceDefSeq &base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -248,7 +248,7 @@ public:
       const char *name,
       const char *version,
       const CORBA_InterfaceDefSeq &base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -263,7 +263,7 @@ public:
       const CORBA_ValueDefSeq &abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq &initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -278,7 +278,7 @@ public:
       const CORBA_ValueDefSeq &abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq &initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -287,7 +287,7 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -296,7 +296,7 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -305,7 +305,7 @@ public:
       const char *name,
       const char *version,
       const CORBA_StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -314,7 +314,7 @@ public:
       const char *name,
       const char *version,
       const CORBA_StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -322,7 +322,7 @@ public:
       const char *id,
       const char *name,
       const char *version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -330,7 +330,7 @@ public:
       const char *id,
       const char *name,
       const char *version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -339,7 +339,7 @@ public:
       const char *name,
       const char *version,
       const CORBA_AbstractInterfaceDefSeq &base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -348,7 +348,7 @@ public:
       const char *name,
       const char *version,
       const CORBA_AbstractInterfaceDefSeq &base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -357,7 +357,7 @@ public:
       const char *name,
       const char *version,
       const CORBA_InterfaceDefSeq &base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -366,13 +366,13 @@ public:
       const char *name,
       const char *version,
       const CORBA_InterfaceDefSeq &base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean name_exists (
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Checks for local existence of <name>.
@@ -381,7 +381,7 @@ protected:
    void store_label (
       ACE_Configuration_Section_Key key,
       const CORBA::Any &value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Store a union member's label value.
@@ -389,7 +389,7 @@ protected:
   CORBA::Boolean pre_exist (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Bundles id_exists and name_exists together.
@@ -427,19 +427,19 @@ private:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   CORBA::Boolean id_exists (
       const char *id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Checks for global existence of the repo id.
 
   CORBA::Boolean valid_container (
       const CORBA::DefinitionKind op_kind
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Is this operation valid for this container type?
diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp
index eac6599262e..97ad175d7ad 100644
--- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp
@@ -19,39 +19,39 @@ TAO_EmitsDef_i::~TAO_EmitsDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_EmitsDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EmitsDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Emits;
 }
 
-void 
-TAO_EmitsDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+void
+TAO_EmitsDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_EmitsDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+void
+TAO_EmitsDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_EmitsDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EmitsDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_EmitsDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_EmitsDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h
index 4759d541ab8..5b7141e3ee8 100644
--- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h
@@ -51,30 +51,30 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
diff --git a/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp b/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp
index 04ab433cb5b..288a13fdd66 100644
--- a/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp
@@ -21,23 +21,23 @@ TAO_EnumDef_i::~TAO_EnumDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_EnumDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EnumDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Enum;
 }
 
 CORBA::TypeCode_ptr
-TAO_EnumDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_EnumDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -50,26 +50,26 @@ TAO_EnumDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
                                             "name",
                                             name);
 
-  CORBA_EnumMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_EnumMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_enum_tc (id.c_str (),
                                                      name.c_str (),
                                                      members.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_EnumMemberSeq *
-TAO_EnumDef_i::members (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::members (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_EnumMemberSeq *
-TAO_EnumDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -107,18 +107,18 @@ TAO_EnumDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_EnumDef_i::members (const CORBA_EnumMemberSeq &members
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->members_i (members
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EnumDef_i::members_i (const CORBA_EnumMemberSeq &members
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
diff --git a/TAO/orbsvcs/IFR_Service/EnumDef_i.h b/TAO/orbsvcs/IFR_Service/EnumDef_i.h
index ba0aefb5c6f..202696fe9e0 100644
--- a/TAO/orbsvcs/IFR_Service/EnumDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/EnumDef_i.h
@@ -51,42 +51,42 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_EnumMemberSeq *members (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_EnumMemberSeq *members_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
       const CORBA_EnumMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
       const CORBA_EnumMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/EventDef_i.cpp b/TAO/orbsvcs/IFR_Service/EventDef_i.cpp
index b7e4549e081..92500cea21e 100644
--- a/TAO/orbsvcs/IFR_Service/EventDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/EventDef_i.cpp
@@ -18,32 +18,32 @@ TAO_EventDef_i::~TAO_EventDef_i (void)
 }
 
 void
-TAO_EventDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EventDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_EventDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_EventDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_EventDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EventDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_EventDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_EventDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -52,18 +52,18 @@ TAO_EventDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A
 
 CORBA::Boolean
 TAO_EventDef_i::is_a (const char *event_id
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   return this->is_a_i (event_id
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_EventDef_i::is_a_i (const char * /* event_id */
-                        TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                        ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -71,16 +71,16 @@ TAO_EventDef_i::is_a_i (const char * /* event_id */
 }
 
 CORBA_ValueDef_ptr
-TAO_EventDef_i::event (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EventDef_i::event (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ());
 
-  return this->event_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ValueDef_ptr
-TAO_EventDef_i::event_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_EventDef_i::event_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/EventDef_i.h b/TAO/orbsvcs/IFR_Service/EventDef_i.h
index e86186fc725..67b0fe1884f 100644
--- a/TAO/orbsvcs/IFR_Service/EventDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/EventDef_i.h
@@ -51,47 +51,47 @@ public:
   // Destructor
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Boolean is_a (
       const char *event_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *event_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef_ptr event (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef_ptr event_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp
index 3bffdcc71d6..6dc98d5c663 100644
--- a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp
@@ -24,45 +24,45 @@ TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ExceptionDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ExceptionDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Exception;
 }
 
 void
-TAO_ExceptionDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_ExceptionDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA_Contained::Description *
-TAO_ExceptionDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -73,15 +73,15 @@ TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_ExceptionDescription ed;
 
-  ed.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ed.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  ed.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ed.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -92,10 +92,10 @@ TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 
   ed.defined_in = container_id.c_str ();
 
-  ed.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ed.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  ed.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ed.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   retval->value <<= ed;
@@ -104,16 +104,16 @@ TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_ExceptionDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_ExceptionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -126,26 +126,26 @@ TAO_ExceptionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
                                             "name",
                                             name);
 
-  CORBA_StructMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_StructMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_exception_tc (id.c_str (),
                                                           name.c_str (),
                                                           members.in ()
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructMemberSeq *
-TAO_ExceptionDef_i::members (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::members (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_StructMemberSeq *
-TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -240,11 +240,11 @@ TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
       obj =
         this->repo_->servant_factory ()->create_objref (kind,
                                                         path.c_str ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[k].type_def = CORBA_IDLType::_narrow (obj.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
@@ -254,12 +254,12 @@ TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
 
       impl =
         this->repo_->servant_factory ()->create_idltype (member_key
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_IDLType_i> safety (impl);
 
-      retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -268,22 +268,22 @@ TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_ExceptionDef_i::members (const CORBA_StructMemberSeq &members
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->members_i (members
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
-  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count = members.length ();
@@ -317,7 +317,7 @@ TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members
 
           PortableServer::ObjectId_var oid =
             this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           CORBA::String_var path =
diff --git a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h
index 0a1d55cad82..d2f882f1a8a 100644
--- a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h
@@ -52,64 +52,64 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_StructMemberSeq *members (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_StructMemberSeq *members_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp
index 597ad4f0235..aa04971500c 100644
--- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp
@@ -21,39 +21,39 @@ TAO_FactoryDef_i::~TAO_FactoryDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_FactoryDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FactoryDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Factory;
 }
 
-void 
-TAO_FactoryDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+void
+TAO_FactoryDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_FactoryDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+void
+TAO_FactoryDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_FactoryDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FactoryDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_FactoryDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
+TAO_FactoryDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h
index 09718358b0c..6e5efac51a8 100644
--- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h
@@ -50,30 +50,30 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp
index a8a16e4178b..833621ce7e1 100644
--- a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp
@@ -19,39 +19,39 @@ TAO_FinderDef_i::~TAO_FinderDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_FinderDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FinderDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Finder;
 }
 
-void 
-TAO_FinderDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+void
+TAO_FinderDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_FinderDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+void
+TAO_FinderDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_FinderDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FinderDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_FinderDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
+TAO_FinderDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.h b/TAO/orbsvcs/IFR_Service/FinderDef_i.h
index ea9d60edcfa..a8cd01fe2c4 100644
--- a/TAO/orbsvcs/IFR_Service/FinderDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.h
@@ -50,30 +50,30 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
diff --git a/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp b/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp
index 42ccaf54ec2..fcf7f2e05f0 100644
--- a/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp
@@ -18,39 +18,39 @@ TAO_FixedDef_i::~TAO_FixedDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_FixedDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FixedDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Fixed;
 }
 
 void
-TAO_FixedDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FixedDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_FixedDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_FixedDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA::TypeCode_ptr
-TAO_FixedDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FixedDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_FixedDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_FixedDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -58,16 +58,16 @@ TAO_FixedDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_P
 }
 
 CORBA::UShort
-TAO_FixedDef_i::digits (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FixedDef_i::digits (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->digits_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->digits_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::UShort
-TAO_FixedDef_i::digits_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_FixedDef_i::digits_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -76,34 +76,34 @@ TAO_FixedDef_i::digits_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG
 
 void
 TAO_FixedDef_i::digits (CORBA::UShort digits
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->digits_i (digits
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */
-                          TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                          ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA::Short
-TAO_FixedDef_i::scale (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FixedDef_i::scale (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->scale_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->scale_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Short
-TAO_FixedDef_i::scale_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_FixedDef_i::scale_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -112,18 +112,18 @@ TAO_FixedDef_i::scale_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_
 
 void
 TAO_FixedDef_i::scale (CORBA::Short scale
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->scale_i (scale
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_FixedDef_i::scale_i (CORBA::Short /* scale */
-                       TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                       ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/FixedDef_i.h b/TAO/orbsvcs/IFR_Service/FixedDef_i.h
index 6ea79f0cc0b..7c264dc2f5f 100644
--- a/TAO/orbsvcs/IFR_Service/FixedDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/FixedDef_i.h
@@ -50,75 +50,75 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::UShort digits (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::UShort digits_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void digits (
       CORBA::UShort digits
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void digits_i (
       CORBA::UShort digits
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Short scale (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Short scale_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void scale (
       CORBA::Short scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void scale_i (
       CORBA::Short scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp b/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp
index 77617ed7ab9..966b10f2168 100644
--- a/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp
@@ -21,39 +21,39 @@ TAO_HomeDef_i::~TAO_HomeDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_HomeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_HomeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Home;
 }
 
 void
-TAO_HomeDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_HomeDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_HomeDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_HomeDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_HomeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_HomeDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -61,16 +61,16 @@ TAO_HomeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_AR
 }
 
 CORBA::TypeCode_ptr
-TAO_HomeDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_HomeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_HomeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -78,16 +78,16 @@ TAO_HomeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PA
 }
 
 IR::HomeDef_ptr
-TAO_HomeDef_i::base_home (TAO_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::base_home (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (IR::HomeDef::_nil ());
 
-  return this->base_home_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->base_home_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::HomeDef_ptr
-TAO_HomeDef_i::base_home_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_HomeDef_i::base_home_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -95,16 +95,16 @@ TAO_HomeDef_i::base_home_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A
 }
 
 IR::ComponentDef_ptr
-TAO_HomeDef_i::managed_component (TAO_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::managed_component (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (IR::ComponentDef::_nil ());
 
-  return this->managed_component_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->managed_component_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::ComponentDef_ptr
-TAO_HomeDef_i::managed_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_HomeDef_i::managed_component_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -112,16 +112,16 @@ TAO_HomeDef_i::managed_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_
 }
 
 IR::PrimaryKeyDef_ptr
-TAO_HomeDef_i::primary_key (TAO_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::primary_key (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (IR::PrimaryKeyDef::_nil ());
 
-  return this->primary_key_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->primary_key_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::PrimaryKeyDef_ptr
-TAO_HomeDef_i::primary_key_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_HomeDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -129,16 +129,16 @@ TAO_HomeDef_i::primary_key_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE
 }
 
 IR::FactoryDefSeq *
-TAO_HomeDef_i::factories (TAO_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::factories (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->factories_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->factories_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::FactoryDefSeq *
-TAO_HomeDef_i::factories_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_HomeDef_i::factories_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -146,16 +146,16 @@ TAO_HomeDef_i::factories_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A
 }
 
 IR::FinderDefSeq *
-TAO_HomeDef_i::finders (TAO_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::finders (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->finders_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->finders_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::FinderDefSeq *
-TAO_HomeDef_i::finders_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_HomeDef_i::finders_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -163,16 +163,16 @@ TAO_HomeDef_i::finders_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG
 }
 
 CORBA::Boolean
-TAO_HomeDef_i::is_basic (TAO_ENV_SINGLE_ARG_DECL)
+TAO_HomeDef_i::is_basic (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_basic_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->is_basic_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_HomeDef_i::is_basic_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_HomeDef_i::is_basic_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -184,7 +184,7 @@ TAO_HomeDef_i::create_primary_key (const char *id,
                                    const char *name,
                                    const char *version,
                                    CORBA_ValueDef_ptr primary_key
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::PrimaryKeyDef::_nil ());
@@ -193,7 +193,7 @@ TAO_HomeDef_i::create_primary_key (const char *id,
                                      name,
                                      version,
                                      primary_key
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 IR::PrimaryKeyDef_ptr
@@ -201,7 +201,7 @@ TAO_HomeDef_i::create_primary_key_i (const char * /* id */,
                                      const char * /* name */,
                                      const char * /* version */,
                                      CORBA_ValueDef_ptr /* primary_key */
-                                     TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                                     ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -214,7 +214,7 @@ TAO_HomeDef_i::create_factory (const char *id,
                                const char *version,
                                const CORBA_ParDescriptionSeq &params,
                                const CORBA_ExceptionDefSeq &exceptions
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::FactoryDef::_nil ());
@@ -224,7 +224,7 @@ TAO_HomeDef_i::create_factory (const char *id,
                                  version,
                                  params,
                                  exceptions
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 IR::FactoryDef_ptr
@@ -234,7 +234,7 @@ TAO_HomeDef_i::create_factory_i (
     const char * /* version */,
     const CORBA_ParDescriptionSeq & /* params */,
     const CORBA_ExceptionDefSeq & /* exceptions */
-    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
+    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -248,7 +248,7 @@ TAO_HomeDef_i::create_finder (const char *id,
                               const char *version,
                               const CORBA_ParDescriptionSeq &params,
                               const CORBA_ExceptionDefSeq &exceptions
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::FinderDef::_nil ());
@@ -258,7 +258,7 @@ TAO_HomeDef_i::create_finder (const char *id,
                                 version,
                                 params,
                                 exceptions
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 IR::FinderDef_ptr
@@ -268,7 +268,7 @@ TAO_HomeDef_i::create_finder_i (
     const char * /* version */,
     const CORBA_ParDescriptionSeq & /* params */,
     const CORBA_ExceptionDefSeq & /* exceptions */
-    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
+    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/IFR_Service/HomeDef_i.h b/TAO/orbsvcs/IFR_Service/HomeDef_i.h
index 473bf92c399..d204facf67e 100644
--- a/TAO/orbsvcs/IFR_Service/HomeDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/HomeDef_i.h
@@ -52,103 +52,103 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual IR::HomeDef_ptr base_home (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::HomeDef_ptr base_home_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::ComponentDef_ptr managed_component (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::ComponentDef_ptr managed_component_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::PrimaryKeyDef_ptr primary_key (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::PrimaryKeyDef_ptr primary_key_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::FactoryDefSeq *factories (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::FactoryDefSeq *factories_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::FinderDefSeq *finders (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::FinderDefSeq *finders_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_basic (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_basic_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -157,7 +157,7 @@ public:
       const char *name,
       const char *version,
       CORBA_ValueDef_ptr primary_key
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -166,7 +166,7 @@ public:
       const char *name,
       const char *version,
       CORBA_ValueDef_ptr primary_key
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -176,7 +176,7 @@ public:
       const char *version,
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -186,7 +186,7 @@ public:
       const char *version,
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -196,7 +196,7 @@ public:
       const char *version,
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -206,7 +206,7 @@ public:
       const char *version,
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/IDLType_i.h b/TAO/orbsvcs/IFR_Service/IDLType_i.h
index 3090d1cf163..faac04d8072 100644
--- a/TAO/orbsvcs/IFR_Service/IDLType_i.h
+++ b/TAO/orbsvcs/IFR_Service/IDLType_i.h
@@ -54,13 +54,13 @@ public:
   // Destructor.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Defined in concrete classes.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Defined in concrete classes.
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
index 571fa45f9c4..c45f8003fce 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
@@ -163,31 +163,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::DefinitionKind result);
@@ -205,44 +205,44 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_I
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_IRObject *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -254,7 +254,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -264,10 +264,10 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -284,31 +284,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -325,44 +325,44 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObje
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_IRObject *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -370,7 +370,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -380,10 +380,10 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -416,17 +416,17 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::~_TAO_CORBA_IRObject_Strategized_P
 _TAO_CORBA_IRObject_Proxy_Impl&
 _TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_IRObject *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -436,7 +436,7 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_IRObject_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -506,7 +506,7 @@ _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl (
 
 CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -522,7 +522,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind (
       _collocated_tao_target_->_object_key (),
       "def_kind",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -531,13 +531,13 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind (
           "IDL:omg.org/CORBA/IRObject:1.0"
         )
     )->def_kind (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -551,7 +551,7 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy (
       _collocated_tao_target_->_object_key (),
       "destroy",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -560,7 +560,7 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy (
           "IDL:omg.org/CORBA/IRObject:1.0"
         )
     )->destroy (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
   return;
 }
@@ -589,7 +589,7 @@ void POA_CORBA_IRObject::_get_def_kind_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject *_tao_impl =
@@ -610,18 +610,18 @@ void POA_CORBA_IRObject::_get_def_kind_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->def_kind (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -629,7 +629,7 @@ void POA_CORBA_IRObject::_get_def_kind_skel (
       CORBA::DefinitionKind _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -637,12 +637,12 @@ void POA_CORBA_IRObject::_get_def_kind_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -670,7 +670,7 @@ void POA_CORBA_IRObject::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject *_tao_impl =
@@ -691,24 +691,24 @@ void POA_CORBA_IRObject::destroy_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->destroy (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -716,12 +716,12 @@ void POA_CORBA_IRObject::destroy_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -742,7 +742,7 @@ void POA_CORBA_IRObject::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -752,7 +752,7 @@ void POA_CORBA_IRObject::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -765,11 +765,11 @@ void POA_CORBA_IRObject::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -782,7 +782,7 @@ void POA_CORBA_IRObject::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference;
@@ -801,7 +801,7 @@ void POA_CORBA_IRObject::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -828,10 +828,10 @@ void POA_CORBA_IRObject::_interface_skel (
 
 CORBA::Boolean POA_CORBA_IRObject::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -853,12 +853,12 @@ void* POA_CORBA_IRObject::_downcast (
   return 0;
 }
 
-void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -868,9 +868,9 @@ const char* POA_CORBA_IRObject::_interface_repository_id (void) const
 }
 
 CORBA_IRObject*
-POA_CORBA_IRObject::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_IRObject::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -1036,31 +1036,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (char * result);
@@ -1078,44 +1078,44 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::TAO_ServerRequestInfo_CORBA_Contai
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_id_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_id_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_id_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_id_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_id_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_id_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1127,7 +1127,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_id_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1137,10 +1137,10 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_id_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1158,31 +1158,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
     ,
     const char * id
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1201,7 +1201,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contai
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl,
     const char * id
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1209,12 +1209,12 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contai
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1230,25 +1230,25 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (TAO_ENV_SINGLE_ARG_DECL
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_id_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_id_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_id_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_id_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1256,7 +1256,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_id_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1266,10 +1266,10 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_id_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_Contained_name_get : public TAO_ServerRequestInfo
@@ -1279,31 +1279,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (char * result);
@@ -1321,44 +1321,44 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::TAO_ServerRequestInfo_CORBA_Cont
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_name_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_name_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_name_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_name_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1370,7 +1370,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_name_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1380,10 +1380,10 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_name_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1401,31 +1401,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
     ,
     const char * name
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1444,7 +1444,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Cont
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl,
     const char * name
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1452,12 +1452,12 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Cont
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1473,25 +1473,25 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (TAO_ENV_SINGLE_ARG_DE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_name_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_name_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_name_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_name_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1499,7 +1499,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_name_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1509,10 +1509,10 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_name_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_Contained_version_get : public TAO_ServerRequestInfo
@@ -1522,31 +1522,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (char * result);
@@ -1564,44 +1564,44 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::TAO_ServerRequestInfo_CORBA_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_version_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_version_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_version_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_version_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_version_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_version_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1613,7 +1613,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_version_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1623,10 +1623,10 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_version_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1644,31 +1644,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
     ,
     const char * version
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1687,7 +1687,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_C
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl,
     const char * version
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1695,12 +1695,12 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1716,25 +1716,25 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_version_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_version_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_version_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_version_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1742,7 +1742,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_version_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1752,10 +1752,10 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_version_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_Contained_defined_in_get : public TAO_ServerRequestInfo
@@ -1765,31 +1765,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Container_ptr result);
@@ -1807,44 +1807,44 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1856,7 +1856,7 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (TAO_ENV_SINGLE_ARG
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1866,10 +1866,10 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_most_derived_interf
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1886,31 +1886,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (char * result);
@@ -1928,44 +1928,44 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::TAO_ServerRequestInfo_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1977,7 +1977,7 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (TAO_ENV_SINGLE_
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1987,10 +1987,10 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_most_derived_int
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2007,31 +2007,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Repository_ptr result);
@@ -2049,44 +2049,44 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::TAO_ServerReque
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2098,7 +2098,7 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (TAO_ENV
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2108,10 +2108,10 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_most_der
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2128,31 +2128,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Contained::Description * result);
@@ -2170,44 +2170,44 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::TAO_ServerRequestInfo_CORBA_Cont
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_describe::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_describe::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_describe::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_describe::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_describe::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_describe::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2219,7 +2219,7 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_describe::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2229,10 +2229,10 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_describe::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2252,31 +2252,31 @@ public:
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -2299,7 +2299,7 @@ TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Containe
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2309,12 +2309,12 @@ TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Containe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_move::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_move::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2336,25 +2336,25 @@ TAO_ServerRequestInfo_CORBA_Contained_move::arguments (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_move::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_move::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_move::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Contained_move::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2362,7 +2362,7 @@ TAO_ServerRequestInfo_CORBA_Contained_move::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_move::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2372,10 +2372,10 @@ TAO_ServerRequestInfo_CORBA_Contained_move::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_move::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -2408,17 +2408,17 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::~_TAO_CORBA_Contained_Strategized
 _TAO_CORBA_Contained_Proxy_Impl&
 _TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_Contained *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -2428,7 +2428,7 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_Contained_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -2498,7 +2498,7 @@ _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
 
 char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2514,7 +2514,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
       _collocated_tao_target_->_object_key (),
       "id",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2523,14 +2523,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->id (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
     CORBA_Object *_collocated_tao_target_,
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2544,7 +2544,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
       _collocated_tao_target_->_object_key (),
       "id",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2554,14 +2554,14 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
         )
     )->id (
         id
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2577,7 +2577,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
       _collocated_tao_target_->_object_key (),
       "name",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2586,14 +2586,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->name (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
     CORBA_Object *_collocated_tao_target_,
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2607,7 +2607,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
       _collocated_tao_target_->_object_key (),
       "name",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2617,14 +2617,14 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
         )
     )->name (
         name
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2640,7 +2640,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
       _collocated_tao_target_->_object_key (),
       "version",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2649,14 +2649,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->version (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
     CORBA_Object *_collocated_tao_target_,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2670,7 +2670,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
       _collocated_tao_target_->_object_key (),
       "version",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2680,14 +2680,14 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
         )
     )->version (
         version
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2703,7 +2703,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in (
       _collocated_tao_target_->_object_key (),
       "defined_in",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2712,13 +2712,13 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->defined_in (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2734,7 +2734,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name (
       _collocated_tao_target_->_object_key (),
       "absolute_name",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2743,13 +2743,13 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->absolute_name (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_repository (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2765,7 +2765,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit
       _collocated_tao_target_->_object_key (),
       "containing_repository",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2774,13 +2774,13 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->containing_repository (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2796,7 +2796,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe
       _collocated_tao_target_->_object_key (),
       "describe",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2805,7 +2805,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->describe (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -2814,7 +2814,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2828,7 +2828,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move (
       _collocated_tao_target_->_object_key (),
       "move",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2840,7 +2840,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move (
         new_container,
         new_name,
         new_version
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2870,7 +2870,7 @@ void POA_CORBA_Contained::_get_id_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -2891,18 +2891,18 @@ void POA_CORBA_Contained::_get_id_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->id (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2911,7 +2911,7 @@ void POA_CORBA_Contained::_get_id_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2919,12 +2919,12 @@ void POA_CORBA_Contained::_get_id_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2952,7 +2952,7 @@ void POA_CORBA_Contained::_set_id_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2981,25 +2981,25 @@ void POA_CORBA_Contained::_set_id_skel (
       _tao_upcall,
       _tao_impl,
       id.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->id (
           id.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3007,12 +3007,12 @@ void POA_CORBA_Contained::_set_id_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3033,7 +3033,7 @@ void POA_CORBA_Contained::_get_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3054,18 +3054,18 @@ void POA_CORBA_Contained::_get_name_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->name (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3074,7 +3074,7 @@ void POA_CORBA_Contained::_get_name_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3082,12 +3082,12 @@ void POA_CORBA_Contained::_get_name_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3115,7 +3115,7 @@ void POA_CORBA_Contained::_set_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3144,25 +3144,25 @@ void POA_CORBA_Contained::_set_name_skel (
       _tao_upcall,
       _tao_impl,
       name.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->name (
           name.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3170,12 +3170,12 @@ void POA_CORBA_Contained::_set_name_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3196,7 +3196,7 @@ void POA_CORBA_Contained::_get_version_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3217,18 +3217,18 @@ void POA_CORBA_Contained::_get_version_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->version (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3237,7 +3237,7 @@ void POA_CORBA_Contained::_get_version_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3245,12 +3245,12 @@ void POA_CORBA_Contained::_get_version_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3278,7 +3278,7 @@ void POA_CORBA_Contained::_set_version_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3307,25 +3307,25 @@ void POA_CORBA_Contained::_set_version_skel (
       _tao_upcall,
       _tao_impl,
       version.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->version (
           version.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3333,12 +3333,12 @@ void POA_CORBA_Contained::_set_version_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3359,7 +3359,7 @@ void POA_CORBA_Contained::_get_defined_in_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3380,18 +3380,18 @@ void POA_CORBA_Contained::_get_defined_in_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->defined_in (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3400,7 +3400,7 @@ void POA_CORBA_Contained::_get_defined_in_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3408,12 +3408,12 @@ void POA_CORBA_Contained::_get_defined_in_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3441,7 +3441,7 @@ void POA_CORBA_Contained::_get_absolute_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3462,18 +3462,18 @@ void POA_CORBA_Contained::_get_absolute_name_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->absolute_name (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3482,7 +3482,7 @@ void POA_CORBA_Contained::_get_absolute_name_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3490,12 +3490,12 @@ void POA_CORBA_Contained::_get_absolute_name_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3523,7 +3523,7 @@ void POA_CORBA_Contained::_get_containing_repository_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3544,18 +3544,18 @@ void POA_CORBA_Contained::_get_containing_repository_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->containing_repository (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3564,7 +3564,7 @@ void POA_CORBA_Contained::_get_containing_repository_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3572,12 +3572,12 @@ void POA_CORBA_Contained::_get_containing_repository_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3605,7 +3605,7 @@ void POA_CORBA_Contained::describe_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3626,18 +3626,18 @@ void POA_CORBA_Contained::describe_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->describe (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3646,7 +3646,7 @@ void POA_CORBA_Contained::describe_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3654,12 +3654,12 @@ void POA_CORBA_Contained::describe_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3687,7 +3687,7 @@ void POA_CORBA_Contained::move_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3722,12 +3722,12 @@ void POA_CORBA_Contained::move_skel (
       new_container.in (),
       new_name.in (),
       new_version.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -3736,13 +3736,13 @@ void POA_CORBA_Contained::move_skel (
           new_container.in (),
           new_name.in (),
           new_version.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3750,12 +3750,12 @@ void POA_CORBA_Contained::move_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3776,7 +3776,7 @@ void POA_CORBA_Contained::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3786,7 +3786,7 @@ void POA_CORBA_Contained::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3799,11 +3799,11 @@ void POA_CORBA_Contained::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3816,7 +3816,7 @@ void POA_CORBA_Contained::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference;
@@ -3835,7 +3835,7 @@ void POA_CORBA_Contained::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -3862,10 +3862,10 @@ void POA_CORBA_Contained::_interface_skel (
 
 CORBA::Boolean POA_CORBA_Contained::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -3890,12 +3890,12 @@ void* POA_CORBA_Contained::_downcast (
   return 0;
 }
 
-void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -3905,9 +3905,9 @@ const char* POA_CORBA_Contained::_interface_repository_id (void) const
 }
 
 CORBA_Contained*
-POA_CORBA_Contained::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_Contained::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -4080,31 +4080,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Container *tao_impl
     ,
     const char * search_name
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Contained_ptr result);
@@ -4124,7 +4124,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Contai
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Container *tao_impl,
     const char * search_name
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4132,12 +4132,12 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Contai
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4153,25 +4153,25 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (TAO_ENV_SINGLE_ARG_DECL
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_lookup::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_lookup::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_lookup::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_lookup::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4183,7 +4183,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_lookup::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4193,10 +4193,10 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_lookup::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4215,31 +4215,31 @@ public:
     ,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ContainedSeq * result);
@@ -4261,7 +4261,7 @@ TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Cont
     POA_CORBA_Container *tao_impl,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4270,12 +4270,12 @@ TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Cont
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_contents::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_contents::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4294,25 +4294,25 @@ TAO_ServerRequestInfo_CORBA_Container_contents::arguments (TAO_ENV_SINGLE_ARG_DE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_contents::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_contents::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_contents::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4324,7 +4324,7 @@ TAO_ServerRequestInfo_CORBA_Container_contents::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_contents::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4334,10 +4334,10 @@ TAO_ServerRequestInfo_CORBA_Container_contents::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_contents::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4358,31 +4358,31 @@ public:
     const CORBA::Long & levels_to_search,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ContainedSeq * result);
@@ -4408,7 +4408,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_C
     const CORBA::Long & levels_to_search,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4419,12 +4419,12 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4449,25 +4449,25 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_lookup_name::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_lookup_name::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4479,7 +4479,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4489,10 +4489,10 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4512,31 +4512,31 @@ public:
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited,
     const CORBA::Long & max_returned_objs
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Container::DescriptionSeq * result);
@@ -4560,7 +4560,7 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_C
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited,
     const CORBA::Long & max_returned_objs
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4570,12 +4570,12 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4597,25 +4597,25 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (TAO_ENV_SING
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_describe_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_describe_contents::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4627,7 +4627,7 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (TAO_ENV_SINGLE_
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4637,10 +4637,10 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_most_derived_int
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4660,31 +4660,31 @@ public:
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ModuleDef_ptr result);
@@ -4708,7 +4708,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4718,12 +4718,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4745,25 +4745,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_module::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_module::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_module::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_module::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4775,7 +4775,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_module::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4785,10 +4785,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_module::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4810,31 +4810,31 @@ public:
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ConstantDef_ptr result);
@@ -4862,7 +4862,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_COR
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4874,12 +4874,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4907,25 +4907,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_constant::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_constant::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_constant::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_constant::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4937,7 +4937,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_constant::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4947,10 +4947,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_constant::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4971,31 +4971,31 @@ public:
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_StructDef_ptr result);
@@ -5021,7 +5021,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5032,12 +5032,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5062,25 +5062,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_struct::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_struct::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_struct::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_struct::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5092,7 +5092,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_struct::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5102,10 +5102,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_struct::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5127,31 +5127,31 @@ public:
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_UnionDef_ptr result);
@@ -5179,7 +5179,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5191,12 +5191,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5224,25 +5224,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (TAO_ENV_SINGLE_AR
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_union::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_union::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_union::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_union::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5254,7 +5254,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::result (TAO_ENV_SINGLE_ARG_D
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_union::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5264,10 +5264,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::target_most_derived_interfac
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_union::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5288,31 +5288,31 @@ public:
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_EnumDef_ptr result);
@@ -5338,7 +5338,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_C
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5349,12 +5349,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5379,25 +5379,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_enum::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_enum::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_enum::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_enum::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5409,7 +5409,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_enum::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5419,10 +5419,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_enum::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5443,31 +5443,31 @@ public:
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_AliasDef_ptr result);
@@ -5493,7 +5493,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5504,12 +5504,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5534,25 +5534,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (TAO_ENV_SINGLE_AR
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_alias::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_alias::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_alias::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_alias::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5564,7 +5564,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::result (TAO_ENV_SINGLE_ARG_D
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_alias::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5574,10 +5574,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::target_most_derived_interfac
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_alias::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5598,31 +5598,31 @@ public:
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDef_ptr result);
@@ -5648,7 +5648,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CO
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5659,12 +5659,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5689,25 +5689,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (TAO_ENV_SINGL
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_interface::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_interface::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5719,7 +5719,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::result (TAO_ENV_SINGLE_A
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_interface::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5729,10 +5729,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::target_most_derived_inte
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_interface::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5759,31 +5759,31 @@ public:
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef_ptr result);
@@ -5821,7 +5821,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5838,12 +5838,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5886,25 +5886,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (TAO_ENV_SINGLE_AR
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_value::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_value::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_value::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_value::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5916,7 +5916,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::result (TAO_ENV_SINGLE_ARG_D
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_value::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5926,10 +5926,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::target_most_derived_interfac
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_value::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5950,31 +5950,31 @@ public:
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueBoxDef_ptr result);
@@ -6000,7 +6000,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CO
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6011,12 +6011,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6041,25 +6041,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (TAO_ENV_SINGL
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_value_box::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_value_box::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6071,7 +6071,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (TAO_ENV_SINGLE_A
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6081,10 +6081,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_most_derived_inte
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6105,31 +6105,31 @@ public:
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ExceptionDef_ptr result);
@@ -6155,7 +6155,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CO
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6166,12 +6166,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6196,25 +6196,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (TAO_ENV_SINGL
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_exception::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_exception::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_exception::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_exception::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6226,7 +6226,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::result (TAO_ENV_SINGLE_A
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_exception::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6236,10 +6236,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::target_most_derived_inte
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_exception::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6259,31 +6259,31 @@ public:
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_NativeDef_ptr result);
@@ -6307,7 +6307,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6317,12 +6317,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6344,25 +6344,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_native::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_native::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_native::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_native::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6374,7 +6374,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_native::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6384,10 +6384,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_native::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6408,31 +6408,31 @@ public:
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_AbstractInterfaceDef_ptr result);
@@ -6458,7 +6458,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerReque
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6469,12 +6469,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerReque
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6499,25 +6499,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (TAO_
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6529,7 +6529,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (TAO_ENV
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6539,10 +6539,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_most_der
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6563,31 +6563,31 @@ public:
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_LocalInterfaceDef_ptr result);
@@ -6613,7 +6613,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestI
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6624,12 +6624,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestI
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6654,25 +6654,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (TAO_ENV
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_local_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_local_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6684,7 +6684,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (TAO_ENV_SI
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6694,10 +6694,10 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_most_derive
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6737,17 +6737,17 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::~_TAO_CORBA_Container_Strategized
 _TAO_CORBA_Container_Proxy_Impl&
 _TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_Container *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -6757,7 +6757,7 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_Container_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -6828,7 +6828,7 @@ _TAO_CORBA_Container_ThruPOA_Proxy_Impl::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
 CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup (
     CORBA_Object *_collocated_tao_target_,
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6844,7 +6844,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup (
       _collocated_tao_target_->_object_key (),
       "lookup",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6854,7 +6854,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup (
         )
     )->lookup (
         search_name
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -6862,7 +6862,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents (
     CORBA_Object *_collocated_tao_target_,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6878,7 +6878,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents (
       _collocated_tao_target_->_object_key (),
       "contents",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6889,7 +6889,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents (
     )->contents (
         limit_type,
         exclude_inherited
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -6899,7 +6899,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6915,7 +6915,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name (
       _collocated_tao_target_->_object_key (),
       "lookup_name",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6928,7 +6928,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name (
         levels_to_search,
         limit_type,
         exclude_inherited
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -6937,7 +6937,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6953,7 +6953,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr
       _collocated_tao_target_->_object_key (),
       "describe_contents",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6965,7 +6965,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr
         limit_type,
         exclude_inherited,
         max_returned_objs
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -6974,7 +6974,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6990,7 +6990,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module (
       _collocated_tao_target_->_object_key (),
       "create_module",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7002,7 +7002,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module (
         id,
         name,
         version
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7013,7 +7013,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7029,7 +7029,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant (
       _collocated_tao_target_->_object_key (),
       "create_constant",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7043,7 +7043,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant (
         version,
         type,
         value
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7053,7 +7053,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7069,7 +7069,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct (
       _collocated_tao_target_->_object_key (),
       "create_struct",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7082,7 +7082,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct (
         name,
         version,
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7093,7 +7093,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7109,7 +7109,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union (
       _collocated_tao_target_->_object_key (),
       "create_union",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7123,7 +7123,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union (
         version,
         discriminator_type,
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7133,7 +7133,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7149,7 +7149,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum (
       _collocated_tao_target_->_object_key (),
       "create_enum",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7162,7 +7162,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum (
         name,
         version,
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7172,7 +7172,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7188,7 +7188,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias (
       _collocated_tao_target_->_object_key (),
       "create_alias",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7201,7 +7201,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias (
         name,
         version,
         original_type
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7211,7 +7211,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7227,7 +7227,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface
       _collocated_tao_target_->_object_key (),
       "create_interface",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7240,7 +7240,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface
         name,
         version,
         base_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7256,7 +7256,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7272,7 +7272,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value (
       _collocated_tao_target_->_object_key (),
       "create_value",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7291,7 +7291,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value (
         abstract_base_values,
         supported_interfaces,
         initializers
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7301,7 +7301,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7317,7 +7317,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box
       _collocated_tao_target_->_object_key (),
       "create_value_box",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7330,7 +7330,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box
         name,
         version,
         original_type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7340,7 +7340,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7356,7 +7356,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception
       _collocated_tao_target_->_object_key (),
       "create_exception",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7369,7 +7369,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception
         name,
         version,
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7378,7 +7378,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7394,7 +7394,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native (
       _collocated_tao_target_->_object_key (),
       "create_native",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7406,7 +7406,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native (
         id,
         name,
         version
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7416,7 +7416,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7432,7 +7432,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a
       _collocated_tao_target_->_object_key (),
       "create_abstract_interface",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7445,7 +7445,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a
         name,
         version,
         base_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7455,7 +7455,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7471,7 +7471,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca
       _collocated_tao_target_->_object_key (),
       "create_local_interface",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7484,7 +7484,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca
         name,
         version,
         base_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7513,7 +7513,7 @@ void POA_CORBA_Container::lookup_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7542,19 +7542,19 @@ void POA_CORBA_Container::lookup_skel (
       _tao_upcall,
       _tao_impl,
       search_name.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->lookup (
           search_name.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7563,7 +7563,7 @@ void POA_CORBA_Container::lookup_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7571,12 +7571,12 @@ void POA_CORBA_Container::lookup_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7604,7 +7604,7 @@ void POA_CORBA_Container::contents_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7636,12 +7636,12 @@ void POA_CORBA_Container::contents_skel (
       _tao_impl,
       limit_type,
       exclude_inherited
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -7649,7 +7649,7 @@ void POA_CORBA_Container::contents_skel (
       _tao_impl->contents (
           limit_type,
           exclude_inherited
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7658,7 +7658,7 @@ void POA_CORBA_Container::contents_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7666,12 +7666,12 @@ void POA_CORBA_Container::contents_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7699,7 +7699,7 @@ void POA_CORBA_Container::lookup_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7737,12 +7737,12 @@ void POA_CORBA_Container::lookup_name_skel (
       levels_to_search,
       limit_type,
       exclude_inherited
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -7752,7 +7752,7 @@ void POA_CORBA_Container::lookup_name_skel (
           levels_to_search,
           limit_type,
           exclude_inherited
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7761,7 +7761,7 @@ void POA_CORBA_Container::lookup_name_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7769,12 +7769,12 @@ void POA_CORBA_Container::lookup_name_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7802,7 +7802,7 @@ void POA_CORBA_Container::describe_contents_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7837,12 +7837,12 @@ void POA_CORBA_Container::describe_contents_skel (
       limit_type,
       exclude_inherited,
       max_returned_objs
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -7851,7 +7851,7 @@ void POA_CORBA_Container::describe_contents_skel (
           limit_type,
           exclude_inherited,
           max_returned_objs
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7860,7 +7860,7 @@ void POA_CORBA_Container::describe_contents_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7868,12 +7868,12 @@ void POA_CORBA_Container::describe_contents_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7901,7 +7901,7 @@ void POA_CORBA_Container::create_module_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7936,12 +7936,12 @@ void POA_CORBA_Container::create_module_skel (
       id.in (),
       name.in (),
       version.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -7950,7 +7950,7 @@ void POA_CORBA_Container::create_module_skel (
           id.in (),
           name.in (),
           version.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7959,7 +7959,7 @@ void POA_CORBA_Container::create_module_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7967,12 +7967,12 @@ void POA_CORBA_Container::create_module_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8000,7 +8000,7 @@ void POA_CORBA_Container::create_constant_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8041,12 +8041,12 @@ void POA_CORBA_Container::create_constant_skel (
       version.in (),
       type.in (),
       value
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8057,7 +8057,7 @@ void POA_CORBA_Container::create_constant_skel (
           version.in (),
           type.in (),
           value
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8066,7 +8066,7 @@ void POA_CORBA_Container::create_constant_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8074,12 +8074,12 @@ void POA_CORBA_Container::create_constant_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8107,7 +8107,7 @@ void POA_CORBA_Container::create_struct_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8145,12 +8145,12 @@ void POA_CORBA_Container::create_struct_skel (
       name.in (),
       version.in (),
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8160,7 +8160,7 @@ void POA_CORBA_Container::create_struct_skel (
           name.in (),
           version.in (),
           members
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8169,7 +8169,7 @@ void POA_CORBA_Container::create_struct_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8177,12 +8177,12 @@ void POA_CORBA_Container::create_struct_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8210,7 +8210,7 @@ void POA_CORBA_Container::create_union_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8251,12 +8251,12 @@ void POA_CORBA_Container::create_union_skel (
       version.in (),
       discriminator_type.in (),
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8267,7 +8267,7 @@ void POA_CORBA_Container::create_union_skel (
           version.in (),
           discriminator_type.in (),
           members
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8276,7 +8276,7 @@ void POA_CORBA_Container::create_union_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8284,12 +8284,12 @@ void POA_CORBA_Container::create_union_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8317,7 +8317,7 @@ void POA_CORBA_Container::create_enum_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8355,12 +8355,12 @@ void POA_CORBA_Container::create_enum_skel (
       name.in (),
       version.in (),
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8370,7 +8370,7 @@ void POA_CORBA_Container::create_enum_skel (
           name.in (),
           version.in (),
           members
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8379,7 +8379,7 @@ void POA_CORBA_Container::create_enum_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8387,12 +8387,12 @@ void POA_CORBA_Container::create_enum_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8420,7 +8420,7 @@ void POA_CORBA_Container::create_alias_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8458,12 +8458,12 @@ void POA_CORBA_Container::create_alias_skel (
       name.in (),
       version.in (),
       original_type.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8473,7 +8473,7 @@ void POA_CORBA_Container::create_alias_skel (
           name.in (),
           version.in (),
           original_type.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8482,7 +8482,7 @@ void POA_CORBA_Container::create_alias_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8490,12 +8490,12 @@ void POA_CORBA_Container::create_alias_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8523,7 +8523,7 @@ void POA_CORBA_Container::create_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8561,12 +8561,12 @@ void POA_CORBA_Container::create_interface_skel (
       name.in (),
       version.in (),
       base_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8576,7 +8576,7 @@ void POA_CORBA_Container::create_interface_skel (
           name.in (),
           version.in (),
           base_interfaces
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8585,7 +8585,7 @@ void POA_CORBA_Container::create_interface_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8593,12 +8593,12 @@ void POA_CORBA_Container::create_interface_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8626,7 +8626,7 @@ void POA_CORBA_Container::create_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8682,12 +8682,12 @@ void POA_CORBA_Container::create_value_skel (
       abstract_base_values,
       supported_interfaces,
       initializers
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8703,7 +8703,7 @@ void POA_CORBA_Container::create_value_skel (
           abstract_base_values,
           supported_interfaces,
           initializers
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8712,7 +8712,7 @@ void POA_CORBA_Container::create_value_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8720,12 +8720,12 @@ void POA_CORBA_Container::create_value_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8753,7 +8753,7 @@ void POA_CORBA_Container::create_value_box_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8791,12 +8791,12 @@ void POA_CORBA_Container::create_value_box_skel (
       name.in (),
       version.in (),
       original_type_def.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8806,7 +8806,7 @@ void POA_CORBA_Container::create_value_box_skel (
           name.in (),
           version.in (),
           original_type_def.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8815,7 +8815,7 @@ void POA_CORBA_Container::create_value_box_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8823,12 +8823,12 @@ void POA_CORBA_Container::create_value_box_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8856,7 +8856,7 @@ void POA_CORBA_Container::create_exception_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8894,12 +8894,12 @@ void POA_CORBA_Container::create_exception_skel (
       name.in (),
       version.in (),
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8909,7 +8909,7 @@ void POA_CORBA_Container::create_exception_skel (
           name.in (),
           version.in (),
           members
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8918,7 +8918,7 @@ void POA_CORBA_Container::create_exception_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8926,12 +8926,12 @@ void POA_CORBA_Container::create_exception_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8959,7 +8959,7 @@ void POA_CORBA_Container::create_native_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8994,12 +8994,12 @@ void POA_CORBA_Container::create_native_skel (
       id.in (),
       name.in (),
       version.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9008,7 +9008,7 @@ void POA_CORBA_Container::create_native_skel (
           id.in (),
           name.in (),
           version.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9017,7 +9017,7 @@ void POA_CORBA_Container::create_native_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -9025,12 +9025,12 @@ void POA_CORBA_Container::create_native_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9058,7 +9058,7 @@ void POA_CORBA_Container::create_abstract_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9096,12 +9096,12 @@ void POA_CORBA_Container::create_abstract_interface_skel (
       name.in (),
       version.in (),
       base_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9111,7 +9111,7 @@ void POA_CORBA_Container::create_abstract_interface_skel (
           name.in (),
           version.in (),
           base_interfaces
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9120,7 +9120,7 @@ void POA_CORBA_Container::create_abstract_interface_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -9128,12 +9128,12 @@ void POA_CORBA_Container::create_abstract_interface_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9161,7 +9161,7 @@ void POA_CORBA_Container::create_local_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9199,12 +9199,12 @@ void POA_CORBA_Container::create_local_interface_skel (
       name.in (),
       version.in (),
       base_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9214,7 +9214,7 @@ void POA_CORBA_Container::create_local_interface_skel (
           name.in (),
           version.in (),
           base_interfaces
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9223,7 +9223,7 @@ void POA_CORBA_Container::create_local_interface_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -9231,12 +9231,12 @@ void POA_CORBA_Container::create_local_interface_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9264,7 +9264,7 @@ void POA_CORBA_Container::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9274,7 +9274,7 @@ void POA_CORBA_Container::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9287,11 +9287,11 @@ void POA_CORBA_Container::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9304,7 +9304,7 @@ void POA_CORBA_Container::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference;
@@ -9323,7 +9323,7 @@ void POA_CORBA_Container::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9350,10 +9350,10 @@ void POA_CORBA_Container::_interface_skel (
 
 CORBA::Boolean POA_CORBA_Container::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9378,12 +9378,12 @@ void* POA_CORBA_Container::_downcast (
   return 0;
 }
 
-void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -9393,9 +9393,9 @@ const char* POA_CORBA_Container::_interface_repository_id (void) const
 }
 
 CORBA_Container*
-POA_CORBA_Container::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_Container::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -9531,31 +9531,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IDLType *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -9573,44 +9573,44 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::TAO_ServerRequestInfo_CORBA_IDLTyp
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_IDLType *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_IDLType_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_IDLType_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_IDLType_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_IDLType_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9622,7 +9622,7 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -9632,10 +9632,10 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -9675,17 +9675,17 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::~_TAO_CORBA_IDLType_Strategized_Pro
 _TAO_CORBA_IDLType_Proxy_Impl&
 _TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_IDLType *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -9695,7 +9695,7 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_IDLType_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -9765,7 +9765,7 @@ _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl (vo
 
 CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9781,7 +9781,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type (
       _collocated_tao_target_->_object_key (),
       "type",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -9790,7 +9790,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/IDLType:1.0"
         )
     )->type (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -9819,7 +9819,7 @@ void POA_CORBA_IDLType::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType *_tao_impl =
@@ -9840,18 +9840,18 @@ void POA_CORBA_IDLType::_get_type_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9860,7 +9860,7 @@ void POA_CORBA_IDLType::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -9868,12 +9868,12 @@ void POA_CORBA_IDLType::_get_type_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9901,7 +9901,7 @@ void POA_CORBA_IDLType::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9911,7 +9911,7 @@ void POA_CORBA_IDLType::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9924,11 +9924,11 @@ void POA_CORBA_IDLType::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9941,7 +9941,7 @@ void POA_CORBA_IDLType::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference;
@@ -9960,7 +9960,7 @@ void POA_CORBA_IDLType::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9987,10 +9987,10 @@ void POA_CORBA_IDLType::_interface_skel (
 
 CORBA::Boolean POA_CORBA_IDLType::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10015,12 +10015,12 @@ void* POA_CORBA_IDLType::_downcast (
   return 0;
 }
 
-void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -10030,9 +10030,9 @@ const char* POA_CORBA_IDLType::_interface_repository_id (void) const
 }
 
 CORBA_IDLType*
-POA_CORBA_IDLType::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_IDLType::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -10221,17 +10221,17 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::~_TAO_CORBA_TypedefDef_Strategiz
 _TAO_CORBA_TypedefDef_Proxy_Impl&
 _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_TypedefDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -10241,7 +10241,7 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -10336,7 +10336,7 @@ void POA_CORBA_TypedefDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10346,7 +10346,7 @@ void POA_CORBA_TypedefDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10359,11 +10359,11 @@ void POA_CORBA_TypedefDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10376,7 +10376,7 @@ void POA_CORBA_TypedefDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference;
@@ -10395,7 +10395,7 @@ void POA_CORBA_TypedefDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10422,10 +10422,10 @@ void POA_CORBA_TypedefDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_TypedefDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10456,12 +10456,12 @@ void* POA_CORBA_TypedefDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -10471,9 +10471,9 @@ const char* POA_CORBA_TypedefDef::_interface_repository_id (void) const
 }
 
 CORBA_TypedefDef*
-POA_CORBA_TypedefDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
index 245cba71f61..e1077f9c8d8 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
@@ -64,7 +64,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -75,37 +75,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_IRObject *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -115,11 +115,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -129,7 +129,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 
@@ -149,7 +149,7 @@ public:
 
   virtual ::_TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
     ::CORBA_IRObject *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -158,7 +158,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -199,7 +199,7 @@ public:
 
   virtual CORBA::DefinitionKind def_kind (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -207,7 +207,7 @@ public:
 
   virtual void destroy (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -239,7 +239,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -250,37 +250,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_Contained *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -290,12 +290,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -305,11 +305,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -319,12 +319,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -334,11 +334,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -348,12 +348,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -363,11 +363,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -377,11 +377,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -391,11 +391,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -405,11 +405,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -419,14 +419,14 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -436,21 +436,21 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -470,7 +470,7 @@ public:
 
   virtual ::_TAO_CORBA_Contained_Proxy_Impl &select_proxy (
     ::CORBA_Contained *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -479,7 +479,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -522,7 +522,7 @@ public:
 
   virtual char * id (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -531,7 +531,7 @@ public:
   virtual void id (
       CORBA_Object *_collocated_tao_target_,
       const char * id
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -539,7 +539,7 @@ public:
 
   virtual char * name (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -548,7 +548,7 @@ public:
   virtual void name (
       CORBA_Object *_collocated_tao_target_,
       const char * name
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -556,7 +556,7 @@ public:
 
   virtual char * version (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -565,7 +565,7 @@ public:
   virtual void version (
       CORBA_Object *_collocated_tao_target_,
       const char * version
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -573,7 +573,7 @@ public:
 
   virtual CORBA_Container_ptr defined_in (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -581,7 +581,7 @@ public:
 
   virtual char * absolute_name (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -589,7 +589,7 @@ public:
 
   virtual CORBA_Repository_ptr containing_repository (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -597,7 +597,7 @@ public:
 
   virtual CORBA_Contained::Description * describe (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -608,7 +608,7 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -640,7 +640,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -651,38 +651,38 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_Container *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_Contained_ptr lookup (
       const char * search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -692,13 +692,13 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -708,7 +708,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ContainedSeq * lookup_name (
@@ -716,7 +716,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -726,14 +726,14 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -743,14 +743,14 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -760,7 +760,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ConstantDef_ptr create_constant (
@@ -769,7 +769,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -779,7 +779,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_StructDef_ptr create_struct (
@@ -787,7 +787,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -797,7 +797,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_UnionDef_ptr create_union (
@@ -806,7 +806,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -816,7 +816,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_EnumDef_ptr create_enum (
@@ -824,7 +824,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -834,7 +834,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_AliasDef_ptr create_alias (
@@ -842,7 +842,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -852,7 +852,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_InterfaceDef_ptr create_interface (
@@ -860,7 +860,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -870,7 +870,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueDef_ptr create_value (
@@ -884,7 +884,7 @@ public:
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -894,7 +894,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueBoxDef_ptr create_value_box (
@@ -902,7 +902,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -912,7 +912,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ExceptionDef_ptr create_exception (
@@ -920,7 +920,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -930,14 +930,14 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -947,7 +947,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
@@ -955,7 +955,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_AbstractInterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -965,7 +965,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
@@ -973,7 +973,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -983,21 +983,21 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -1017,7 +1017,7 @@ public:
 
   virtual ::_TAO_CORBA_Container_Proxy_Impl &select_proxy (
     ::CORBA_Container *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1026,7 +1026,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1070,7 +1070,7 @@ public:
   virtual CORBA_Contained_ptr lookup (
       CORBA_Object *_collocated_tao_target_,
       const char * search_name
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1080,7 +1080,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1092,7 +1092,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1103,7 +1103,7 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1114,7 +1114,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1127,7 +1127,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1139,7 +1139,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1152,7 +1152,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1164,7 +1164,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1176,7 +1176,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1188,7 +1188,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1206,7 +1206,7 @@ public:
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1218,7 +1218,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1230,7 +1230,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1241,7 +1241,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1253,7 +1253,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_AbstractInterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1265,7 +1265,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1297,7 +1297,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -1308,37 +1308,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_IDLType *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1348,21 +1348,21 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -1382,7 +1382,7 @@ public:
 
   virtual ::_TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
     ::CORBA_IDLType *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1391,7 +1391,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1434,7 +1434,7 @@ public:
 
   virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1466,7 +1466,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -1477,31 +1477,31 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_TypedefDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
@@ -1510,98 +1510,98 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -1621,7 +1621,7 @@ public:
 
   virtual ::_TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
     ::CORBA_TypedefDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1630,7 +1630,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.i b/TAO/orbsvcs/IFR_Service/IFR_BaseS.i
index 477a44b0871..8224fd18394 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.i
@@ -23,7 +23,7 @@ ACE_INLINE void POA_CORBA_Contained::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Contained_ptr) obj;
@@ -31,14 +31,14 @@ ACE_INLINE void POA_CORBA_Contained::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Contained::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Contained_ptr) obj;
@@ -46,14 +46,14 @@ ACE_INLINE void POA_CORBA_Contained::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Container::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Container_ptr) obj;
@@ -61,14 +61,14 @@ ACE_INLINE void POA_CORBA_Container::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Container::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Container_ptr) obj;
@@ -76,14 +76,14 @@ ACE_INLINE void POA_CORBA_Container::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_IDLType::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_IDLType_ptr) obj;
@@ -91,14 +91,14 @@ ACE_INLINE void POA_CORBA_IDLType::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_IDLType::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_IDLType_ptr) obj;
@@ -106,14 +106,14 @@ ACE_INLINE void POA_CORBA_IDLType::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -121,14 +121,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -136,14 +136,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -151,14 +151,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -166,14 +166,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -181,14 +181,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -196,14 +196,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -211,14 +211,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -226,14 +226,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -241,14 +241,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -256,14 +256,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -271,14 +271,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -286,14 +286,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -301,14 +301,14 @@ ACE_INLINE void POA_CORBA_TypedefDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
@@ -316,6 +316,6 @@ ACE_INLINE void POA_CORBA_TypedefDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
index 87fb981b893..0d9c58482b6 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
@@ -67,17 +67,17 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -123,10 +123,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -134,14 +134,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -149,14 +149,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -164,35 +164,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -202,21 +202,21 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -262,11 +262,11 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_Contained_ptr lookup (
       const char * search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -275,7 +275,7 @@ public:
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -286,7 +286,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -296,7 +296,7 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -306,7 +306,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -318,7 +318,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -329,7 +329,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -341,7 +341,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -352,7 +352,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -363,7 +363,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -374,7 +374,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -391,7 +391,7 @@ public:
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -402,7 +402,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -413,7 +413,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -423,7 +423,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -434,7 +434,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_AbstractInterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -445,21 +445,21 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -505,24 +505,24 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -568,10 +568,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -579,14 +579,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -594,14 +594,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -609,35 +609,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -647,28 +647,28 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
index ee67530cc11..2dd1632a3b6 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
@@ -90,37 +90,37 @@ POA_CORBA_IRObject_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_IRObject_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_IRObject_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_IRObject::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_IRObject::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_IRObject_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_IRObject_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -193,31 +193,31 @@ POA_CORBA_Contained_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_Contained_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_Contained_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_Contained::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_Contained::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_Contained_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -225,27 +225,27 @@ void POA_CORBA_Contained_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_Contained_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -253,27 +253,27 @@ void POA_CORBA_Contained_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_Contained_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -281,59 +281,59 @@ void POA_CORBA_Contained_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_Contained_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_Contained_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_Contained_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_Contained_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -342,7 +342,7 @@ void POA_CORBA_Contained_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -352,33 +352,33 @@ void POA_CORBA_Contained_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_Contained_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -451,18 +451,18 @@ POA_CORBA_Container_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_Container_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_Container_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_Container::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_Container::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_Container_tie<T>::lookup  (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -470,7 +470,7 @@ CORBA_Contained_ptr POA_CORBA_Container_tie<T>::lookup  (
 {
   return this->ptr_->lookup (
 search_name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -478,7 +478,7 @@ template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -487,7 +487,7 @@ CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::contents  (
   return this->ptr_->contents (
 limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -497,7 +497,7 @@ CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::lookup_name  (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -508,7 +508,7 @@ search_name,
     levels_to_search,
     limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -517,7 +517,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Container_tie<T>::describe_contents
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -527,7 +527,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Container_tie<T>::describe_contents
 limit_type,
     exclude_inherited,
     max_returned_objs
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -536,7 +536,7 @@ CORBA_ModuleDef_ptr POA_CORBA_Container_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -546,7 +546,7 @@ CORBA_ModuleDef_ptr POA_CORBA_Container_tie<T>::create_module  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -557,7 +557,7 @@ CORBA_ConstantDef_ptr POA_CORBA_Container_tie<T>::create_constant  (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -569,7 +569,7 @@ id,
     version,
     type,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -579,7 +579,7 @@ CORBA_StructDef_ptr POA_CORBA_Container_tie<T>::create_struct  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -590,7 +590,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -601,7 +601,7 @@ CORBA_UnionDef_ptr POA_CORBA_Container_tie<T>::create_union  (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -613,7 +613,7 @@ id,
     version,
     discriminator_type,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -623,7 +623,7 @@ CORBA_EnumDef_ptr POA_CORBA_Container_tie<T>::create_enum  (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -634,7 +634,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -644,7 +644,7 @@ CORBA_AliasDef_ptr POA_CORBA_Container_tie<T>::create_alias  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -655,7 +655,7 @@ id,
     name,
     version,
     original_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -665,7 +665,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_Container_tie<T>::create_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -676,7 +676,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -692,7 +692,7 @@ CORBA_ValueDef_ptr POA_CORBA_Container_tie<T>::create_value  (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -709,7 +709,7 @@ id,
     abstract_base_values,
     supported_interfaces,
     initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -719,7 +719,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Container_tie<T>::create_value_box  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -730,7 +730,7 @@ id,
     name,
     version,
     original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -740,7 +740,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_Container_tie<T>::create_exception  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -751,7 +751,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -760,7 +760,7 @@ CORBA_NativeDef_ptr POA_CORBA_Container_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -770,7 +770,7 @@ CORBA_NativeDef_ptr POA_CORBA_Container_tie<T>::create_native  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -780,7 +780,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_abstract_inter
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -791,7 +791,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -801,7 +801,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_local_interface
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -812,33 +812,33 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_Container_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Container_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -911,50 +911,50 @@ POA_CORBA_IDLType_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_IDLType_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_IDLType_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_IDLType::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_IDLType::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_IDLType_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_IDLType_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_IDLType_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1027,31 +1027,31 @@ POA_CORBA_TypedefDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_TypedefDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_TypedefDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_TypedefDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_TypedefDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_TypedefDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1059,27 +1059,27 @@ void POA_CORBA_TypedefDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_TypedefDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1087,27 +1087,27 @@ void POA_CORBA_TypedefDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_TypedefDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1115,59 +1115,59 @@ void POA_CORBA_TypedefDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_TypedefDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_TypedefDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_TypedefDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_TypedefDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1176,7 +1176,7 @@ void POA_CORBA_TypedefDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1186,46 +1186,46 @@ void POA_CORBA_TypedefDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_TypedefDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_TypedefDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
index 40d924df88c..f50c0f1c3be 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
@@ -210,31 +210,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
     const char * search_id
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Contained_ptr result);
@@ -254,7 +254,7 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Re
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
     const char * search_id
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -262,12 +262,12 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Re
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -283,25 +283,25 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (TAO_ENV_SINGLE_ARG_
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_lookup_id::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_lookup_id::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -313,7 +313,7 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (TAO_ENV_SINGLE_ARG_DEC
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -323,10 +323,10 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -344,31 +344,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
     CORBA::TypeCode_ptr tc
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -388,7 +388,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequest
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
     CORBA::TypeCode_ptr tc
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -396,12 +396,12 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -417,25 +417,25 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (TAO_EN
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -447,7 +447,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (TAO_ENV_S
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -457,10 +457,10 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_most_deriv
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -478,31 +478,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
     CORBA::PrimitiveKind & kind
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_PrimitiveDef_ptr result);
@@ -522,7 +522,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORB
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
     CORBA::PrimitiveKind & kind
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -530,12 +530,12 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -551,25 +551,25 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (TAO_ENV_SINGLE_
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_get_primitive::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_get_primitive::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -581,7 +581,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (TAO_ENV_SINGLE_ARG
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -591,10 +591,10 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_most_derived_interf
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -612,31 +612,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_StringDef_ptr result);
@@ -656,7 +656,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORB
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -664,12 +664,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -685,25 +685,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (TAO_ENV_SINGLE_
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_string::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_string::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_string::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_string::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -715,7 +715,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::result (TAO_ENV_SINGLE_ARG
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_string::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -725,10 +725,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::target_most_derived_interf
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_string::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -746,31 +746,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_WstringDef_ptr result);
@@ -790,7 +790,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_COR
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -798,12 +798,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -819,25 +819,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_wstring::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_wstring::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -849,7 +849,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -859,10 +859,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -881,31 +881,31 @@ public:
     ,
     const CORBA::ULong & bound,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_SequenceDef_ptr result);
@@ -927,7 +927,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CO
     POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & bound,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -936,12 +936,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -960,25 +960,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (TAO_ENV_SINGL
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_sequence::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_sequence::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -990,7 +990,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (TAO_ENV_SINGLE_A
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1000,10 +1000,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_most_derived_inte
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1022,31 +1022,31 @@ public:
     ,
     const CORBA::ULong & length,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ArrayDef_ptr result);
@@ -1068,7 +1068,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA
     POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & length,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1077,12 +1077,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1101,25 +1101,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_array::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_array::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_array::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_array::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1131,7 +1131,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_array::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1141,10 +1141,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_array::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1163,31 +1163,31 @@ public:
     ,
     const CORBA::UShort & digits,
     const CORBA::Short & scale
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_FixedDef_ptr result);
@@ -1209,7 +1209,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA
     POA_CORBA_Repository *tao_impl,
     const CORBA::UShort & digits,
     const CORBA::Short & scale
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1218,12 +1218,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1242,25 +1242,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_fixed::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_fixed::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1272,7 +1272,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1282,10 +1282,10 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1325,17 +1325,17 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::~_TAO_CORBA_Repository_Strategiz
 _TAO_CORBA_Repository_Proxy_Impl&
 _TAO_CORBA_Repository_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_Repository *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -1345,7 +1345,7 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_Repository_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -1416,7 +1416,7 @@ _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::_TAO_CORBA_Repository_ThruPOA_Proxy_Im
 CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id (
     CORBA_Object *_collocated_tao_target_,
     const char * search_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1432,7 +1432,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id (
       _collocated_tao_target_->_object_key (),
       "lookup_id",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1442,14 +1442,14 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id (
         )
     )->lookup_id (
         search_id
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_typecode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::TypeCode_ptr tc
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1465,7 +1465,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_type
       _collocated_tao_target_->_object_key (),
       "get_canonical_typecode",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1475,14 +1475,14 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_type
         )
     )->get_canonical_typecode (
         tc
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive (
     CORBA_Object *_collocated_tao_target_,
     CORBA::PrimitiveKind kind
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1498,7 +1498,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive (
       _collocated_tao_target_->_object_key (),
       "get_primitive",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1508,14 +1508,14 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive (
         )
     )->get_primitive (
         kind
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1531,7 +1531,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string (
       _collocated_tao_target_->_object_key (),
       "create_string",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1541,14 +1541,14 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string (
         )
     )->create_string (
         bound
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1564,7 +1564,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring (
       _collocated_tao_target_->_object_key (),
       "create_wstring",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1574,7 +1574,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring (
         )
     )->create_wstring (
         bound
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -1582,7 +1582,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1598,7 +1598,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence
       _collocated_tao_target_->_object_key (),
       "create_sequence",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1609,7 +1609,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence
     )->create_sequence (
         bound,
         element_type
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -1617,7 +1617,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong length,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1633,7 +1633,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array (
       _collocated_tao_target_->_object_key (),
       "create_array",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1644,7 +1644,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array (
     )->create_array (
         length,
         element_type
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -1652,7 +1652,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed (
     CORBA_Object *_collocated_tao_target_,
     CORBA::UShort digits,
     CORBA::Short scale
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1668,7 +1668,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed (
       _collocated_tao_target_->_object_key (),
       "create_fixed",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1679,7 +1679,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed (
     )->create_fixed (
         digits,
         scale
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -1709,7 +1709,7 @@ void POA_CORBA_Repository::lookup_id_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1738,19 +1738,19 @@ void POA_CORBA_Repository::lookup_id_skel (
       _tao_upcall,
       _tao_impl,
       search_id.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->lookup_id (
           search_id.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1759,7 +1759,7 @@ void POA_CORBA_Repository::lookup_id_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1767,12 +1767,12 @@ void POA_CORBA_Repository::lookup_id_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1800,7 +1800,7 @@ void POA_CORBA_Repository::get_canonical_typecode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1829,19 +1829,19 @@ void POA_CORBA_Repository::get_canonical_typecode_skel (
       _tao_upcall,
       _tao_impl,
       tc.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->get_canonical_typecode (
           tc.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1850,7 +1850,7 @@ void POA_CORBA_Repository::get_canonical_typecode_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1858,12 +1858,12 @@ void POA_CORBA_Repository::get_canonical_typecode_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1891,7 +1891,7 @@ void POA_CORBA_Repository::get_primitive_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1920,19 +1920,19 @@ void POA_CORBA_Repository::get_primitive_skel (
       _tao_upcall,
       _tao_impl,
       kind
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->get_primitive (
           kind
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1941,7 +1941,7 @@ void POA_CORBA_Repository::get_primitive_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1949,12 +1949,12 @@ void POA_CORBA_Repository::get_primitive_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1982,7 +1982,7 @@ void POA_CORBA_Repository::create_string_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2011,19 +2011,19 @@ void POA_CORBA_Repository::create_string_skel (
       _tao_upcall,
       _tao_impl,
       bound
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->create_string (
           bound
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2032,7 +2032,7 @@ void POA_CORBA_Repository::create_string_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2040,12 +2040,12 @@ void POA_CORBA_Repository::create_string_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2073,7 +2073,7 @@ void POA_CORBA_Repository::create_wstring_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2102,19 +2102,19 @@ void POA_CORBA_Repository::create_wstring_skel (
       _tao_upcall,
       _tao_impl,
       bound
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->create_wstring (
           bound
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2123,7 +2123,7 @@ void POA_CORBA_Repository::create_wstring_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2131,12 +2131,12 @@ void POA_CORBA_Repository::create_wstring_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2164,7 +2164,7 @@ void POA_CORBA_Repository::create_sequence_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2196,12 +2196,12 @@ void POA_CORBA_Repository::create_sequence_skel (
       _tao_impl,
       bound,
       element_type.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -2209,7 +2209,7 @@ void POA_CORBA_Repository::create_sequence_skel (
       _tao_impl->create_sequence (
           bound,
           element_type.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2218,7 +2218,7 @@ void POA_CORBA_Repository::create_sequence_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2226,12 +2226,12 @@ void POA_CORBA_Repository::create_sequence_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2259,7 +2259,7 @@ void POA_CORBA_Repository::create_array_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2291,12 +2291,12 @@ void POA_CORBA_Repository::create_array_skel (
       _tao_impl,
       length,
       element_type.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -2304,7 +2304,7 @@ void POA_CORBA_Repository::create_array_skel (
       _tao_impl->create_array (
           length,
           element_type.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2313,7 +2313,7 @@ void POA_CORBA_Repository::create_array_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2321,12 +2321,12 @@ void POA_CORBA_Repository::create_array_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2354,7 +2354,7 @@ void POA_CORBA_Repository::create_fixed_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2386,12 +2386,12 @@ void POA_CORBA_Repository::create_fixed_skel (
       _tao_impl,
       digits,
       scale
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -2399,7 +2399,7 @@ void POA_CORBA_Repository::create_fixed_skel (
       _tao_impl->create_fixed (
           digits,
           scale
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2408,7 +2408,7 @@ void POA_CORBA_Repository::create_fixed_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2416,12 +2416,12 @@ void POA_CORBA_Repository::create_fixed_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2449,7 +2449,7 @@ void POA_CORBA_Repository::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2459,7 +2459,7 @@ void POA_CORBA_Repository::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2472,11 +2472,11 @@ void POA_CORBA_Repository::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2489,7 +2489,7 @@ void POA_CORBA_Repository::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference;
@@ -2508,7 +2508,7 @@ void POA_CORBA_Repository::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -2535,10 +2535,10 @@ void POA_CORBA_Repository::_interface_skel (
 
 CORBA::Boolean POA_CORBA_Repository::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -2566,12 +2566,12 @@ void* POA_CORBA_Repository::_downcast (
   return 0;
 }
 
-void POA_CORBA_Repository::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_Repository::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -2581,9 +2581,9 @@ const char* POA_CORBA_Repository::_interface_repository_id (void) const
 }
 
 CORBA_Repository*
-POA_CORBA_Repository::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -2791,17 +2791,17 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::~_TAO_CORBA_ModuleDef_Strategized
 _TAO_CORBA_ModuleDef_Proxy_Impl&
 _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_ModuleDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -2811,7 +2811,7 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -2906,7 +2906,7 @@ void POA_CORBA_ModuleDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2916,7 +2916,7 @@ void POA_CORBA_ModuleDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2929,11 +2929,11 @@ void POA_CORBA_ModuleDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2946,7 +2946,7 @@ void POA_CORBA_ModuleDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference;
@@ -2965,7 +2965,7 @@ void POA_CORBA_ModuleDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -2992,10 +2992,10 @@ void POA_CORBA_ModuleDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_ModuleDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -3026,12 +3026,12 @@ void* POA_CORBA_ModuleDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ModuleDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_ModuleDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -3041,9 +3041,9 @@ const char* POA_CORBA_ModuleDef::_interface_repository_id (void) const
 }
 
 CORBA_ModuleDef*
-POA_CORBA_ModuleDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -3214,31 +3214,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -3256,44 +3256,44 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::TAO_ServerRequestInfo_CORBA_Co
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ConstantDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3305,7 +3305,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (TAO_ENV_SINGLE_ARG_DEC
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3315,10 +3315,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3335,31 +3335,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -3377,44 +3377,44 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ConstantDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3426,7 +3426,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (TAO_ENV_SINGLE_ARG
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3436,10 +3436,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_most_derived_interf
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3457,31 +3457,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
     ,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3500,7 +3500,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORB
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ConstantDef *tao_impl,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3508,12 +3508,12 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3529,25 +3529,25 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (TAO_ENV_SINGLE_
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3555,7 +3555,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (TAO_ENV_SINGLE_ARG
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3565,10 +3565,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_most_derived_interf
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ConstantDef_value_get : public TAO_ServerRequestInfo
@@ -3578,31 +3578,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Any * result);
@@ -3620,44 +3620,44 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::TAO_ServerRequestInfo_CORBA_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ConstantDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3669,7 +3669,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3679,10 +3679,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3700,31 +3700,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
     ,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3743,7 +3743,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_C
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ConstantDef *tao_impl,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3751,12 +3751,12 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3772,25 +3772,25 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3798,7 +3798,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3808,10 +3808,10 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -3844,17 +3844,17 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::~_TAO_CORBA_ConstantDef_Strateg
 _TAO_CORBA_ConstantDef_Proxy_Impl&
 _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_ConstantDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -3864,7 +3864,7 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -3934,7 +3934,7 @@ _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ConstantDef_ThruPOA_Proxy_
 
 CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3950,7 +3950,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type (
       _collocated_tao_target_->_object_key (),
       "type",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -3959,13 +3959,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3981,7 +3981,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
       _collocated_tao_target_->_object_key (),
       "type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -3990,14 +3990,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type_def (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4011,7 +4011,7 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
       _collocated_tao_target_->_object_key (),
       "type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -4021,14 +4021,14 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
         )
     )->type_def (
         type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4044,7 +4044,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
       _collocated_tao_target_->_object_key (),
       "value",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -4053,14 +4053,14 @@ CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->value (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
     CORBA_Object *_collocated_tao_target_,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4074,7 +4074,7 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
       _collocated_tao_target_->_object_key (),
       "value",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -4084,7 +4084,7 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
         )
     )->value (
         value
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -4115,7 +4115,7 @@ void POA_CORBA_ConstantDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl =
@@ -4136,18 +4136,18 @@ void POA_CORBA_ConstantDef::_get_type_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -4156,7 +4156,7 @@ void POA_CORBA_ConstantDef::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4164,12 +4164,12 @@ void POA_CORBA_ConstantDef::_get_type_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4197,7 +4197,7 @@ void POA_CORBA_ConstantDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl =
@@ -4218,18 +4218,18 @@ void POA_CORBA_ConstantDef::_get_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type_def (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -4238,7 +4238,7 @@ void POA_CORBA_ConstantDef::_get_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4246,12 +4246,12 @@ void POA_CORBA_ConstantDef::_get_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4279,7 +4279,7 @@ void POA_CORBA_ConstantDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4308,25 +4308,25 @@ void POA_CORBA_ConstantDef::_set_type_def_skel (
       _tao_upcall,
       _tao_impl,
       type_def.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->type_def (
           type_def.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4334,12 +4334,12 @@ void POA_CORBA_ConstantDef::_set_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4360,7 +4360,7 @@ void POA_CORBA_ConstantDef::_get_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl =
@@ -4381,18 +4381,18 @@ void POA_CORBA_ConstantDef::_get_value_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->value (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -4401,7 +4401,7 @@ void POA_CORBA_ConstantDef::_get_value_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4409,12 +4409,12 @@ void POA_CORBA_ConstantDef::_get_value_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4442,7 +4442,7 @@ void POA_CORBA_ConstantDef::_set_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4471,25 +4471,25 @@ void POA_CORBA_ConstantDef::_set_value_skel (
       _tao_upcall,
       _tao_impl,
       value
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->value (
           value
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4497,12 +4497,12 @@ void POA_CORBA_ConstantDef::_set_value_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4523,7 +4523,7 @@ void POA_CORBA_ConstantDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4533,7 +4533,7 @@ void POA_CORBA_ConstantDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4546,11 +4546,11 @@ void POA_CORBA_ConstantDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4563,7 +4563,7 @@ void POA_CORBA_ConstantDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference;
@@ -4582,7 +4582,7 @@ void POA_CORBA_ConstantDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -4609,10 +4609,10 @@ void POA_CORBA_ConstantDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_ConstantDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -4640,12 +4640,12 @@ void* POA_CORBA_ConstantDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ConstantDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_ConstantDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -4655,9 +4655,9 @@ const char* POA_CORBA_ConstantDef::_interface_repository_id (void) const
 }
 
 CORBA_ConstantDef*
-POA_CORBA_ConstantDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -4845,31 +4845,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StructDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_StructMemberSeq * result);
@@ -4887,44 +4887,44 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::TAO_ServerRequestInfo_CORBA_S
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_StructDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_StructDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_StructDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_StructDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_StructDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4936,7 +4936,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4946,10 +4946,10 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4967,31 +4967,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StructDef *tao_impl
     ,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -5010,7 +5010,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_S
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_StructDef *tao_impl,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5018,12 +5018,12 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_S
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5039,25 +5039,25 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_StructDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_StructDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -5065,7 +5065,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5075,10 +5075,10 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -5111,17 +5111,17 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::~_TAO_CORBA_StructDef_Strategized
 _TAO_CORBA_StructDef_Proxy_Impl&
 _TAO_CORBA_StructDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_StructDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -5131,7 +5131,7 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_StructDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -5201,7 +5201,7 @@ _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::_TAO_CORBA_StructDef_ThruPOA_Proxy_Impl
 
 CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5217,7 +5217,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
       _collocated_tao_target_->_object_key (),
       "members",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -5226,14 +5226,14 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/StructDef:1.0"
         )
     )->members (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5247,7 +5247,7 @@ void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
       _collocated_tao_target_->_object_key (),
       "members",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -5257,7 +5257,7 @@ void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
         )
     )->members (
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -5291,7 +5291,7 @@ void POA_CORBA_StructDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_StructDef *_tao_impl =
@@ -5312,18 +5312,18 @@ void POA_CORBA_StructDef::_get_members_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->members (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -5332,7 +5332,7 @@ void POA_CORBA_StructDef::_get_members_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -5340,12 +5340,12 @@ void POA_CORBA_StructDef::_get_members_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -5373,7 +5373,7 @@ void POA_CORBA_StructDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -5402,25 +5402,25 @@ void POA_CORBA_StructDef::_set_members_skel (
       _tao_upcall,
       _tao_impl,
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->members (
           members
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -5428,12 +5428,12 @@ void POA_CORBA_StructDef::_set_members_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -5454,7 +5454,7 @@ void POA_CORBA_StructDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -5464,7 +5464,7 @@ void POA_CORBA_StructDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -5477,11 +5477,11 @@ void POA_CORBA_StructDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -5494,7 +5494,7 @@ void POA_CORBA_StructDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference;
@@ -5513,7 +5513,7 @@ void POA_CORBA_StructDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -5540,10 +5540,10 @@ void POA_CORBA_StructDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_StructDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -5580,12 +5580,12 @@ void* POA_CORBA_StructDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_StructDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_StructDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -5595,9 +5595,9 @@ const char* POA_CORBA_StructDef::_interface_repository_id (void) const
 }
 
 CORBA_StructDef*
-POA_CORBA_StructDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_StructDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -5788,31 +5788,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -5830,44 +5830,44 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ServerRequestIn
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_UnionDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5879,7 +5879,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (TAO_ENV_SIN
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5889,10 +5889,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_most_derived
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5909,31 +5909,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -5951,44 +5951,44 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ServerReque
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_UnionDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6000,7 +6000,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (TAO_ENV
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6010,10 +6010,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_most_der
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6031,31 +6031,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
     ,
     CORBA_IDLType_ptr discriminator_type_def
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -6074,7 +6074,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerReque
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_UnionDef *tao_impl,
     CORBA_IDLType_ptr discriminator_type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6082,12 +6082,12 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerReque
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6103,25 +6103,25 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (TAO_
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -6129,7 +6129,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (TAO_ENV
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6139,10 +6139,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_most_der
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_UnionDef_members_get : public TAO_ServerRequestInfo
@@ -6152,31 +6152,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_UnionMemberSeq * result);
@@ -6194,44 +6194,44 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::TAO_ServerRequestInfo_CORBA_Un
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_UnionDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6243,7 +6243,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (TAO_ENV_SINGLE_ARG_DEC
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6253,10 +6253,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6274,31 +6274,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
     ,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -6317,7 +6317,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_Un
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_UnionDef *tao_impl,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6325,12 +6325,12 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_Un
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6346,25 +6346,25 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -6372,7 +6372,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (TAO_ENV_SINGLE_ARG_DEC
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6382,10 +6382,10 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -6418,17 +6418,17 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::~_TAO_CORBA_UnionDef_Strategized_P
 _TAO_CORBA_UnionDef_Proxy_Impl&
 _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_UnionDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -6438,7 +6438,7 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -6508,7 +6508,7 @@ _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::_TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl (
 
 CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6524,7 +6524,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
       _collocated_tao_target_->_object_key (),
       "discriminator_type",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6533,13 +6533,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6555,7 +6555,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def
       _collocated_tao_target_->_object_key (),
       "discriminator_type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6564,14 +6564,14 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type_def (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr discriminator_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6585,7 +6585,7 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
       _collocated_tao_target_->_object_key (),
       "discriminator_type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6595,14 +6595,14 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
         )
     )->discriminator_type_def (
         discriminator_type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6618,7 +6618,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
       _collocated_tao_target_->_object_key (),
       "members",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6627,14 +6627,14 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->members (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6648,7 +6648,7 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
       _collocated_tao_target_->_object_key (),
       "members",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6658,7 +6658,7 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
         )
     )->members (
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -6692,7 +6692,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl =
@@ -6713,18 +6713,18 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->discriminator_type (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6733,7 +6733,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -6741,12 +6741,12 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6774,7 +6774,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl =
@@ -6795,18 +6795,18 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->discriminator_type_def (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6815,7 +6815,7 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -6823,12 +6823,12 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6856,7 +6856,7 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -6885,25 +6885,25 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel (
       _tao_upcall,
       _tao_impl,
       discriminator_type_def.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->discriminator_type_def (
           discriminator_type_def.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -6911,12 +6911,12 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6937,7 +6937,7 @@ void POA_CORBA_UnionDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl =
@@ -6958,18 +6958,18 @@ void POA_CORBA_UnionDef::_get_members_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->members (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6978,7 +6978,7 @@ void POA_CORBA_UnionDef::_get_members_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -6986,12 +6986,12 @@ void POA_CORBA_UnionDef::_get_members_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7019,7 +7019,7 @@ void POA_CORBA_UnionDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7048,25 +7048,25 @@ void POA_CORBA_UnionDef::_set_members_skel (
       _tao_upcall,
       _tao_impl,
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->members (
           members
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7074,12 +7074,12 @@ void POA_CORBA_UnionDef::_set_members_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7100,7 +7100,7 @@ void POA_CORBA_UnionDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7110,7 +7110,7 @@ void POA_CORBA_UnionDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -7123,11 +7123,11 @@ void POA_CORBA_UnionDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -7140,7 +7140,7 @@ void POA_CORBA_UnionDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference;
@@ -7159,7 +7159,7 @@ void POA_CORBA_UnionDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -7186,10 +7186,10 @@ void POA_CORBA_UnionDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_UnionDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -7226,12 +7226,12 @@ void* POA_CORBA_UnionDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_UnionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_UnionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -7241,9 +7241,9 @@ const char* POA_CORBA_UnionDef::_interface_repository_id (void) const
 }
 
 CORBA_UnionDef*
-POA_CORBA_UnionDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -7412,31 +7412,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_EnumDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_EnumMemberSeq * result);
@@ -7454,44 +7454,44 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::TAO_ServerRequestInfo_CORBA_Enu
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_EnumDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -7503,7 +7503,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL
 
 char *
 TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -7513,10 +7513,10 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -7534,31 +7534,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_EnumDef *tao_impl
     ,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -7577,7 +7577,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_Enu
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_EnumDef *tao_impl,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -7585,12 +7585,12 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_Enu
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -7606,25 +7606,25 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (TAO_ENV_SINGLE_ARG_D
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -7632,7 +7632,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL
 
 char *
 TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -7642,10 +7642,10 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -7678,17 +7678,17 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::~_TAO_CORBA_EnumDef_Strategized_Pro
 _TAO_CORBA_EnumDef_Proxy_Impl&
 _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_EnumDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -7698,7 +7698,7 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -7768,7 +7768,7 @@ _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::_TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (vo
 
 CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7784,7 +7784,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
       _collocated_tao_target_->_object_key (),
       "members",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7793,14 +7793,14 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/EnumDef:1.0"
         )
     )->members (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7814,7 +7814,7 @@ void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
       _collocated_tao_target_->_object_key (),
       "members",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -7824,7 +7824,7 @@ void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
         )
     )->members (
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -7857,7 +7857,7 @@ void POA_CORBA_EnumDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_EnumDef *_tao_impl =
@@ -7878,18 +7878,18 @@ void POA_CORBA_EnumDef::_get_members_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->members (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7898,7 +7898,7 @@ void POA_CORBA_EnumDef::_get_members_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7906,12 +7906,12 @@ void POA_CORBA_EnumDef::_get_members_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7939,7 +7939,7 @@ void POA_CORBA_EnumDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7968,25 +7968,25 @@ void POA_CORBA_EnumDef::_set_members_skel (
       _tao_upcall,
       _tao_impl,
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->members (
           members
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7994,12 +7994,12 @@ void POA_CORBA_EnumDef::_set_members_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8020,7 +8020,7 @@ void POA_CORBA_EnumDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8030,7 +8030,7 @@ void POA_CORBA_EnumDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8043,11 +8043,11 @@ void POA_CORBA_EnumDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8060,7 +8060,7 @@ void POA_CORBA_EnumDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference;
@@ -8079,7 +8079,7 @@ void POA_CORBA_EnumDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -8106,10 +8106,10 @@ void POA_CORBA_EnumDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_EnumDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -8143,12 +8143,12 @@ void* POA_CORBA_EnumDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_EnumDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_EnumDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -8158,9 +8158,9 @@ const char* POA_CORBA_EnumDef::_interface_repository_id (void) const
 }
 
 CORBA_EnumDef*
-POA_CORBA_EnumDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -8329,31 +8329,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AliasDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -8371,44 +8371,44 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ServerRequestInf
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_AliasDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -8420,7 +8420,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (TAO_ENV_SING
 
 char *
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -8430,10 +8430,10 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_most_derived_
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -8451,31 +8451,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AliasDef *tao_impl
     ,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -8494,7 +8494,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInf
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_AliasDef *tao_impl,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -8502,12 +8502,12 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInf
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -8523,25 +8523,25 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (TAO_ENV_S
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -8549,7 +8549,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (TAO_ENV_SING
 
 char *
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -8559,10 +8559,10 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_most_derived_
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8595,17 +8595,17 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::~_TAO_CORBA_AliasDef_Strategized_P
 _TAO_CORBA_AliasDef_Proxy_Impl&
 _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_AliasDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -8615,7 +8615,7 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -8685,7 +8685,7 @@ _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::_TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl (
 
 CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8701,7 +8701,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
       _collocated_tao_target_->_object_key (),
       "original_type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -8710,14 +8710,14 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
           "IDL:omg.org/CORBA/AliasDef:1.0"
         )
     )->original_type_def (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8731,7 +8731,7 @@ void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
       _collocated_tao_target_->_object_key (),
       "original_type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -8741,7 +8741,7 @@ void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
         )
     )->original_type_def (
         original_type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -8774,7 +8774,7 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_AliasDef *_tao_impl =
@@ -8795,18 +8795,18 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->original_type_def (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8815,7 +8815,7 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8823,12 +8823,12 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8856,7 +8856,7 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8885,25 +8885,25 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel (
       _tao_upcall,
       _tao_impl,
       original_type_def.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->original_type_def (
           original_type_def.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8911,12 +8911,12 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8937,7 +8937,7 @@ void POA_CORBA_AliasDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8947,7 +8947,7 @@ void POA_CORBA_AliasDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8960,11 +8960,11 @@ void POA_CORBA_AliasDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8977,7 +8977,7 @@ void POA_CORBA_AliasDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference;
@@ -8996,7 +8996,7 @@ void POA_CORBA_AliasDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9023,10 +9023,10 @@ void POA_CORBA_AliasDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_AliasDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9060,12 +9060,12 @@ void* POA_CORBA_AliasDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_AliasDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_AliasDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -9075,9 +9075,9 @@ const char* POA_CORBA_AliasDef::_interface_repository_id (void) const
 }
 
 CORBA_AliasDef*
-POA_CORBA_AliasDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -9267,17 +9267,17 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::~_TAO_CORBA_NativeDef_Strategized
 _TAO_CORBA_NativeDef_Proxy_Impl&
 _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_NativeDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -9287,7 +9287,7 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -9383,7 +9383,7 @@ void POA_CORBA_NativeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9393,7 +9393,7 @@ void POA_CORBA_NativeDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9406,11 +9406,11 @@ void POA_CORBA_NativeDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9423,7 +9423,7 @@ void POA_CORBA_NativeDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference;
@@ -9442,7 +9442,7 @@ void POA_CORBA_NativeDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9469,10 +9469,10 @@ void POA_CORBA_NativeDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_NativeDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9506,12 +9506,12 @@ void* POA_CORBA_NativeDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_NativeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_NativeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -9521,9 +9521,9 @@ const char* POA_CORBA_NativeDef::_interface_repository_id (void) const
 }
 
 CORBA_NativeDef*
-POA_CORBA_NativeDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -9660,31 +9660,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_PrimitiveDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::PrimitiveKind result);
@@ -9702,44 +9702,44 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ServerRequestInfo_CORBA_P
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_PrimitiveDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9751,7 +9751,7 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -9761,10 +9761,10 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -9804,17 +9804,17 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::~_TAO_CORBA_PrimitiveDef_Strat
 _TAO_CORBA_PrimitiveDef_Proxy_Impl&
 _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_PrimitiveDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -9824,7 +9824,7 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -9894,7 +9894,7 @@ _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::_TAO_CORBA_PrimitiveDef_ThruPOA_Prox
 
 CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9910,7 +9910,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
       _collocated_tao_target_->_object_key (),
       "kind",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -9919,7 +9919,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
           "IDL:omg.org/CORBA/PrimitiveDef:1.0"
         )
     )->kind (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -9949,7 +9949,7 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_PrimitiveDef *_tao_impl =
@@ -9970,18 +9970,18 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->kind (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9989,7 +9989,7 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel (
       CORBA::PrimitiveKind _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -9997,12 +9997,12 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10030,7 +10030,7 @@ void POA_CORBA_PrimitiveDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10040,7 +10040,7 @@ void POA_CORBA_PrimitiveDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10053,11 +10053,11 @@ void POA_CORBA_PrimitiveDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10070,7 +10070,7 @@ void POA_CORBA_PrimitiveDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference;
@@ -10089,7 +10089,7 @@ void POA_CORBA_PrimitiveDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10116,10 +10116,10 @@ void POA_CORBA_PrimitiveDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_PrimitiveDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10147,12 +10147,12 @@ void* POA_CORBA_PrimitiveDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -10162,9 +10162,9 @@ const char* POA_CORBA_PrimitiveDef::_interface_repository_id (void) const
 }
 
 CORBA_PrimitiveDef*
-POA_CORBA_PrimitiveDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -10321,31 +10321,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StringDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::ULong result);
@@ -10363,44 +10363,44 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::TAO_ServerRequestInfo_CORBA_Str
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_StringDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -10412,7 +10412,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL
 
 char *
 TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -10422,10 +10422,10 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -10443,31 +10443,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StringDef *tao_impl
     ,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -10486,7 +10486,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_Str
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_StringDef *tao_impl,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -10494,12 +10494,12 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_Str
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -10515,25 +10515,25 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_D
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -10541,7 +10541,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL
 
 char *
 TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -10551,10 +10551,10 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -10587,17 +10587,17 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::~_TAO_CORBA_StringDef_Strategized
 _TAO_CORBA_StringDef_Proxy_Impl&
 _TAO_CORBA_StringDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_StringDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -10607,7 +10607,7 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_StringDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -10677,7 +10677,7 @@ _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::_TAO_CORBA_StringDef_ThruPOA_Proxy_Impl
 
 CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10693,7 +10693,7 @@ CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
       _collocated_tao_target_->_object_key (),
       "bound",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -10702,14 +10702,14 @@ CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/StringDef:1.0"
         )
     )->bound (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10723,7 +10723,7 @@ void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
       _collocated_tao_target_->_object_key (),
       "bound",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -10733,7 +10733,7 @@ void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
         )
     )->bound (
         bound
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -10764,7 +10764,7 @@ void POA_CORBA_StringDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_StringDef *_tao_impl =
@@ -10785,18 +10785,18 @@ void POA_CORBA_StringDef::_get_bound_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->bound (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -10804,7 +10804,7 @@ void POA_CORBA_StringDef::_get_bound_skel (
       CORBA::ULong _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -10812,12 +10812,12 @@ void POA_CORBA_StringDef::_get_bound_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10845,7 +10845,7 @@ void POA_CORBA_StringDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10874,25 +10874,25 @@ void POA_CORBA_StringDef::_set_bound_skel (
       _tao_upcall,
       _tao_impl,
       bound
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->bound (
           bound
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -10900,12 +10900,12 @@ void POA_CORBA_StringDef::_set_bound_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10926,7 +10926,7 @@ void POA_CORBA_StringDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10936,7 +10936,7 @@ void POA_CORBA_StringDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10949,11 +10949,11 @@ void POA_CORBA_StringDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10966,7 +10966,7 @@ void POA_CORBA_StringDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference;
@@ -10985,7 +10985,7 @@ void POA_CORBA_StringDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -11012,10 +11012,10 @@ void POA_CORBA_StringDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_StringDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -11043,12 +11043,12 @@ void* POA_CORBA_StringDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_StringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_StringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -11058,9 +11058,9 @@ const char* POA_CORBA_StringDef::_interface_repository_id (void) const
 }
 
 CORBA_StringDef*
-POA_CORBA_StringDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_StringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -11217,31 +11217,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_WstringDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::ULong result);
@@ -11259,44 +11259,44 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::TAO_ServerRequestInfo_CORBA_Ws
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_WstringDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11308,7 +11308,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DEC
 
 char *
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11318,10 +11318,10 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11339,31 +11339,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_WstringDef *tao_impl
     ,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -11382,7 +11382,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_Ws
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_WstringDef *tao_impl,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -11390,12 +11390,12 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_Ws
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -11411,25 +11411,25 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -11437,7 +11437,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DEC
 
 char *
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11447,10 +11447,10 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -11483,17 +11483,17 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::~_TAO_CORBA_WstringDef_Strategiz
 _TAO_CORBA_WstringDef_Proxy_Impl&
 _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_WstringDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -11503,7 +11503,7 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -11573,7 +11573,7 @@ _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::_TAO_CORBA_WstringDef_ThruPOA_Proxy_Im
 
 CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11589,7 +11589,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
       _collocated_tao_target_->_object_key (),
       "bound",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -11598,14 +11598,14 @@ CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/WstringDef:1.0"
         )
     )->bound (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11619,7 +11619,7 @@ void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
       _collocated_tao_target_->_object_key (),
       "bound",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -11629,7 +11629,7 @@ void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
         )
     )->bound (
         bound
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -11660,7 +11660,7 @@ void POA_CORBA_WstringDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_WstringDef *_tao_impl =
@@ -11681,18 +11681,18 @@ void POA_CORBA_WstringDef::_get_bound_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->bound (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -11700,7 +11700,7 @@ void POA_CORBA_WstringDef::_get_bound_skel (
       CORBA::ULong _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -11708,12 +11708,12 @@ void POA_CORBA_WstringDef::_get_bound_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11741,7 +11741,7 @@ void POA_CORBA_WstringDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -11770,25 +11770,25 @@ void POA_CORBA_WstringDef::_set_bound_skel (
       _tao_upcall,
       _tao_impl,
       bound
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->bound (
           bound
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -11796,12 +11796,12 @@ void POA_CORBA_WstringDef::_set_bound_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11822,7 +11822,7 @@ void POA_CORBA_WstringDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -11832,7 +11832,7 @@ void POA_CORBA_WstringDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -11845,11 +11845,11 @@ void POA_CORBA_WstringDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -11862,7 +11862,7 @@ void POA_CORBA_WstringDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference;
@@ -11881,7 +11881,7 @@ void POA_CORBA_WstringDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -11908,10 +11908,10 @@ void POA_CORBA_WstringDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_WstringDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -11939,12 +11939,12 @@ void* POA_CORBA_WstringDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_WstringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_WstringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -11954,9 +11954,9 @@ const char* POA_CORBA_WstringDef::_interface_repository_id (void) const
 }
 
 CORBA_WstringDef*
-POA_CORBA_WstringDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -12116,31 +12116,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::ULong result);
@@ -12158,44 +12158,44 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::TAO_ServerRequestInfo_CORBA_S
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_SequenceDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12207,7 +12207,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12217,10 +12217,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12238,31 +12238,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
     ,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -12281,7 +12281,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_S
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_SequenceDef *tao_impl,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12289,12 +12289,12 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_S
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12310,25 +12310,25 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -12336,7 +12336,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12346,10 +12346,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get : public TAO_ServerRequestInfo
@@ -12359,31 +12359,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -12401,44 +12401,44 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ServerRequestInfo_
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_SequenceDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12450,7 +12450,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (TAO_ENV_SINGLE
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12460,10 +12460,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_most_derived_in
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12480,31 +12480,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -12522,44 +12522,44 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ServerRequestI
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_SequenceDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12571,7 +12571,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (TAO_ENV_SI
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12581,10 +12581,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_most_derive
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12602,31 +12602,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
     ,
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -12645,7 +12645,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestI
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_SequenceDef *tao_impl,
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12653,12 +12653,12 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestI
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12674,25 +12674,25 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (TAO_ENV
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -12700,7 +12700,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (TAO_ENV_SI
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12710,10 +12710,10 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_most_derive
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -12746,17 +12746,17 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::~_TAO_CORBA_SequenceDef_Strateg
 _TAO_CORBA_SequenceDef_Proxy_Impl&
 _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_SequenceDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -12766,7 +12766,7 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -12836,7 +12836,7 @@ _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_SequenceDef_ThruPOA_Proxy_
 
 CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12852,7 +12852,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
       _collocated_tao_target_->_object_key (),
       "bound",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -12861,14 +12861,14 @@ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->bound (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12882,7 +12882,7 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
       _collocated_tao_target_->_object_key (),
       "bound",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -12892,14 +12892,14 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
         )
     )->bound (
         bound
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12915,7 +12915,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type (
       _collocated_tao_target_->_object_key (),
       "element_type",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12924,13 +12924,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12946,7 +12946,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
       _collocated_tao_target_->_object_key (),
       "element_type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12955,14 +12955,14 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type_def (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12976,7 +12976,7 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
       _collocated_tao_target_->_object_key (),
       "element_type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -12986,7 +12986,7 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
         )
     )->element_type_def (
         element_type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -13017,7 +13017,7 @@ void POA_CORBA_SequenceDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl =
@@ -13038,18 +13038,18 @@ void POA_CORBA_SequenceDef::_get_bound_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->bound (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13057,7 +13057,7 @@ void POA_CORBA_SequenceDef::_get_bound_skel (
       CORBA::ULong _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -13065,12 +13065,12 @@ void POA_CORBA_SequenceDef::_get_bound_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13098,7 +13098,7 @@ void POA_CORBA_SequenceDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13127,25 +13127,25 @@ void POA_CORBA_SequenceDef::_set_bound_skel (
       _tao_upcall,
       _tao_impl,
       bound
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->bound (
           bound
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -13153,12 +13153,12 @@ void POA_CORBA_SequenceDef::_set_bound_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13179,7 +13179,7 @@ void POA_CORBA_SequenceDef::_get_element_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl =
@@ -13200,18 +13200,18 @@ void POA_CORBA_SequenceDef::_get_element_type_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->element_type (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13220,7 +13220,7 @@ void POA_CORBA_SequenceDef::_get_element_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -13228,12 +13228,12 @@ void POA_CORBA_SequenceDef::_get_element_type_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13261,7 +13261,7 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl =
@@ -13282,18 +13282,18 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->element_type_def (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13302,7 +13302,7 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -13310,12 +13310,12 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13343,7 +13343,7 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13372,25 +13372,25 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel (
       _tao_upcall,
       _tao_impl,
       element_type_def.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->element_type_def (
           element_type_def.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -13398,12 +13398,12 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13424,7 +13424,7 @@ void POA_CORBA_SequenceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13434,7 +13434,7 @@ void POA_CORBA_SequenceDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -13447,11 +13447,11 @@ void POA_CORBA_SequenceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -13464,7 +13464,7 @@ void POA_CORBA_SequenceDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference;
@@ -13483,7 +13483,7 @@ void POA_CORBA_SequenceDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -13510,10 +13510,10 @@ void POA_CORBA_SequenceDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_SequenceDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -13541,12 +13541,12 @@ void* POA_CORBA_SequenceDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_SequenceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_SequenceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -13556,9 +13556,9 @@ const char* POA_CORBA_SequenceDef::_interface_repository_id (void) const
 }
 
 CORBA_SequenceDef*
-POA_CORBA_SequenceDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -13718,31 +13718,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::ULong result);
@@ -13760,44 +13760,44 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::TAO_ServerRequestInfo_CORBA_Arr
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ArrayDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -13809,7 +13809,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (TAO_ENV_SINGLE_ARG_DECL
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -13819,10 +13819,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -13840,31 +13840,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
     ,
     const CORBA::ULong & length
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -13883,7 +13883,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_Arr
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ArrayDef *tao_impl,
     const CORBA::ULong & length
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -13891,12 +13891,12 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_Arr
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -13912,25 +13912,25 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (TAO_ENV_SINGLE_ARG_D
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -13938,7 +13938,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (TAO_ENV_SINGLE_ARG_DECL
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -13948,10 +13948,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get : public TAO_ServerRequestInfo
@@ -13961,31 +13961,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -14003,44 +14003,44 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ArrayDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -14052,7 +14052,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -14062,10 +14062,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -14082,31 +14082,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -14124,44 +14124,44 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ServerRequestInfo
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ArrayDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -14173,7 +14173,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (TAO_ENV_SINGL
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -14183,10 +14183,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_most_derived_i
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -14204,31 +14204,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
     ,
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -14247,7 +14247,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ArrayDef *tao_impl,
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -14255,12 +14255,12 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -14276,25 +14276,25 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (TAO_ENV_SI
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -14302,7 +14302,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (TAO_ENV_SINGL
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -14312,10 +14312,10 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_most_derived_i
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -14348,17 +14348,17 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::~_TAO_CORBA_ArrayDef_Strategized_P
 _TAO_CORBA_ArrayDef_Proxy_Impl&
 _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_ArrayDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -14368,7 +14368,7 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -14438,7 +14438,7 @@ _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl (
 
 CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14454,7 +14454,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
       _collocated_tao_target_->_object_key (),
       "length",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -14463,14 +14463,14 @@ CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->length (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong length
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14484,7 +14484,7 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
       _collocated_tao_target_->_object_key (),
       "length",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -14494,14 +14494,14 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
         )
     )->length (
         length
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14517,7 +14517,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type (
       _collocated_tao_target_->_object_key (),
       "element_type",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -14526,13 +14526,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14548,7 +14548,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
       _collocated_tao_target_->_object_key (),
       "element_type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -14557,14 +14557,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type_def (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14578,7 +14578,7 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
       _collocated_tao_target_->_object_key (),
       "element_type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -14588,7 +14588,7 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
         )
     )->element_type_def (
         element_type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -14619,7 +14619,7 @@ void POA_CORBA_ArrayDef::_get_length_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl =
@@ -14640,18 +14640,18 @@ void POA_CORBA_ArrayDef::_get_length_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->length (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -14659,7 +14659,7 @@ void POA_CORBA_ArrayDef::_get_length_skel (
       CORBA::ULong _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -14667,12 +14667,12 @@ void POA_CORBA_ArrayDef::_get_length_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -14700,7 +14700,7 @@ void POA_CORBA_ArrayDef::_set_length_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -14729,25 +14729,25 @@ void POA_CORBA_ArrayDef::_set_length_skel (
       _tao_upcall,
       _tao_impl,
       length
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->length (
           length
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -14755,12 +14755,12 @@ void POA_CORBA_ArrayDef::_set_length_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -14781,7 +14781,7 @@ void POA_CORBA_ArrayDef::_get_element_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl =
@@ -14802,18 +14802,18 @@ void POA_CORBA_ArrayDef::_get_element_type_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->element_type (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -14822,7 +14822,7 @@ void POA_CORBA_ArrayDef::_get_element_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -14830,12 +14830,12 @@ void POA_CORBA_ArrayDef::_get_element_type_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -14863,7 +14863,7 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl =
@@ -14884,18 +14884,18 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->element_type_def (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -14904,7 +14904,7 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -14912,12 +14912,12 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -14945,7 +14945,7 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -14974,25 +14974,25 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel (
       _tao_upcall,
       _tao_impl,
       element_type_def.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->element_type_def (
           element_type_def.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -15000,12 +15000,12 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -15026,7 +15026,7 @@ void POA_CORBA_ArrayDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -15036,7 +15036,7 @@ void POA_CORBA_ArrayDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -15049,11 +15049,11 @@ void POA_CORBA_ArrayDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -15066,7 +15066,7 @@ void POA_CORBA_ArrayDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference;
@@ -15085,7 +15085,7 @@ void POA_CORBA_ArrayDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -15112,10 +15112,10 @@ void POA_CORBA_ArrayDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_ArrayDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -15143,12 +15143,12 @@ void* POA_CORBA_ArrayDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ArrayDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_ArrayDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -15158,9 +15158,9 @@ const char* POA_CORBA_ArrayDef::_interface_repository_id (void) const
 }
 
 CORBA_ArrayDef*
-POA_CORBA_ArrayDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -15348,31 +15348,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -15390,44 +15390,44 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::TAO_ServerRequestInfo_CORBA_E
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ExceptionDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -15439,7 +15439,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -15449,10 +15449,10 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -15469,31 +15469,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_StructMemberSeq * result);
@@ -15511,44 +15511,44 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ExceptionDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -15560,7 +15560,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (TAO_ENV_SINGLE_ARG
 
 char *
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -15570,10 +15570,10 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_most_derived_interf
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -15591,31 +15591,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl
     ,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -15634,7 +15634,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORB
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ExceptionDef *tao_impl,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -15642,12 +15642,12 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -15663,25 +15663,25 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (TAO_ENV_SINGLE_
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -15689,7 +15689,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (TAO_ENV_SINGLE_ARG
 
 char *
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -15699,10 +15699,10 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_most_derived_interf
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -15735,17 +15735,17 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::~_TAO_CORBA_ExceptionDef_Strat
 _TAO_CORBA_ExceptionDef_Proxy_Impl&
 _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_ExceptionDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -15755,7 +15755,7 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -15825,7 +15825,7 @@ _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ExceptionDef_ThruPOA_Prox
 
 CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -15841,7 +15841,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type (
       _collocated_tao_target_->_object_key (),
       "type",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -15850,13 +15850,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->type (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -15872,7 +15872,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
       _collocated_tao_target_->_object_key (),
       "members",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -15881,14 +15881,14 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->members (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -15902,7 +15902,7 @@ void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
       _collocated_tao_target_->_object_key (),
       "members",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -15912,7 +15912,7 @@ void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
         )
     )->members (
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -15944,7 +15944,7 @@ void POA_CORBA_ExceptionDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ExceptionDef *_tao_impl =
@@ -15965,18 +15965,18 @@ void POA_CORBA_ExceptionDef::_get_type_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -15985,7 +15985,7 @@ void POA_CORBA_ExceptionDef::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -15993,12 +15993,12 @@ void POA_CORBA_ExceptionDef::_get_type_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16026,7 +16026,7 @@ void POA_CORBA_ExceptionDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ExceptionDef *_tao_impl =
@@ -16047,18 +16047,18 @@ void POA_CORBA_ExceptionDef::_get_members_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->members (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -16067,7 +16067,7 @@ void POA_CORBA_ExceptionDef::_get_members_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -16075,12 +16075,12 @@ void POA_CORBA_ExceptionDef::_get_members_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16108,7 +16108,7 @@ void POA_CORBA_ExceptionDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -16137,25 +16137,25 @@ void POA_CORBA_ExceptionDef::_set_members_skel (
       _tao_upcall,
       _tao_impl,
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->members (
           members
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -16163,12 +16163,12 @@ void POA_CORBA_ExceptionDef::_set_members_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16189,7 +16189,7 @@ void POA_CORBA_ExceptionDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -16199,7 +16199,7 @@ void POA_CORBA_ExceptionDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -16212,11 +16212,11 @@ void POA_CORBA_ExceptionDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -16229,7 +16229,7 @@ void POA_CORBA_ExceptionDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference;
@@ -16248,7 +16248,7 @@ void POA_CORBA_ExceptionDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -16275,10 +16275,10 @@ void POA_CORBA_ExceptionDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_ExceptionDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -16309,12 +16309,12 @@ void* POA_CORBA_ExceptionDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ExceptionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_ExceptionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -16324,9 +16324,9 @@ const char* POA_CORBA_ExceptionDef::_interface_repository_id (void) const
 }
 
 CORBA_ExceptionDef*
-POA_CORBA_ExceptionDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -16497,31 +16497,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -16539,44 +16539,44 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::TAO_ServerRequestInfo_CORBA_A
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_AttributeDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -16588,7 +16588,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -16598,10 +16598,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -16618,31 +16618,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -16660,44 +16660,44 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_AttributeDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -16709,7 +16709,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -16719,10 +16719,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -16740,31 +16740,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
     ,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -16783,7 +16783,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_COR
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_AttributeDef *tao_impl,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -16791,12 +16791,12 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -16812,25 +16812,25 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -16838,7 +16838,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -16848,10 +16848,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get : public TAO_ServerRequestInfo
@@ -16861,31 +16861,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::AttributeMode result);
@@ -16903,44 +16903,44 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::TAO_ServerRequestInfo_CORBA_A
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_AttributeDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -16952,7 +16952,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -16962,10 +16962,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -16983,31 +16983,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
     ,
     CORBA::AttributeMode & mode
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -17026,7 +17026,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_A
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_AttributeDef *tao_impl,
     CORBA::AttributeMode & mode
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -17034,12 +17034,12 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_A
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -17055,25 +17055,25 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -17081,7 +17081,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -17091,10 +17091,10 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -17127,17 +17127,17 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::~_TAO_CORBA_AttributeDef_Strat
 _TAO_CORBA_AttributeDef_Proxy_Impl&
 _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_AttributeDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -17147,7 +17147,7 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -17217,7 +17217,7 @@ _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::_TAO_CORBA_AttributeDef_ThruPOA_Prox
 
 CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17233,7 +17233,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type (
       _collocated_tao_target_->_object_key (),
       "type",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -17242,13 +17242,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17264,7 +17264,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
       _collocated_tao_target_->_object_key (),
       "type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -17273,14 +17273,14 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type_def (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17294,7 +17294,7 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
       _collocated_tao_target_->_object_key (),
       "type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -17304,14 +17304,14 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
         )
     )->type_def (
         type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17327,7 +17327,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
       _collocated_tao_target_->_object_key (),
       "mode",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -17336,14 +17336,14 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->mode (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17357,7 +17357,7 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
       _collocated_tao_target_->_object_key (),
       "mode",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -17367,7 +17367,7 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
         )
     )->mode (
         mode
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -17398,7 +17398,7 @@ void POA_CORBA_AttributeDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl =
@@ -17419,18 +17419,18 @@ void POA_CORBA_AttributeDef::_get_type_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -17439,7 +17439,7 @@ void POA_CORBA_AttributeDef::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -17447,12 +17447,12 @@ void POA_CORBA_AttributeDef::_get_type_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17480,7 +17480,7 @@ void POA_CORBA_AttributeDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl =
@@ -17501,18 +17501,18 @@ void POA_CORBA_AttributeDef::_get_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type_def (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -17521,7 +17521,7 @@ void POA_CORBA_AttributeDef::_get_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -17529,12 +17529,12 @@ void POA_CORBA_AttributeDef::_get_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17562,7 +17562,7 @@ void POA_CORBA_AttributeDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -17591,25 +17591,25 @@ void POA_CORBA_AttributeDef::_set_type_def_skel (
       _tao_upcall,
       _tao_impl,
       type_def.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->type_def (
           type_def.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -17617,12 +17617,12 @@ void POA_CORBA_AttributeDef::_set_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17643,7 +17643,7 @@ void POA_CORBA_AttributeDef::_get_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl =
@@ -17664,18 +17664,18 @@ void POA_CORBA_AttributeDef::_get_mode_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->mode (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -17683,7 +17683,7 @@ void POA_CORBA_AttributeDef::_get_mode_skel (
       CORBA::AttributeMode _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -17691,12 +17691,12 @@ void POA_CORBA_AttributeDef::_get_mode_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17724,7 +17724,7 @@ void POA_CORBA_AttributeDef::_set_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -17753,25 +17753,25 @@ void POA_CORBA_AttributeDef::_set_mode_skel (
       _tao_upcall,
       _tao_impl,
       mode
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->mode (
           mode
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -17779,12 +17779,12 @@ void POA_CORBA_AttributeDef::_set_mode_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17805,7 +17805,7 @@ void POA_CORBA_AttributeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -17815,7 +17815,7 @@ void POA_CORBA_AttributeDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -17828,11 +17828,11 @@ void POA_CORBA_AttributeDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -17845,7 +17845,7 @@ void POA_CORBA_AttributeDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference;
@@ -17864,7 +17864,7 @@ void POA_CORBA_AttributeDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -17891,10 +17891,10 @@ void POA_CORBA_AttributeDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_AttributeDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -17922,12 +17922,12 @@ void* POA_CORBA_AttributeDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_AttributeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_AttributeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -17937,9 +17937,9 @@ const char* POA_CORBA_AttributeDef::_interface_repository_id (void) const
 }
 
 CORBA_AttributeDef*
-POA_CORBA_AttributeDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -18167,31 +18167,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -18209,44 +18209,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::TAO_ServerRequestInfo_CORBA
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -18258,7 +18258,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18268,10 +18268,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -18288,31 +18288,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -18330,44 +18330,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::TAO_ServerRequestInfo_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -18379,7 +18379,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (TAO_ENV_SINGLE_
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18389,10 +18389,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_most_derived_int
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -18410,31 +18410,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
     CORBA_IDLType_ptr result_def
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -18453,7 +18453,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_C
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
     CORBA_IDLType_ptr result_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -18461,12 +18461,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -18482,25 +18482,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (TAO_ENV_SING
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -18508,7 +18508,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (TAO_ENV_SINGLE_
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18518,10 +18518,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_most_derived_int
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_params_get : public TAO_ServerRequestInfo
@@ -18531,31 +18531,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ParDescriptionSeq * result);
@@ -18573,44 +18573,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::TAO_ServerRequestInfo_CORBA
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -18622,7 +18622,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18632,10 +18632,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -18653,31 +18653,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
     const CORBA_ParDescriptionSeq & params
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -18696,7 +18696,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
     const CORBA_ParDescriptionSeq & params
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -18704,12 +18704,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -18725,25 +18725,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -18751,7 +18751,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18761,10 +18761,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_mode_get : public TAO_ServerRequestInfo
@@ -18774,31 +18774,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::OperationMode result);
@@ -18816,44 +18816,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::TAO_ServerRequestInfo_CORBA_O
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -18865,7 +18865,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18875,10 +18875,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -18896,31 +18896,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
     CORBA::OperationMode & mode
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -18939,7 +18939,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_O
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
     CORBA::OperationMode & mode
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -18947,12 +18947,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_O
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -18968,25 +18968,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -18994,7 +18994,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19004,10 +19004,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get : public TAO_ServerRequestInfo
@@ -19017,31 +19017,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ContextIdSeq * result);
@@ -19059,44 +19059,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -19108,7 +19108,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19118,10 +19118,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -19139,31 +19139,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -19182,7 +19182,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_COR
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -19190,12 +19190,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -19211,25 +19211,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -19237,7 +19237,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19247,10 +19247,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get : public TAO_ServerRequestInfo
@@ -19260,31 +19260,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ExceptionDefSeq * result);
@@ -19302,44 +19302,44 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ServerRequestInfo_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -19351,7 +19351,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (TAO_ENV_SINGLE_
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19361,10 +19361,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_most_derived_int
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -19382,31 +19382,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -19425,7 +19425,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_C
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -19433,12 +19433,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -19454,25 +19454,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (TAO_ENV_SING
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -19480,7 +19480,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (TAO_ENV_SINGLE_
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19490,10 +19490,10 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_most_derived_int
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -19526,17 +19526,17 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::~_TAO_CORBA_OperationDef_Strat
 _TAO_CORBA_OperationDef_Proxy_Impl&
 _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_OperationDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -19546,7 +19546,7 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -19616,7 +19616,7 @@ _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::_TAO_CORBA_OperationDef_ThruPOA_Prox
 
 CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19632,7 +19632,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result (
       _collocated_tao_target_->_object_key (),
       "result",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -19641,13 +19641,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19663,7 +19663,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
       _collocated_tao_target_->_object_key (),
       "result_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -19672,14 +19672,14 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result_def (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr result_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19693,7 +19693,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
       _collocated_tao_target_->_object_key (),
       "result_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -19703,14 +19703,14 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
         )
     )->result_def (
         result_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19726,7 +19726,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
       _collocated_tao_target_->_object_key (),
       "params",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -19735,14 +19735,14 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->params (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_ParDescriptionSeq & params
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19756,7 +19756,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
       _collocated_tao_target_->_object_key (),
       "params",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -19766,14 +19766,14 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
         )
     )->params (
         params
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19789,7 +19789,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
       _collocated_tao_target_->_object_key (),
       "mode",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -19798,14 +19798,14 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->mode (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::OperationMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19819,7 +19819,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
       _collocated_tao_target_->_object_key (),
       "mode",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -19829,14 +19829,14 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
         )
     )->mode (
         mode
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19852,7 +19852,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
       _collocated_tao_target_->_object_key (),
       "contexts",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -19861,14 +19861,14 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->contexts (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19882,7 +19882,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
       _collocated_tao_target_->_object_key (),
       "contexts",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -19892,14 +19892,14 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
         )
     )->contexts (
         contexts
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19915,7 +19915,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
       _collocated_tao_target_->_object_key (),
       "exceptions",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -19924,14 +19924,14 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->exceptions (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19945,7 +19945,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
       _collocated_tao_target_->_object_key (),
       "exceptions",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -19955,7 +19955,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
         )
     )->exceptions (
         exceptions
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -19986,7 +19986,7 @@ void POA_CORBA_OperationDef::_get_result_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20007,18 +20007,18 @@ void POA_CORBA_OperationDef::_get_result_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->result (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20027,7 +20027,7 @@ void POA_CORBA_OperationDef::_get_result_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -20035,12 +20035,12 @@ void POA_CORBA_OperationDef::_get_result_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20068,7 +20068,7 @@ void POA_CORBA_OperationDef::_get_result_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20089,18 +20089,18 @@ void POA_CORBA_OperationDef::_get_result_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->result_def (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20109,7 +20109,7 @@ void POA_CORBA_OperationDef::_get_result_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -20117,12 +20117,12 @@ void POA_CORBA_OperationDef::_get_result_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20150,7 +20150,7 @@ void POA_CORBA_OperationDef::_set_result_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -20179,25 +20179,25 @@ void POA_CORBA_OperationDef::_set_result_def_skel (
       _tao_upcall,
       _tao_impl,
       result_def.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->result_def (
           result_def.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -20205,12 +20205,12 @@ void POA_CORBA_OperationDef::_set_result_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20231,7 +20231,7 @@ void POA_CORBA_OperationDef::_get_params_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20252,18 +20252,18 @@ void POA_CORBA_OperationDef::_get_params_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->params (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20272,7 +20272,7 @@ void POA_CORBA_OperationDef::_get_params_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -20280,12 +20280,12 @@ void POA_CORBA_OperationDef::_get_params_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20313,7 +20313,7 @@ void POA_CORBA_OperationDef::_set_params_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -20342,25 +20342,25 @@ void POA_CORBA_OperationDef::_set_params_skel (
       _tao_upcall,
       _tao_impl,
       params
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->params (
           params
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -20368,12 +20368,12 @@ void POA_CORBA_OperationDef::_set_params_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20394,7 +20394,7 @@ void POA_CORBA_OperationDef::_get_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20415,18 +20415,18 @@ void POA_CORBA_OperationDef::_get_mode_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->mode (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20434,7 +20434,7 @@ void POA_CORBA_OperationDef::_get_mode_skel (
       CORBA::OperationMode _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -20442,12 +20442,12 @@ void POA_CORBA_OperationDef::_get_mode_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20475,7 +20475,7 @@ void POA_CORBA_OperationDef::_set_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -20504,25 +20504,25 @@ void POA_CORBA_OperationDef::_set_mode_skel (
       _tao_upcall,
       _tao_impl,
       mode
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->mode (
           mode
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -20530,12 +20530,12 @@ void POA_CORBA_OperationDef::_set_mode_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20556,7 +20556,7 @@ void POA_CORBA_OperationDef::_get_contexts_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20577,18 +20577,18 @@ void POA_CORBA_OperationDef::_get_contexts_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->contexts (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20597,7 +20597,7 @@ void POA_CORBA_OperationDef::_get_contexts_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -20605,12 +20605,12 @@ void POA_CORBA_OperationDef::_get_contexts_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20638,7 +20638,7 @@ void POA_CORBA_OperationDef::_set_contexts_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -20667,25 +20667,25 @@ void POA_CORBA_OperationDef::_set_contexts_skel (
       _tao_upcall,
       _tao_impl,
       contexts
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->contexts (
           contexts
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -20693,12 +20693,12 @@ void POA_CORBA_OperationDef::_set_contexts_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20719,7 +20719,7 @@ void POA_CORBA_OperationDef::_get_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20740,18 +20740,18 @@ void POA_CORBA_OperationDef::_get_exceptions_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->exceptions (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20760,7 +20760,7 @@ void POA_CORBA_OperationDef::_get_exceptions_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -20768,12 +20768,12 @@ void POA_CORBA_OperationDef::_get_exceptions_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20801,7 +20801,7 @@ void POA_CORBA_OperationDef::_set_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -20830,25 +20830,25 @@ void POA_CORBA_OperationDef::_set_exceptions_skel (
       _tao_upcall,
       _tao_impl,
       exceptions
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->exceptions (
           exceptions
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -20856,12 +20856,12 @@ void POA_CORBA_OperationDef::_set_exceptions_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20882,7 +20882,7 @@ void POA_CORBA_OperationDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -20892,7 +20892,7 @@ void POA_CORBA_OperationDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -20905,11 +20905,11 @@ void POA_CORBA_OperationDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -20922,7 +20922,7 @@ void POA_CORBA_OperationDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference;
@@ -20941,7 +20941,7 @@ void POA_CORBA_OperationDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -20968,10 +20968,10 @@ void POA_CORBA_OperationDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_OperationDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -20999,12 +20999,12 @@ void* POA_CORBA_OperationDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_OperationDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_OperationDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -21014,9 +21014,9 @@ const char* POA_CORBA_OperationDef::_interface_repository_id (void) const
 }
 
 CORBA_OperationDef*
-POA_CORBA_OperationDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -21209,31 +21209,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDefSeq * result);
@@ -21251,44 +21251,44 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ServerRequestI
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_InterfaceDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -21300,7 +21300,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (TAO_ENV_SI
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -21310,10 +21310,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_most_derive
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -21331,31 +21331,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl
     ,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -21374,7 +21374,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestI
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_InterfaceDef *tao_impl,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -21382,12 +21382,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestI
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -21403,25 +21403,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (TAO_ENV
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -21429,7 +21429,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (TAO_ENV_SI
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -21439,10 +21439,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_most_derive
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a : public TAO_ServerRequestInfo
@@ -21453,31 +21453,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl
     ,
     const char * interface_id
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -21497,7 +21497,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_Inter
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_InterfaceDef *tao_impl,
     const char * interface_id
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -21505,12 +21505,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_Inter
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -21526,25 +21526,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DEC
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -21556,7 +21556,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -21566,10 +21566,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -21586,31 +21586,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDef::FullInterfaceDescription * result);
@@ -21628,44 +21628,44 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ServerRequestIn
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_InterfaceDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -21677,7 +21677,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (TAO_ENV_SIN
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -21687,10 +21687,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_most_derived
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -21712,31 +21712,31 @@ public:
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_AttributeDef_ptr result);
@@ -21764,7 +21764,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -21776,12 +21776,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -21809,25 +21809,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (TAO_ENV_SI
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -21839,7 +21839,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (TAO_ENV_SINGL
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -21849,10 +21849,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_most_derived_i
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -21877,31 +21877,31 @@ public:
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_OperationDef_ptr result);
@@ -21935,7 +21935,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -21950,12 +21950,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -21992,25 +21992,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (TAO_ENV_SI
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -22022,7 +22022,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (TAO_ENV_SINGL
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -22032,10 +22032,10 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_most_derived_i
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -22075,17 +22075,17 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_InterfaceDef_Strat
 _TAO_CORBA_InterfaceDef_Proxy_Impl&
 _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_InterfaceDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -22095,7 +22095,7 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -22165,7 +22165,7 @@ _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_InterfaceDef_ThruPOA_Prox
 
 CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22181,7 +22181,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfa
       _collocated_tao_target_->_object_key (),
       "base_interfaces",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -22190,14 +22190,14 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfa
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->base_interfaces (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22211,7 +22211,7 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
       _collocated_tao_target_->_object_key (),
       "base_interfaces",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -22221,7 +22221,7 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
         )
     )->base_interfaces (
         base_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -22229,7 +22229,7 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
 CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
     const char * interface_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22245,7 +22245,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
       _collocated_tao_target_->_object_key (),
       "is_a",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -22255,13 +22255,13 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
         )
     )->is_a (
         interface_id
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22277,7 +22277,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_P
       _collocated_tao_target_->_object_key (),
       "describe_interface",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -22286,7 +22286,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_P
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->describe_interface (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -22297,7 +22297,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22313,7 +22313,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib
       _collocated_tao_target_->_object_key (),
       "create_attribute",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -22327,7 +22327,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib
         version,
         type,
         mode
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -22341,7 +22341,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22357,7 +22357,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat
       _collocated_tao_target_->_object_key (),
       "create_operation",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -22374,7 +22374,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat
         params,
         exceptions,
         contexts
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -22406,7 +22406,7 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef *_tao_impl =
@@ -22427,18 +22427,18 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->base_interfaces (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -22447,7 +22447,7 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -22455,12 +22455,12 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22488,7 +22488,7 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -22517,25 +22517,25 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       _tao_upcall,
       _tao_impl,
       base_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->base_interfaces (
           base_interfaces
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -22543,12 +22543,12 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22569,7 +22569,7 @@ void POA_CORBA_InterfaceDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -22598,19 +22598,19 @@ void POA_CORBA_InterfaceDef::is_a_skel (
       _tao_upcall,
       _tao_impl,
       interface_id.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_a (
           interface_id.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -22618,7 +22618,7 @@ void POA_CORBA_InterfaceDef::is_a_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -22626,12 +22626,12 @@ void POA_CORBA_InterfaceDef::is_a_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22659,7 +22659,7 @@ void POA_CORBA_InterfaceDef::describe_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef *_tao_impl =
@@ -22680,18 +22680,18 @@ void POA_CORBA_InterfaceDef::describe_interface_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->describe_interface (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -22700,7 +22700,7 @@ void POA_CORBA_InterfaceDef::describe_interface_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -22708,12 +22708,12 @@ void POA_CORBA_InterfaceDef::describe_interface_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22741,7 +22741,7 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -22782,12 +22782,12 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
       version.in (),
       type.in (),
       mode
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -22798,7 +22798,7 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
           version.in (),
           type.in (),
           mode
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -22807,7 +22807,7 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -22815,12 +22815,12 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22848,7 +22848,7 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -22898,12 +22898,12 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
       params,
       exceptions,
       contexts
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -22917,7 +22917,7 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
           params,
           exceptions,
           contexts
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -22926,7 +22926,7 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -22934,12 +22934,12 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22967,7 +22967,7 @@ void POA_CORBA_InterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -22977,7 +22977,7 @@ void POA_CORBA_InterfaceDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -22990,11 +22990,11 @@ void POA_CORBA_InterfaceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -23007,7 +23007,7 @@ void POA_CORBA_InterfaceDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference;
@@ -23026,7 +23026,7 @@ void POA_CORBA_InterfaceDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -23053,10 +23053,10 @@ void POA_CORBA_InterfaceDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_InterfaceDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -23090,12 +23090,12 @@ void* POA_CORBA_InterfaceDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_InterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_InterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -23105,9 +23105,9 @@ const char* POA_CORBA_InterfaceDef::_interface_repository_id (void) const
 }
 
 CORBA_InterfaceDef*
-POA_CORBA_InterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -23323,17 +23323,17 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_AbstractIn
 _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl&
 _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_AbstractInterfaceDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -23343,7 +23343,7 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -23440,7 +23440,7 @@ void POA_CORBA_AbstractInterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -23450,7 +23450,7 @@ void POA_CORBA_AbstractInterfaceDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -23463,11 +23463,11 @@ void POA_CORBA_AbstractInterfaceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -23480,7 +23480,7 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference;
@@ -23499,7 +23499,7 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -23526,10 +23526,10 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_AbstractInterfaceDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -23566,12 +23566,12 @@ void* POA_CORBA_AbstractInterfaceDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -23581,9 +23581,9 @@ const char* POA_CORBA_AbstractInterfaceDef::_interface_repository_id (void) cons
 }
 
 CORBA_AbstractInterfaceDef*
-POA_CORBA_AbstractInterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -23799,17 +23799,17 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_LocalInterfac
 _TAO_CORBA_LocalInterfaceDef_Proxy_Impl&
 _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_LocalInterfaceDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -23819,7 +23819,7 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -23916,7 +23916,7 @@ void POA_CORBA_LocalInterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -23926,7 +23926,7 @@ void POA_CORBA_LocalInterfaceDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -23939,11 +23939,11 @@ void POA_CORBA_LocalInterfaceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -23956,7 +23956,7 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference;
@@ -23975,7 +23975,7 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -24002,10 +24002,10 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_LocalInterfaceDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -24042,12 +24042,12 @@ void* POA_CORBA_LocalInterfaceDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -24057,9 +24057,9 @@ const char* POA_CORBA_LocalInterfaceDef::_interface_repository_id (void) const
 }
 
 CORBA_LocalInterfaceDef*
-POA_CORBA_LocalInterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
index 5b95644bc38..eefdd907bda 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
@@ -65,7 +65,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -76,38 +76,38 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_Repository *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_Contained_ptr lookup_id (
       const char * search_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -117,12 +117,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA::TypeCode_ptr tc
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -132,12 +132,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_PrimitiveDef_ptr get_primitive (
       CORBA::PrimitiveKind kind
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -147,12 +147,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_StringDef_ptr create_string (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -162,12 +162,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_WstringDef_ptr create_wstring (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -177,13 +177,13 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -193,13 +193,13 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -209,13 +209,13 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
       CORBA::Short scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -225,140 +225,140 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void lookup_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void lookup_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_module_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_constant_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_struct_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_union_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_enum_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_alias_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_box_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_exception_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_native_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_abstract_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_local_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -378,7 +378,7 @@ public:
 
   virtual ::_TAO_CORBA_Repository_Proxy_Impl &select_proxy (
     ::CORBA_Repository *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -387,7 +387,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -431,7 +431,7 @@ public:
   virtual CORBA_Contained_ptr lookup_id (
       CORBA_Object *_collocated_tao_target_,
       const char * search_id
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -440,7 +440,7 @@ public:
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA_Object *_collocated_tao_target_,
       CORBA::TypeCode_ptr tc
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -449,7 +449,7 @@ public:
   virtual CORBA_PrimitiveDef_ptr get_primitive (
       CORBA_Object *_collocated_tao_target_,
       CORBA::PrimitiveKind kind
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -458,7 +458,7 @@ public:
   virtual CORBA_StringDef_ptr create_string (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -467,7 +467,7 @@ public:
   virtual CORBA_WstringDef_ptr create_wstring (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -477,7 +477,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -487,7 +487,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong length,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -497,7 +497,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       CORBA::UShort digits,
       CORBA::Short scale
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -529,7 +529,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -540,31 +540,31 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_ModuleDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
@@ -573,210 +573,210 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void lookup_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_module_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_constant_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_struct_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_union_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_enum_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_alias_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_box_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_exception_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_native_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_abstract_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_local_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -796,7 +796,7 @@ public:
 
   virtual ::_TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
     ::CORBA_ModuleDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -805,7 +805,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -872,7 +872,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -883,37 +883,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_ConstantDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -923,11 +923,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -937,12 +937,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void type_def (
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -952,11 +952,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA::Any * value (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -966,12 +966,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void value (
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -981,98 +981,98 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -1092,7 +1092,7 @@ public:
 
   virtual ::_TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
     ::CORBA_ConstantDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1101,7 +1101,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1144,7 +1144,7 @@ public:
 
   virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1152,7 +1152,7 @@ public:
 
   virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1161,7 +1161,7 @@ public:
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1169,7 +1169,7 @@ public:
 
   virtual CORBA::Any * value (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1178,7 +1178,7 @@ public:
   virtual void value (
       CORBA_Object *_collocated_tao_target_,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1210,7 +1210,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -1221,37 +1221,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_StructDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_StructMemberSeq * members (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1261,12 +1261,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void members (
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1276,224 +1276,224 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void lookup_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void lookup_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_module_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_constant_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_struct_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_union_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_enum_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_alias_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_box_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_exception_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_native_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_abstract_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_local_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -1513,7 +1513,7 @@ public:
 
   virtual ::_TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
     ::CORBA_StructDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1522,7 +1522,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1566,7 +1566,7 @@ public:
 
   virtual CORBA_StructMemberSeq * members (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1575,7 +1575,7 @@ public:
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1607,7 +1607,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -1618,37 +1618,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_UnionDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr discriminator_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1658,11 +1658,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr discriminator_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1672,12 +1672,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void discriminator_type_def (
       CORBA_IDLType_ptr discriminator_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1687,11 +1687,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_UnionMemberSeq * members (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1701,12 +1701,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void members (
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1716,224 +1716,224 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void lookup_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void lookup_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_module_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_constant_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_struct_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_union_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_enum_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_alias_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_box_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_exception_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_native_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_abstract_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_local_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -1953,7 +1953,7 @@ public:
 
   virtual ::_TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
     ::CORBA_UnionDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1962,7 +1962,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -2006,7 +2006,7 @@ public:
 
   virtual CORBA::TypeCode_ptr discriminator_type (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2014,7 +2014,7 @@ public:
 
   virtual CORBA_IDLType_ptr discriminator_type_def (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2023,7 +2023,7 @@ public:
   virtual void discriminator_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr discriminator_type_def
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2031,7 +2031,7 @@ public:
 
   virtual CORBA_UnionMemberSeq * members (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2040,7 +2040,7 @@ public:
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2072,7 +2072,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -2083,37 +2083,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_EnumDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_EnumMemberSeq * members (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2123,12 +2123,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void members (
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2138,105 +2138,105 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -2256,7 +2256,7 @@ public:
 
   virtual ::_TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
     ::CORBA_EnumDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -2265,7 +2265,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -2308,7 +2308,7 @@ public:
 
   virtual CORBA_EnumMemberSeq * members (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2317,7 +2317,7 @@ public:
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2349,7 +2349,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -2360,37 +2360,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_AliasDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_IDLType_ptr original_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2400,12 +2400,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void original_type_def (
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2415,105 +2415,105 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -2533,7 +2533,7 @@ public:
 
   virtual ::_TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
     ::CORBA_AliasDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -2542,7 +2542,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -2585,7 +2585,7 @@ public:
 
   virtual CORBA_IDLType_ptr original_type_def (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2594,7 +2594,7 @@ public:
   virtual void original_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2626,7 +2626,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -2637,31 +2637,31 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_NativeDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
@@ -2670,98 +2670,98 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -2781,7 +2781,7 @@ public:
 
   virtual ::_TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
     ::CORBA_NativeDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -2790,7 +2790,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -2856,7 +2856,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -2867,37 +2867,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_PrimitiveDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::PrimitiveKind kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2907,28 +2907,28 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -2948,7 +2948,7 @@ public:
 
   virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
     ::CORBA_PrimitiveDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -2957,7 +2957,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -3000,7 +3000,7 @@ public:
 
   virtual CORBA::PrimitiveKind kind (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3032,7 +3032,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -3043,37 +3043,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_StringDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong bound (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3083,12 +3083,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void bound (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3098,28 +3098,28 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -3139,7 +3139,7 @@ public:
 
   virtual ::_TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
     ::CORBA_StringDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -3148,7 +3148,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -3191,7 +3191,7 @@ public:
 
   virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3200,7 +3200,7 @@ public:
   virtual void bound (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3232,7 +3232,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -3243,37 +3243,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_WstringDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong bound (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3283,12 +3283,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void bound (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3298,28 +3298,28 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -3339,7 +3339,7 @@ public:
 
   virtual ::_TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
     ::CORBA_WstringDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -3348,7 +3348,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -3391,7 +3391,7 @@ public:
 
   virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3400,7 +3400,7 @@ public:
   virtual void bound (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3432,7 +3432,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -3443,37 +3443,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_SequenceDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong bound (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3483,12 +3483,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void bound (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3498,11 +3498,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA::TypeCode_ptr element_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3512,11 +3512,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr element_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3526,12 +3526,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void element_type_def (
       CORBA_IDLType_ptr element_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3541,28 +3541,28 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -3582,7 +3582,7 @@ public:
 
   virtual ::_TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
     ::CORBA_SequenceDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -3591,7 +3591,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -3634,7 +3634,7 @@ public:
 
   virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3643,7 +3643,7 @@ public:
   virtual void bound (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3651,7 +3651,7 @@ public:
 
   virtual CORBA::TypeCode_ptr element_type (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3659,7 +3659,7 @@ public:
 
   virtual CORBA_IDLType_ptr element_type_def (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3668,7 +3668,7 @@ public:
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr element_type_def
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3700,7 +3700,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -3711,37 +3711,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_ArrayDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong length (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3751,12 +3751,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void length (
       CORBA::ULong length
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3766,11 +3766,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA::TypeCode_ptr element_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3780,11 +3780,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr element_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3794,12 +3794,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void element_type_def (
       CORBA_IDLType_ptr element_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3809,28 +3809,28 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -3850,7 +3850,7 @@ public:
 
   virtual ::_TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
     ::CORBA_ArrayDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -3859,7 +3859,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -3902,7 +3902,7 @@ public:
 
   virtual CORBA::ULong length (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3911,7 +3911,7 @@ public:
   virtual void length (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong length
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3919,7 +3919,7 @@ public:
 
   virtual CORBA::TypeCode_ptr element_type (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3927,7 +3927,7 @@ public:
 
   virtual CORBA_IDLType_ptr element_type_def (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3936,7 +3936,7 @@ public:
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr element_type_def
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3968,7 +3968,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -3979,37 +3979,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_ExceptionDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4019,11 +4019,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_StructMemberSeq * members (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4033,12 +4033,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void members (
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4048,217 +4048,217 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void lookup_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void lookup_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_module_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_constant_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_struct_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_union_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_enum_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_alias_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_box_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_exception_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_native_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_abstract_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_local_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -4278,7 +4278,7 @@ public:
 
   virtual ::_TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
     ::CORBA_ExceptionDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -4287,7 +4287,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -4331,7 +4331,7 @@ public:
 
   virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4339,7 +4339,7 @@ public:
 
   virtual CORBA_StructMemberSeq * members (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4348,7 +4348,7 @@ public:
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4380,7 +4380,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -4391,37 +4391,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_AttributeDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4431,11 +4431,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4445,12 +4445,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void type_def (
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4460,11 +4460,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA::AttributeMode mode (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4474,12 +4474,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void mode (
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4489,98 +4489,98 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -4600,7 +4600,7 @@ public:
 
   virtual ::_TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
     ::CORBA_AttributeDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -4609,7 +4609,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -4652,7 +4652,7 @@ public:
 
   virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4660,7 +4660,7 @@ public:
 
   virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4669,7 +4669,7 @@ public:
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4677,7 +4677,7 @@ public:
 
   virtual CORBA::AttributeMode mode (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4686,7 +4686,7 @@ public:
   virtual void mode (
       CORBA_Object *_collocated_tao_target_,
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4718,7 +4718,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -4729,37 +4729,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_OperationDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4769,11 +4769,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr result_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4783,12 +4783,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void result_def (
       CORBA_IDLType_ptr result_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4798,11 +4798,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ParDescriptionSeq * params (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4812,12 +4812,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void params (
       const CORBA_ParDescriptionSeq & params
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4827,11 +4827,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA::OperationMode mode (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4841,12 +4841,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void mode (
       CORBA::OperationMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4856,11 +4856,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ContextIdSeq * contexts (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4870,12 +4870,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void contexts (
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4885,11 +4885,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ExceptionDefSeq * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4899,12 +4899,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void exceptions (
       const CORBA_ExceptionDefSeq & exceptions
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4914,98 +4914,98 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -5025,7 +5025,7 @@ public:
 
   virtual ::_TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
     ::CORBA_OperationDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -5034,7 +5034,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -5077,7 +5077,7 @@ public:
 
   virtual CORBA::TypeCode_ptr result (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5085,7 +5085,7 @@ public:
 
   virtual CORBA_IDLType_ptr result_def (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5094,7 +5094,7 @@ public:
   virtual void result_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr result_def
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5102,7 +5102,7 @@ public:
 
   virtual CORBA_ParDescriptionSeq * params (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5111,7 +5111,7 @@ public:
   virtual void params (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_ParDescriptionSeq & params
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5119,7 +5119,7 @@ public:
 
   virtual CORBA::OperationMode mode (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5128,7 +5128,7 @@ public:
   virtual void mode (
       CORBA_Object *_collocated_tao_target_,
       CORBA::OperationMode mode
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5136,7 +5136,7 @@ public:
 
   virtual CORBA_ContextIdSeq * contexts (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5145,7 +5145,7 @@ public:
   virtual void contexts (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5153,7 +5153,7 @@ public:
 
   virtual CORBA_ExceptionDefSeq * exceptions (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5162,7 +5162,7 @@ public:
   virtual void exceptions (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_ExceptionDefSeq & exceptions
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5194,7 +5194,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -5205,37 +5205,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_InterfaceDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_InterfaceDefSeq * base_interfaces (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5245,12 +5245,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void base_interfaces (
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5260,12 +5260,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_a (
       const char * interface_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5275,11 +5275,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5289,7 +5289,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_AttributeDef_ptr create_attribute (
@@ -5298,7 +5298,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5308,7 +5308,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_OperationDef_ptr create_operation (
@@ -5320,7 +5320,7 @@ public:
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5330,224 +5330,224 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void lookup_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void lookup_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_module_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_constant_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_struct_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_union_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_enum_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_alias_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_box_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_exception_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_native_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_abstract_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_local_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -5567,7 +5567,7 @@ public:
 
   virtual ::_TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
     ::CORBA_InterfaceDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -5576,7 +5576,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -5621,7 +5621,7 @@ public:
 
   virtual CORBA_InterfaceDefSeq * base_interfaces (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5630,7 +5630,7 @@ public:
   virtual void base_interfaces (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5639,7 +5639,7 @@ public:
   virtual CORBA::Boolean is_a (
       CORBA_Object *_collocated_tao_target_,
       const char * interface_id
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5647,7 +5647,7 @@ public:
 
   virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5660,7 +5660,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5676,7 +5676,7 @@ public:
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -5708,7 +5708,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -5719,31 +5719,31 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_AbstractInterfaceDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
@@ -5752,259 +5752,259 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_base_interfaces_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_attribute_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_operation_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void lookup_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void lookup_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_module_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_constant_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_struct_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_union_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_enum_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_alias_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_box_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_exception_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_native_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_abstract_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_local_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -6024,7 +6024,7 @@ public:
 
   virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
     ::CORBA_AbstractInterfaceDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -6033,7 +6033,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -6099,7 +6099,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -6110,31 +6110,31 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_LocalInterfaceDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
@@ -6143,259 +6143,259 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_base_interfaces_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_attribute_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_operation_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void lookup_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void lookup_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_module_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_constant_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_struct_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_union_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_enum_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_alias_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_box_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_exception_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_native_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_abstract_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_local_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -6415,7 +6415,7 @@ public:
 
   virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
     ::CORBA_LocalInterfaceDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -6424,7 +6424,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.i b/TAO/orbsvcs/IFR_Service/IFR_BasicS.i
index 452b604e36f..9b6f1854e59 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.i
@@ -23,7 +23,7 @@ ACE_INLINE void POA_CORBA_Repository::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -31,14 +31,14 @@ ACE_INLINE void POA_CORBA_Repository::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -46,14 +46,14 @@ ACE_INLINE void POA_CORBA_Repository::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -61,14 +61,14 @@ ACE_INLINE void POA_CORBA_Repository::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -76,14 +76,14 @@ ACE_INLINE void POA_CORBA_Repository::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -91,14 +91,14 @@ ACE_INLINE void POA_CORBA_Repository::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -106,14 +106,14 @@ ACE_INLINE void POA_CORBA_Repository::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -121,14 +121,14 @@ ACE_INLINE void POA_CORBA_Repository::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -136,14 +136,14 @@ ACE_INLINE void POA_CORBA_Repository::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -151,14 +151,14 @@ ACE_INLINE void POA_CORBA_Repository::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -166,14 +166,14 @@ ACE_INLINE void POA_CORBA_Repository::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -181,14 +181,14 @@ ACE_INLINE void POA_CORBA_Repository::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -196,14 +196,14 @@ ACE_INLINE void POA_CORBA_Repository::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -211,14 +211,14 @@ ACE_INLINE void POA_CORBA_Repository::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -226,14 +226,14 @@ ACE_INLINE void POA_CORBA_Repository::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -241,14 +241,14 @@ ACE_INLINE void POA_CORBA_Repository::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -256,14 +256,14 @@ ACE_INLINE void POA_CORBA_Repository::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -271,14 +271,14 @@ ACE_INLINE void POA_CORBA_Repository::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -286,14 +286,14 @@ ACE_INLINE void POA_CORBA_Repository::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Repository_ptr) obj;
@@ -301,14 +301,14 @@ ACE_INLINE void POA_CORBA_Repository::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -316,14 +316,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -331,14 +331,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -346,14 +346,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -361,14 +361,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -376,14 +376,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -391,14 +391,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -406,14 +406,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -421,14 +421,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -436,14 +436,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -451,14 +451,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -466,14 +466,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -481,14 +481,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -496,14 +496,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -511,14 +511,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -526,14 +526,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -541,14 +541,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -556,14 +556,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -571,14 +571,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -586,14 +586,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -601,14 +601,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -616,14 +616,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -631,14 +631,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -646,14 +646,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -661,14 +661,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -676,14 +676,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -691,14 +691,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -706,14 +706,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -721,14 +721,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -736,14 +736,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
@@ -751,14 +751,14 @@ ACE_INLINE void POA_CORBA_ModuleDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
@@ -766,14 +766,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
@@ -781,14 +781,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
@@ -796,14 +796,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
@@ -811,14 +811,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
@@ -826,14 +826,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
@@ -841,14 +841,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
@@ -856,14 +856,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
@@ -871,14 +871,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
@@ -886,14 +886,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
@@ -901,14 +901,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
@@ -916,14 +916,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
@@ -931,14 +931,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
@@ -946,14 +946,14 @@ ACE_INLINE void POA_CORBA_ConstantDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -961,14 +961,14 @@ ACE_INLINE void POA_CORBA_StructDef::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -976,14 +976,14 @@ ACE_INLINE void POA_CORBA_StructDef::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -991,14 +991,14 @@ ACE_INLINE void POA_CORBA_StructDef::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1006,14 +1006,14 @@ ACE_INLINE void POA_CORBA_StructDef::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1021,14 +1021,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1036,14 +1036,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1051,14 +1051,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1066,14 +1066,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1081,14 +1081,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1096,14 +1096,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1111,14 +1111,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1126,14 +1126,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1141,14 +1141,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1156,14 +1156,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1171,14 +1171,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1186,14 +1186,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1201,14 +1201,14 @@ ACE_INLINE void POA_CORBA_StructDef::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1216,14 +1216,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1231,14 +1231,14 @@ ACE_INLINE void POA_CORBA_StructDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1246,14 +1246,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1261,14 +1261,14 @@ ACE_INLINE void POA_CORBA_StructDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1276,14 +1276,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1291,14 +1291,14 @@ ACE_INLINE void POA_CORBA_StructDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1306,14 +1306,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1321,14 +1321,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1336,14 +1336,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1351,14 +1351,14 @@ ACE_INLINE void POA_CORBA_StructDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1366,14 +1366,14 @@ ACE_INLINE void POA_CORBA_StructDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1381,14 +1381,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1396,14 +1396,14 @@ ACE_INLINE void POA_CORBA_StructDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_StructDef_ptr) obj;
@@ -1411,14 +1411,14 @@ ACE_INLINE void POA_CORBA_StructDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1426,14 +1426,14 @@ ACE_INLINE void POA_CORBA_UnionDef::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1441,14 +1441,14 @@ ACE_INLINE void POA_CORBA_UnionDef::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1456,14 +1456,14 @@ ACE_INLINE void POA_CORBA_UnionDef::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1471,14 +1471,14 @@ ACE_INLINE void POA_CORBA_UnionDef::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1486,14 +1486,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1501,14 +1501,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1516,14 +1516,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1531,14 +1531,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1546,14 +1546,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1561,14 +1561,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1576,14 +1576,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1591,14 +1591,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1606,14 +1606,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1621,14 +1621,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1636,14 +1636,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1651,14 +1651,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1666,14 +1666,14 @@ ACE_INLINE void POA_CORBA_UnionDef::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1681,14 +1681,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1696,14 +1696,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1711,14 +1711,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1726,14 +1726,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1741,14 +1741,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1756,14 +1756,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1771,14 +1771,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1786,14 +1786,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1801,14 +1801,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1816,14 +1816,14 @@ ACE_INLINE void POA_CORBA_UnionDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1831,14 +1831,14 @@ ACE_INLINE void POA_CORBA_UnionDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1846,14 +1846,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1861,14 +1861,14 @@ ACE_INLINE void POA_CORBA_UnionDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
@@ -1876,14 +1876,14 @@ ACE_INLINE void POA_CORBA_UnionDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -1891,14 +1891,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -1906,14 +1906,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -1921,14 +1921,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -1936,14 +1936,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -1951,14 +1951,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -1966,14 +1966,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -1981,14 +1981,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -1996,14 +1996,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -2011,14 +2011,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -2026,14 +2026,14 @@ ACE_INLINE void POA_CORBA_EnumDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -2041,14 +2041,14 @@ ACE_INLINE void POA_CORBA_EnumDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -2056,14 +2056,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -2071,14 +2071,14 @@ ACE_INLINE void POA_CORBA_EnumDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
@@ -2086,14 +2086,14 @@ ACE_INLINE void POA_CORBA_EnumDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2101,14 +2101,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2116,14 +2116,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2131,14 +2131,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2146,14 +2146,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2161,14 +2161,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2176,14 +2176,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2191,14 +2191,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2206,14 +2206,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2221,14 +2221,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2236,14 +2236,14 @@ ACE_INLINE void POA_CORBA_AliasDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2251,14 +2251,14 @@ ACE_INLINE void POA_CORBA_AliasDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2266,14 +2266,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2281,14 +2281,14 @@ ACE_INLINE void POA_CORBA_AliasDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
@@ -2296,14 +2296,14 @@ ACE_INLINE void POA_CORBA_AliasDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2311,14 +2311,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2326,14 +2326,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2341,14 +2341,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2356,14 +2356,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2371,14 +2371,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2386,14 +2386,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2401,14 +2401,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2416,14 +2416,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2431,14 +2431,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2446,14 +2446,14 @@ ACE_INLINE void POA_CORBA_NativeDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2461,14 +2461,14 @@ ACE_INLINE void POA_CORBA_NativeDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2476,14 +2476,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2491,14 +2491,14 @@ ACE_INLINE void POA_CORBA_NativeDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
@@ -2506,14 +2506,14 @@ ACE_INLINE void POA_CORBA_NativeDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_PrimitiveDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj;
@@ -2521,14 +2521,14 @@ ACE_INLINE void POA_CORBA_PrimitiveDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_PrimitiveDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj;
@@ -2536,14 +2536,14 @@ ACE_INLINE void POA_CORBA_PrimitiveDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_PrimitiveDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj;
@@ -2551,14 +2551,14 @@ ACE_INLINE void POA_CORBA_PrimitiveDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StringDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_StringDef_ptr) obj;
@@ -2566,14 +2566,14 @@ ACE_INLINE void POA_CORBA_StringDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StringDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_StringDef_ptr) obj;
@@ -2581,14 +2581,14 @@ ACE_INLINE void POA_CORBA_StringDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StringDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_StringDef_ptr) obj;
@@ -2596,14 +2596,14 @@ ACE_INLINE void POA_CORBA_StringDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_WstringDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_WstringDef_ptr) obj;
@@ -2611,14 +2611,14 @@ ACE_INLINE void POA_CORBA_WstringDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_WstringDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_WstringDef_ptr) obj;
@@ -2626,14 +2626,14 @@ ACE_INLINE void POA_CORBA_WstringDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_WstringDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_WstringDef_ptr) obj;
@@ -2641,14 +2641,14 @@ ACE_INLINE void POA_CORBA_WstringDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_SequenceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_SequenceDef_ptr) obj;
@@ -2656,14 +2656,14 @@ ACE_INLINE void POA_CORBA_SequenceDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_SequenceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_SequenceDef_ptr) obj;
@@ -2671,14 +2671,14 @@ ACE_INLINE void POA_CORBA_SequenceDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_SequenceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_SequenceDef_ptr) obj;
@@ -2686,14 +2686,14 @@ ACE_INLINE void POA_CORBA_SequenceDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ArrayDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_ArrayDef_ptr) obj;
@@ -2701,14 +2701,14 @@ ACE_INLINE void POA_CORBA_ArrayDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ArrayDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ArrayDef_ptr) obj;
@@ -2716,14 +2716,14 @@ ACE_INLINE void POA_CORBA_ArrayDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ArrayDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ArrayDef_ptr) obj;
@@ -2731,14 +2731,14 @@ ACE_INLINE void POA_CORBA_ArrayDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2746,14 +2746,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2761,14 +2761,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2776,14 +2776,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2791,14 +2791,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2806,14 +2806,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2821,14 +2821,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2836,14 +2836,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2851,14 +2851,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2866,14 +2866,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2881,14 +2881,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2896,14 +2896,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2911,14 +2911,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2926,14 +2926,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2941,14 +2941,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2956,14 +2956,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2971,14 +2971,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -2986,14 +2986,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -3001,14 +3001,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -3016,14 +3016,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -3031,14 +3031,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -3046,14 +3046,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -3061,14 +3061,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -3076,14 +3076,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -3091,14 +3091,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -3106,14 +3106,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -3121,14 +3121,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -3136,14 +3136,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -3151,14 +3151,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -3166,14 +3166,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
@@ -3181,14 +3181,14 @@ ACE_INLINE void POA_CORBA_ExceptionDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
@@ -3196,14 +3196,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
@@ -3211,14 +3211,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
@@ -3226,14 +3226,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
@@ -3241,14 +3241,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
@@ -3256,14 +3256,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
@@ -3271,14 +3271,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
@@ -3286,14 +3286,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
@@ -3301,14 +3301,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
@@ -3316,14 +3316,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
@@ -3331,14 +3331,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
@@ -3346,14 +3346,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
@@ -3361,14 +3361,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
@@ -3376,14 +3376,14 @@ ACE_INLINE void POA_CORBA_AttributeDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
@@ -3391,14 +3391,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
@@ -3406,14 +3406,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
@@ -3421,14 +3421,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
@@ -3436,14 +3436,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
@@ -3451,14 +3451,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
@@ -3466,14 +3466,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
@@ -3481,14 +3481,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
@@ -3496,14 +3496,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
@@ -3511,14 +3511,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
@@ -3526,14 +3526,14 @@ ACE_INLINE void POA_CORBA_OperationDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
@@ -3541,14 +3541,14 @@ ACE_INLINE void POA_CORBA_OperationDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
@@ -3556,14 +3556,14 @@ ACE_INLINE void POA_CORBA_OperationDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
@@ -3571,14 +3571,14 @@ ACE_INLINE void POA_CORBA_OperationDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3586,14 +3586,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3601,14 +3601,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3616,14 +3616,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3631,14 +3631,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3646,14 +3646,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3661,14 +3661,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3676,14 +3676,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3691,14 +3691,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3706,14 +3706,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3721,14 +3721,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3736,14 +3736,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3751,14 +3751,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3766,14 +3766,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3781,14 +3781,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3796,14 +3796,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3811,14 +3811,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3826,14 +3826,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3841,14 +3841,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3856,14 +3856,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3871,14 +3871,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3886,14 +3886,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3901,14 +3901,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3916,14 +3916,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3931,14 +3931,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3946,14 +3946,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3961,14 +3961,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3976,14 +3976,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -3991,14 +3991,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -4006,14 +4006,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -4021,14 +4021,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
@@ -4036,14 +4036,14 @@ ACE_INLINE void POA_CORBA_InterfaceDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4051,14 +4051,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4066,14 +4066,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4081,14 +4081,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::is_a_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4096,14 +4096,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_interface_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4111,14 +4111,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_attribute_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4126,14 +4126,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_operation_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4141,14 +4141,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4156,14 +4156,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4171,14 +4171,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4186,14 +4186,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4201,14 +4201,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4216,14 +4216,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4231,14 +4231,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4246,14 +4246,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4261,14 +4261,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4276,14 +4276,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4291,14 +4291,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4306,14 +4306,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4321,14 +4321,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4336,14 +4336,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4351,14 +4351,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4366,14 +4366,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4381,14 +4381,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4396,14 +4396,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4411,14 +4411,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4426,14 +4426,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4441,14 +4441,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4456,14 +4456,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4471,14 +4471,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4486,14 +4486,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4501,14 +4501,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4516,14 +4516,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_containing_repository_skel
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4531,14 +4531,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4546,14 +4546,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4561,14 +4561,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4576,14 +4576,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
@@ -4591,14 +4591,14 @@ ACE_INLINE void POA_CORBA_AbstractInterfaceDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4606,14 +4606,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4621,14 +4621,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4636,14 +4636,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::is_a_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4651,14 +4651,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_interface_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4666,14 +4666,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_attribute_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4681,14 +4681,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_operation_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4696,14 +4696,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4711,14 +4711,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4726,14 +4726,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4741,14 +4741,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4756,14 +4756,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4771,14 +4771,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4786,14 +4786,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4801,14 +4801,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4816,14 +4816,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4831,14 +4831,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4846,14 +4846,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4861,14 +4861,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4876,14 +4876,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4891,14 +4891,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4906,14 +4906,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4921,14 +4921,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4936,14 +4936,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4951,14 +4951,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4966,14 +4966,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4981,14 +4981,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -4996,14 +4996,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -5011,14 +5011,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -5026,14 +5026,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -5041,14 +5041,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -5056,14 +5056,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -5071,14 +5071,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -5086,14 +5086,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -5101,14 +5101,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -5116,14 +5116,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -5131,14 +5131,14 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
@@ -5146,6 +5146,6 @@ ACE_INLINE void POA_CORBA_LocalInterfaceDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
index 84a6f1f22d9..a9e5d0de606 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
@@ -67,11 +67,11 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_Contained_ptr lookup_id (
       const char * search_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -79,7 +79,7 @@ public:
 
     CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA::TypeCode_ptr tc
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -87,7 +87,7 @@ public:
 
     CORBA_PrimitiveDef_ptr get_primitive (
       CORBA::PrimitiveKind kind
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -95,7 +95,7 @@ public:
 
     CORBA_StringDef_ptr create_string (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -103,7 +103,7 @@ public:
 
     CORBA_WstringDef_ptr create_wstring (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -112,7 +112,7 @@ public:
     CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -121,7 +121,7 @@ public:
     CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -130,7 +130,7 @@ public:
     CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
       CORBA::Short scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -138,7 +138,7 @@ public:
 
     CORBA_Contained_ptr lookup (
       const char * search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -147,7 +147,7 @@ public:
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -158,7 +158,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -168,7 +168,7 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -178,7 +178,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -190,7 +190,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -201,7 +201,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -213,7 +213,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -224,7 +224,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -235,7 +235,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -246,7 +246,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -263,7 +263,7 @@ public:
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -274,7 +274,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -285,7 +285,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -295,7 +295,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -306,7 +306,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_AbstractInterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -317,21 +317,21 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -377,11 +377,11 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_Contained_ptr lookup (
       const char * search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -390,7 +390,7 @@ public:
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -401,7 +401,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -411,7 +411,7 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -421,7 +421,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -433,7 +433,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -444,7 +444,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -456,7 +456,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -467,7 +467,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -478,7 +478,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -489,7 +489,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -506,7 +506,7 @@ public:
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -517,7 +517,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -528,7 +528,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -538,7 +538,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -549,7 +549,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_AbstractInterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -560,14 +560,14 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -575,14 +575,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -590,14 +590,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -605,35 +605,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -643,21 +643,21 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -703,17 +703,17 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_IDLType_ptr type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -721,14 +721,14 @@ public:
 
     void type_def (
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::Any * value (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -736,14 +736,14 @@ public:
 
     void value (
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -751,14 +751,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -766,14 +766,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -781,35 +781,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -819,21 +819,21 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -879,10 +879,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_StructMemberSeq * members (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -890,7 +890,7 @@ public:
 
     void members (
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -898,7 +898,7 @@ public:
 
     CORBA_Contained_ptr lookup (
       const char * search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -907,7 +907,7 @@ public:
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -918,7 +918,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -928,7 +928,7 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -938,7 +938,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -950,7 +950,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -961,7 +961,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -973,7 +973,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -984,7 +984,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -995,7 +995,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1006,7 +1006,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1023,7 +1023,7 @@ public:
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1034,7 +1034,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1045,7 +1045,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1055,7 +1055,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1066,7 +1066,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_AbstractInterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1077,14 +1077,14 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1092,14 +1092,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1107,14 +1107,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1122,35 +1122,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1160,28 +1160,28 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1227,17 +1227,17 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::TypeCode_ptr discriminator_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_IDLType_ptr discriminator_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1245,14 +1245,14 @@ public:
 
     void discriminator_type_def (
       CORBA_IDLType_ptr discriminator_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_UnionMemberSeq * members (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1260,7 +1260,7 @@ public:
 
     void members (
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1268,7 +1268,7 @@ public:
 
     CORBA_Contained_ptr lookup (
       const char * search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1277,7 +1277,7 @@ public:
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1288,7 +1288,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1298,7 +1298,7 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1308,7 +1308,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1320,7 +1320,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1331,7 +1331,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1343,7 +1343,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1354,7 +1354,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1365,7 +1365,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1376,7 +1376,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1393,7 +1393,7 @@ public:
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1404,7 +1404,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1415,7 +1415,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1425,7 +1425,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1436,7 +1436,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_AbstractInterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1447,14 +1447,14 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1462,14 +1462,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1477,14 +1477,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1492,35 +1492,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1530,28 +1530,28 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1597,10 +1597,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_EnumMemberSeq * members (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1608,14 +1608,14 @@ public:
 
     void members (
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1623,14 +1623,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1638,14 +1638,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1653,35 +1653,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1691,28 +1691,28 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1758,10 +1758,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_IDLType_ptr original_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1769,14 +1769,14 @@ public:
 
     void original_type_def (
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1784,14 +1784,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1799,14 +1799,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1814,35 +1814,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1852,28 +1852,28 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1919,10 +1919,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1930,14 +1930,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1945,14 +1945,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1960,35 +1960,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1998,28 +1998,28 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2065,31 +2065,31 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::PrimitiveKind kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2135,10 +2135,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::ULong bound (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2146,28 +2146,28 @@ public:
 
     void bound (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2213,10 +2213,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::ULong bound (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2224,28 +2224,28 @@ public:
 
     void bound (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2291,10 +2291,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::ULong bound (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2302,21 +2302,21 @@ public:
 
     void bound (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr element_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_IDLType_ptr element_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2324,28 +2324,28 @@ public:
 
     void element_type_def (
       CORBA_IDLType_ptr element_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2391,10 +2391,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::ULong length (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2402,21 +2402,21 @@ public:
 
     void length (
       CORBA::ULong length
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr element_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_IDLType_ptr element_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2424,28 +2424,28 @@ public:
 
     void element_type_def (
       CORBA_IDLType_ptr element_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2491,17 +2491,17 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_StructMemberSeq * members (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2509,14 +2509,14 @@ public:
 
     void members (
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2524,14 +2524,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2539,14 +2539,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2554,35 +2554,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2592,7 +2592,7 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2600,7 +2600,7 @@ public:
 
     CORBA_Contained_ptr lookup (
       const char * search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2609,7 +2609,7 @@ public:
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2620,7 +2620,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2630,7 +2630,7 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2640,7 +2640,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2652,7 +2652,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2663,7 +2663,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2675,7 +2675,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2686,7 +2686,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2697,7 +2697,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2708,7 +2708,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2725,7 +2725,7 @@ public:
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2736,7 +2736,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2747,7 +2747,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2757,7 +2757,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2768,7 +2768,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_AbstractInterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2779,21 +2779,21 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2839,17 +2839,17 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_IDLType_ptr type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2857,14 +2857,14 @@ public:
 
     void type_def (
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::AttributeMode mode (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2872,14 +2872,14 @@ public:
 
     void mode (
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2887,14 +2887,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2902,14 +2902,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2917,35 +2917,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -2955,21 +2955,21 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3015,17 +3015,17 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::TypeCode_ptr result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_IDLType_ptr result_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3033,14 +3033,14 @@ public:
 
     void result_def (
       CORBA_IDLType_ptr result_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_ParDescriptionSeq * params (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3048,14 +3048,14 @@ public:
 
     void params (
       const CORBA_ParDescriptionSeq & params
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::OperationMode mode (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3063,14 +3063,14 @@ public:
 
     void mode (
       CORBA::OperationMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_ContextIdSeq * contexts (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3078,14 +3078,14 @@ public:
 
     void contexts (
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_ExceptionDefSeq * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3093,14 +3093,14 @@ public:
 
     void exceptions (
       const CORBA_ExceptionDefSeq & exceptions
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3108,14 +3108,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3123,14 +3123,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3138,35 +3138,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3176,21 +3176,21 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3236,10 +3236,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_InterfaceDefSeq * base_interfaces (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3247,7 +3247,7 @@ public:
 
     void base_interfaces (
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3255,14 +3255,14 @@ public:
 
     CORBA::Boolean is_a (
       const char * interface_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3274,7 +3274,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3289,7 +3289,7 @@ public:
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3297,7 +3297,7 @@ public:
 
     CORBA_Contained_ptr lookup (
       const char * search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3306,7 +3306,7 @@ public:
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3317,7 +3317,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3327,7 +3327,7 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3337,7 +3337,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3349,7 +3349,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3360,7 +3360,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3372,7 +3372,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3383,7 +3383,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3394,7 +3394,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3405,7 +3405,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3422,7 +3422,7 @@ public:
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3433,7 +3433,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3444,7 +3444,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3454,7 +3454,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3465,7 +3465,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_AbstractInterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3476,14 +3476,14 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3491,14 +3491,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3506,14 +3506,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3521,35 +3521,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3559,28 +3559,28 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3626,10 +3626,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_InterfaceDefSeq * base_interfaces (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3637,7 +3637,7 @@ public:
 
     void base_interfaces (
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3645,14 +3645,14 @@ public:
 
     CORBA::Boolean is_a (
       const char * interface_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3664,7 +3664,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3679,7 +3679,7 @@ public:
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3687,7 +3687,7 @@ public:
 
     CORBA_Contained_ptr lookup (
       const char * search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3696,7 +3696,7 @@ public:
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3707,7 +3707,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3717,7 +3717,7 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3727,7 +3727,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3739,7 +3739,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3750,7 +3750,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3762,7 +3762,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3773,7 +3773,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3784,7 +3784,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3795,7 +3795,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3812,7 +3812,7 @@ public:
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3823,7 +3823,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3834,7 +3834,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3844,7 +3844,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3855,7 +3855,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_AbstractInterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3866,14 +3866,14 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3881,14 +3881,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3896,14 +3896,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3911,35 +3911,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -3949,28 +3949,28 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4016,10 +4016,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_InterfaceDefSeq * base_interfaces (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4027,7 +4027,7 @@ public:
 
     void base_interfaces (
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4035,14 +4035,14 @@ public:
 
     CORBA::Boolean is_a (
       const char * interface_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4054,7 +4054,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4069,7 +4069,7 @@ public:
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4077,7 +4077,7 @@ public:
 
     CORBA_Contained_ptr lookup (
       const char * search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4086,7 +4086,7 @@ public:
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4097,7 +4097,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4107,7 +4107,7 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4117,7 +4117,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4129,7 +4129,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4140,7 +4140,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4152,7 +4152,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4163,7 +4163,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4174,7 +4174,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4185,7 +4185,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4202,7 +4202,7 @@ public:
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4213,7 +4213,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4224,7 +4224,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4234,7 +4234,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4245,7 +4245,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_AbstractInterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4256,14 +4256,14 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4271,14 +4271,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4286,14 +4286,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4301,35 +4301,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -4339,28 +4339,28 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
index ca9953d37d4..1c872d26eb9 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
@@ -90,18 +90,18 @@ POA_CORBA_Repository_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_Repository_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_Repository_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_Repository::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_Repository::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup_id  (
     const char * search_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -109,14 +109,14 @@ CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup_id  (
 {
   return this->ptr_->lookup_id (
 search_id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_Repository_tie<T>::get_canonical_typecode  (
     CORBA::TypeCode_ptr tc
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -124,14 +124,14 @@ CORBA::TypeCode_ptr POA_CORBA_Repository_tie<T>::get_canonical_typecode  (
 {
   return this->ptr_->get_canonical_typecode (
 tc
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_PrimitiveDef_ptr POA_CORBA_Repository_tie<T>::get_primitive  (
     CORBA::PrimitiveKind kind
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -139,14 +139,14 @@ CORBA_PrimitiveDef_ptr POA_CORBA_Repository_tie<T>::get_primitive  (
 {
   return this->ptr_->get_primitive (
 kind
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_StringDef_ptr POA_CORBA_Repository_tie<T>::create_string  (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -154,14 +154,14 @@ CORBA_StringDef_ptr POA_CORBA_Repository_tie<T>::create_string  (
 {
   return this->ptr_->create_string (
 bound
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_WstringDef_ptr POA_CORBA_Repository_tie<T>::create_wstring  (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -169,7 +169,7 @@ CORBA_WstringDef_ptr POA_CORBA_Repository_tie<T>::create_wstring  (
 {
   return this->ptr_->create_wstring (
 bound
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -177,7 +177,7 @@ template <class T> ACE_INLINE
 CORBA_SequenceDef_ptr POA_CORBA_Repository_tie<T>::create_sequence  (
     CORBA::ULong bound,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -186,7 +186,7 @@ CORBA_SequenceDef_ptr POA_CORBA_Repository_tie<T>::create_sequence  (
   return this->ptr_->create_sequence (
 bound,
     element_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -194,7 +194,7 @@ template <class T> ACE_INLINE
 CORBA_ArrayDef_ptr POA_CORBA_Repository_tie<T>::create_array  (
     CORBA::ULong length,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -203,7 +203,7 @@ CORBA_ArrayDef_ptr POA_CORBA_Repository_tie<T>::create_array  (
   return this->ptr_->create_array (
 length,
     element_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -211,7 +211,7 @@ template <class T> ACE_INLINE
 CORBA_FixedDef_ptr POA_CORBA_Repository_tie<T>::create_fixed  (
     CORBA::UShort digits,
     CORBA::Short scale
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -220,14 +220,14 @@ CORBA_FixedDef_ptr POA_CORBA_Repository_tie<T>::create_fixed  (
   return this->ptr_->create_fixed (
 digits,
     scale
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup  (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -235,7 +235,7 @@ CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup  (
 {
   return this->ptr_->lookup (
 search_name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -243,7 +243,7 @@ template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -252,7 +252,7 @@ CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::contents  (
   return this->ptr_->contents (
 limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -262,7 +262,7 @@ CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::lookup_name  (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -273,7 +273,7 @@ search_name,
     levels_to_search,
     limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -282,7 +282,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Repository_tie<T>::describe_contents
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -292,7 +292,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Repository_tie<T>::describe_contents
 limit_type,
     exclude_inherited,
     max_returned_objs
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -301,7 +301,7 @@ CORBA_ModuleDef_ptr POA_CORBA_Repository_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -311,7 +311,7 @@ CORBA_ModuleDef_ptr POA_CORBA_Repository_tie<T>::create_module  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -322,7 +322,7 @@ CORBA_ConstantDef_ptr POA_CORBA_Repository_tie<T>::create_constant  (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -334,7 +334,7 @@ id,
     version,
     type,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -344,7 +344,7 @@ CORBA_StructDef_ptr POA_CORBA_Repository_tie<T>::create_struct  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -355,7 +355,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -366,7 +366,7 @@ CORBA_UnionDef_ptr POA_CORBA_Repository_tie<T>::create_union  (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -378,7 +378,7 @@ id,
     version,
     discriminator_type,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -388,7 +388,7 @@ CORBA_EnumDef_ptr POA_CORBA_Repository_tie<T>::create_enum  (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -399,7 +399,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -409,7 +409,7 @@ CORBA_AliasDef_ptr POA_CORBA_Repository_tie<T>::create_alias  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -420,7 +420,7 @@ id,
     name,
     version,
     original_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -430,7 +430,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -441,7 +441,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -457,7 +457,7 @@ CORBA_ValueDef_ptr POA_CORBA_Repository_tie<T>::create_value  (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -474,7 +474,7 @@ id,
     abstract_base_values,
     supported_interfaces,
     initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -484,7 +484,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Repository_tie<T>::create_value_box  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -495,7 +495,7 @@ id,
     name,
     version,
     original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -505,7 +505,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_Repository_tie<T>::create_exception  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -516,7 +516,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -525,7 +525,7 @@ CORBA_NativeDef_ptr POA_CORBA_Repository_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -535,7 +535,7 @@ CORBA_NativeDef_ptr POA_CORBA_Repository_tie<T>::create_native  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -545,7 +545,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_abstract_inte
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -556,7 +556,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -566,7 +566,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_local_interface
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -577,33 +577,33 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_Repository_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Repository_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -676,18 +676,18 @@ POA_CORBA_ModuleDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ModuleDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ModuleDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ModuleDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_ModuleDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_ModuleDef_tie<T>::lookup  (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -695,7 +695,7 @@ CORBA_Contained_ptr POA_CORBA_ModuleDef_tie<T>::lookup  (
 {
   return this->ptr_->lookup (
 search_name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -703,7 +703,7 @@ template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -712,7 +712,7 @@ CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::contents  (
   return this->ptr_->contents (
 limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -722,7 +722,7 @@ CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::lookup_name  (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -733,7 +733,7 @@ search_name,
     levels_to_search,
     limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -742,7 +742,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ModuleDef_tie<T>::describe_contents
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -752,7 +752,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ModuleDef_tie<T>::describe_contents
 limit_type,
     exclude_inherited,
     max_returned_objs
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -761,7 +761,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ModuleDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -771,7 +771,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ModuleDef_tie<T>::create_module  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -782,7 +782,7 @@ CORBA_ConstantDef_ptr POA_CORBA_ModuleDef_tie<T>::create_constant  (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -794,7 +794,7 @@ id,
     version,
     type,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -804,7 +804,7 @@ CORBA_StructDef_ptr POA_CORBA_ModuleDef_tie<T>::create_struct  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -815,7 +815,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -826,7 +826,7 @@ CORBA_UnionDef_ptr POA_CORBA_ModuleDef_tie<T>::create_union  (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -838,7 +838,7 @@ id,
     version,
     discriminator_type,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -848,7 +848,7 @@ CORBA_EnumDef_ptr POA_CORBA_ModuleDef_tie<T>::create_enum  (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -859,7 +859,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -869,7 +869,7 @@ CORBA_AliasDef_ptr POA_CORBA_ModuleDef_tie<T>::create_alias  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -880,7 +880,7 @@ id,
     name,
     version,
     original_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -890,7 +890,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -901,7 +901,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -917,7 +917,7 @@ CORBA_ValueDef_ptr POA_CORBA_ModuleDef_tie<T>::create_value  (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -934,7 +934,7 @@ id,
     abstract_base_values,
     supported_interfaces,
     initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -944,7 +944,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ModuleDef_tie<T>::create_value_box  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -955,7 +955,7 @@ id,
     name,
     version,
     original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -965,7 +965,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_ModuleDef_tie<T>::create_exception  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -976,7 +976,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -985,7 +985,7 @@ CORBA_NativeDef_ptr POA_CORBA_ModuleDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -995,7 +995,7 @@ CORBA_NativeDef_ptr POA_CORBA_ModuleDef_tie<T>::create_native  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1005,7 +1005,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_abstract_inter
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1016,7 +1016,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1026,7 +1026,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_local_interface
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1037,27 +1037,27 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ModuleDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1065,27 +1065,27 @@ void POA_CORBA_ModuleDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ModuleDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1093,27 +1093,27 @@ void POA_CORBA_ModuleDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ModuleDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1121,59 +1121,59 @@ void POA_CORBA_ModuleDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ModuleDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ModuleDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ModuleDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ModuleDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1182,7 +1182,7 @@ void POA_CORBA_ModuleDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1192,33 +1192,33 @@ void POA_CORBA_ModuleDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ModuleDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1291,44 +1291,44 @@ POA_CORBA_ConstantDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ConstantDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ConstantDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ConstantDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_ConstantDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ConstantDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_ConstantDef_tie<T>::type_def  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::type_def  (
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1336,27 +1336,27 @@ void POA_CORBA_ConstantDef_tie<T>::type_def  (
 {
   this->ptr_->type_def (
 type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Any * POA_CORBA_ConstantDef_tie<T>::value  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->value (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::value  (
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1364,27 +1364,27 @@ void POA_CORBA_ConstantDef_tie<T>::value  (
 {
   this->ptr_->value (
 value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ConstantDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1392,27 +1392,27 @@ void POA_CORBA_ConstantDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ConstantDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1420,27 +1420,27 @@ void POA_CORBA_ConstantDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ConstantDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1448,59 +1448,59 @@ void POA_CORBA_ConstantDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ConstantDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ConstantDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ConstantDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ConstantDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1509,7 +1509,7 @@ void POA_CORBA_ConstantDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1519,33 +1519,33 @@ void POA_CORBA_ConstantDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ConstantDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1618,31 +1618,31 @@ POA_CORBA_StructDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_StructDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_StructDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_StructDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_StructDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_StructMemberSeq * POA_CORBA_StructDef_tie<T>::members  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::members  (
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1650,14 +1650,14 @@ void POA_CORBA_StructDef_tie<T>::members  (
 {
   this->ptr_->members (
 members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_StructDef_tie<T>::lookup  (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1665,7 +1665,7 @@ CORBA_Contained_ptr POA_CORBA_StructDef_tie<T>::lookup  (
 {
   return this->ptr_->lookup (
 search_name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1673,7 +1673,7 @@ template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1682,7 +1682,7 @@ CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::contents  (
   return this->ptr_->contents (
 limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1692,7 +1692,7 @@ CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::lookup_name  (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1703,7 +1703,7 @@ search_name,
     levels_to_search,
     limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1712,7 +1712,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_StructDef_tie<T>::describe_contents
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1722,7 +1722,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_StructDef_tie<T>::describe_contents
 limit_type,
     exclude_inherited,
     max_returned_objs
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1731,7 +1731,7 @@ CORBA_ModuleDef_ptr POA_CORBA_StructDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1741,7 +1741,7 @@ CORBA_ModuleDef_ptr POA_CORBA_StructDef_tie<T>::create_module  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1752,7 +1752,7 @@ CORBA_ConstantDef_ptr POA_CORBA_StructDef_tie<T>::create_constant  (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1764,7 +1764,7 @@ id,
     version,
     type,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1774,7 +1774,7 @@ CORBA_StructDef_ptr POA_CORBA_StructDef_tie<T>::create_struct  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1785,7 +1785,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1796,7 +1796,7 @@ CORBA_UnionDef_ptr POA_CORBA_StructDef_tie<T>::create_union  (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1808,7 +1808,7 @@ id,
     version,
     discriminator_type,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1818,7 +1818,7 @@ CORBA_EnumDef_ptr POA_CORBA_StructDef_tie<T>::create_enum  (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1829,7 +1829,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1839,7 +1839,7 @@ CORBA_AliasDef_ptr POA_CORBA_StructDef_tie<T>::create_alias  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1850,7 +1850,7 @@ id,
     name,
     version,
     original_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1860,7 +1860,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1871,7 +1871,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1887,7 +1887,7 @@ CORBA_ValueDef_ptr POA_CORBA_StructDef_tie<T>::create_value  (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1904,7 +1904,7 @@ id,
     abstract_base_values,
     supported_interfaces,
     initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1914,7 +1914,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_StructDef_tie<T>::create_value_box  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1925,7 +1925,7 @@ id,
     name,
     version,
     original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1935,7 +1935,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_StructDef_tie<T>::create_exception  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1946,7 +1946,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1955,7 +1955,7 @@ CORBA_NativeDef_ptr POA_CORBA_StructDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1965,7 +1965,7 @@ CORBA_NativeDef_ptr POA_CORBA_StructDef_tie<T>::create_native  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1975,7 +1975,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_abstract_inter
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1986,7 +1986,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1996,7 +1996,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_local_interface
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2007,27 +2007,27 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_StructDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2035,27 +2035,27 @@ void POA_CORBA_StructDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_StructDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2063,27 +2063,27 @@ void POA_CORBA_StructDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_StructDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2091,59 +2091,59 @@ void POA_CORBA_StructDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_StructDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_StructDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_StructDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_StructDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2152,7 +2152,7 @@ void POA_CORBA_StructDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2162,46 +2162,46 @@ void POA_CORBA_StructDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_StructDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_StructDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2274,44 +2274,44 @@ POA_CORBA_UnionDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_UnionDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_UnionDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_UnionDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_UnionDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_UnionDef_tie<T>::discriminator_type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->discriminator_type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_UnionDef_tie<T>::discriminator_type_def  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->discriminator_type_def (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::discriminator_type_def  (
     CORBA_IDLType_ptr discriminator_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2319,27 +2319,27 @@ void POA_CORBA_UnionDef_tie<T>::discriminator_type_def  (
 {
   this->ptr_->discriminator_type_def (
 discriminator_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_UnionMemberSeq * POA_CORBA_UnionDef_tie<T>::members  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::members  (
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2347,14 +2347,14 @@ void POA_CORBA_UnionDef_tie<T>::members  (
 {
   this->ptr_->members (
 members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_UnionDef_tie<T>::lookup  (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2362,7 +2362,7 @@ CORBA_Contained_ptr POA_CORBA_UnionDef_tie<T>::lookup  (
 {
   return this->ptr_->lookup (
 search_name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2370,7 +2370,7 @@ template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2379,7 +2379,7 @@ CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::contents  (
   return this->ptr_->contents (
 limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2389,7 +2389,7 @@ CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::lookup_name  (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2400,7 +2400,7 @@ search_name,
     levels_to_search,
     limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2409,7 +2409,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_UnionDef_tie<T>::describe_contents
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2419,7 +2419,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_UnionDef_tie<T>::describe_contents
 limit_type,
     exclude_inherited,
     max_returned_objs
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2428,7 +2428,7 @@ CORBA_ModuleDef_ptr POA_CORBA_UnionDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2438,7 +2438,7 @@ CORBA_ModuleDef_ptr POA_CORBA_UnionDef_tie<T>::create_module  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2449,7 +2449,7 @@ CORBA_ConstantDef_ptr POA_CORBA_UnionDef_tie<T>::create_constant  (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2461,7 +2461,7 @@ id,
     version,
     type,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2471,7 +2471,7 @@ CORBA_StructDef_ptr POA_CORBA_UnionDef_tie<T>::create_struct  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2482,7 +2482,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2493,7 +2493,7 @@ CORBA_UnionDef_ptr POA_CORBA_UnionDef_tie<T>::create_union  (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2505,7 +2505,7 @@ id,
     version,
     discriminator_type,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2515,7 +2515,7 @@ CORBA_EnumDef_ptr POA_CORBA_UnionDef_tie<T>::create_enum  (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2526,7 +2526,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2536,7 +2536,7 @@ CORBA_AliasDef_ptr POA_CORBA_UnionDef_tie<T>::create_alias  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2547,7 +2547,7 @@ id,
     name,
     version,
     original_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2557,7 +2557,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2568,7 +2568,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2584,7 +2584,7 @@ CORBA_ValueDef_ptr POA_CORBA_UnionDef_tie<T>::create_value  (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2601,7 +2601,7 @@ id,
     abstract_base_values,
     supported_interfaces,
     initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2611,7 +2611,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_UnionDef_tie<T>::create_value_box  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2622,7 +2622,7 @@ id,
     name,
     version,
     original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2632,7 +2632,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_UnionDef_tie<T>::create_exception  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2643,7 +2643,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2652,7 +2652,7 @@ CORBA_NativeDef_ptr POA_CORBA_UnionDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2662,7 +2662,7 @@ CORBA_NativeDef_ptr POA_CORBA_UnionDef_tie<T>::create_native  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2672,7 +2672,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_abstract_interf
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2683,7 +2683,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2693,7 +2693,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_local_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2704,27 +2704,27 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_UnionDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2732,27 +2732,27 @@ void POA_CORBA_UnionDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_UnionDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2760,27 +2760,27 @@ void POA_CORBA_UnionDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_UnionDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2788,59 +2788,59 @@ void POA_CORBA_UnionDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_UnionDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_UnionDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_UnionDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_UnionDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2849,7 +2849,7 @@ void POA_CORBA_UnionDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2859,46 +2859,46 @@ void POA_CORBA_UnionDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_UnionDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_UnionDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2971,31 +2971,31 @@ POA_CORBA_EnumDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_EnumDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_EnumDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_EnumDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_EnumDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_EnumMemberSeq * POA_CORBA_EnumDef_tie<T>::members  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::members  (
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3003,27 +3003,27 @@ void POA_CORBA_EnumDef_tie<T>::members  (
 {
   this->ptr_->members (
 members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_EnumDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3031,27 +3031,27 @@ void POA_CORBA_EnumDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_EnumDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3059,27 +3059,27 @@ void POA_CORBA_EnumDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_EnumDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3087,59 +3087,59 @@ void POA_CORBA_EnumDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_EnumDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_EnumDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_EnumDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_EnumDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3148,7 +3148,7 @@ void POA_CORBA_EnumDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3158,46 +3158,46 @@ void POA_CORBA_EnumDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_EnumDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_EnumDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3270,31 +3270,31 @@ POA_CORBA_AliasDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_AliasDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_AliasDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_AliasDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_AliasDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_AliasDef_tie<T>::original_type_def  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->original_type_def (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::original_type_def  (
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3302,27 +3302,27 @@ void POA_CORBA_AliasDef_tie<T>::original_type_def  (
 {
   this->ptr_->original_type_def (
 original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AliasDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3330,27 +3330,27 @@ void POA_CORBA_AliasDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AliasDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3358,27 +3358,27 @@ void POA_CORBA_AliasDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AliasDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3386,59 +3386,59 @@ void POA_CORBA_AliasDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_AliasDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AliasDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_AliasDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_AliasDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3447,7 +3447,7 @@ void POA_CORBA_AliasDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3457,46 +3457,46 @@ void POA_CORBA_AliasDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_AliasDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_AliasDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3569,31 +3569,31 @@ POA_CORBA_NativeDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_NativeDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_NativeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_NativeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_NativeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_NativeDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3601,27 +3601,27 @@ void POA_CORBA_NativeDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_NativeDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3629,27 +3629,27 @@ void POA_CORBA_NativeDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_NativeDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3657,59 +3657,59 @@ void POA_CORBA_NativeDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_NativeDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_NativeDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_NativeDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_NativeDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3718,7 +3718,7 @@ void POA_CORBA_NativeDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3728,46 +3728,46 @@ void POA_CORBA_NativeDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_NativeDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_NativeDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3840,63 +3840,63 @@ POA_CORBA_PrimitiveDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_PrimitiveDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_PrimitiveDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_PrimitiveDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_PrimitiveDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::PrimitiveKind POA_CORBA_PrimitiveDef_tie<T>::kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_PrimitiveDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_PrimitiveDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_PrimitiveDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3969,31 +3969,31 @@ POA_CORBA_StringDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_StringDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_StringDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_StringDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_StringDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::ULong POA_CORBA_StringDef_tie<T>::bound  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StringDef_tie<T>::bound  (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4001,46 +4001,46 @@ void POA_CORBA_StringDef_tie<T>::bound  (
 {
   this->ptr_->bound (
 bound
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_StringDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_StringDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StringDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4113,31 +4113,31 @@ POA_CORBA_WstringDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_WstringDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_WstringDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_WstringDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_WstringDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::ULong POA_CORBA_WstringDef_tie<T>::bound  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_WstringDef_tie<T>::bound  (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4145,46 +4145,46 @@ void POA_CORBA_WstringDef_tie<T>::bound  (
 {
   this->ptr_->bound (
 bound
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_WstringDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_WstringDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_WstringDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4257,31 +4257,31 @@ POA_CORBA_SequenceDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_SequenceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_SequenceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_SequenceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_SequenceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::ULong POA_CORBA_SequenceDef_tie<T>::bound  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_SequenceDef_tie<T>::bound  (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4289,40 +4289,40 @@ void POA_CORBA_SequenceDef_tie<T>::bound  (
 {
   this->ptr_->bound (
 bound
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_SequenceDef_tie<T>::element_type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->element_type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_SequenceDef_tie<T>::element_type_def  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->element_type_def (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_SequenceDef_tie<T>::element_type_def  (
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4330,46 +4330,46 @@ void POA_CORBA_SequenceDef_tie<T>::element_type_def  (
 {
   this->ptr_->element_type_def (
 element_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_SequenceDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_SequenceDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_SequenceDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4442,31 +4442,31 @@ POA_CORBA_ArrayDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ArrayDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ArrayDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ArrayDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_ArrayDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::ULong POA_CORBA_ArrayDef_tie<T>::length  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->length (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ArrayDef_tie<T>::length  (
     CORBA::ULong length
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4474,40 +4474,40 @@ void POA_CORBA_ArrayDef_tie<T>::length  (
 {
   this->ptr_->length (
 length
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ArrayDef_tie<T>::element_type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->element_type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_ArrayDef_tie<T>::element_type_def  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->element_type_def (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ArrayDef_tie<T>::element_type_def  (
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4515,46 +4515,46 @@ void POA_CORBA_ArrayDef_tie<T>::element_type_def  (
 {
   this->ptr_->element_type_def (
 element_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ArrayDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ArrayDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ArrayDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4627,44 +4627,44 @@ POA_CORBA_ExceptionDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ExceptionDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ExceptionDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ExceptionDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_ExceptionDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ExceptionDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_StructMemberSeq * POA_CORBA_ExceptionDef_tie<T>::members  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::members  (
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4672,27 +4672,27 @@ void POA_CORBA_ExceptionDef_tie<T>::members  (
 {
   this->ptr_->members (
 members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ExceptionDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4700,27 +4700,27 @@ void POA_CORBA_ExceptionDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ExceptionDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4728,27 +4728,27 @@ void POA_CORBA_ExceptionDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ExceptionDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4756,59 +4756,59 @@ void POA_CORBA_ExceptionDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ExceptionDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ExceptionDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ExceptionDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ExceptionDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4817,7 +4817,7 @@ void POA_CORBA_ExceptionDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4827,14 +4827,14 @@ void POA_CORBA_ExceptionDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_ExceptionDef_tie<T>::lookup  (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4842,7 +4842,7 @@ CORBA_Contained_ptr POA_CORBA_ExceptionDef_tie<T>::lookup  (
 {
   return this->ptr_->lookup (
 search_name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4850,7 +4850,7 @@ template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4859,7 +4859,7 @@ CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::contents  (
   return this->ptr_->contents (
 limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4869,7 +4869,7 @@ CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::lookup_name  (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4880,7 +4880,7 @@ search_name,
     levels_to_search,
     limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4889,7 +4889,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ExceptionDef_tie<T>::describe_conten
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4899,7 +4899,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ExceptionDef_tie<T>::describe_conten
 limit_type,
     exclude_inherited,
     max_returned_objs
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4908,7 +4908,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4918,7 +4918,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_module  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4929,7 +4929,7 @@ CORBA_ConstantDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_constant  (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4941,7 +4941,7 @@ id,
     version,
     type,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4951,7 +4951,7 @@ CORBA_StructDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_struct  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4962,7 +4962,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4973,7 +4973,7 @@ CORBA_UnionDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_union  (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4985,7 +4985,7 @@ id,
     version,
     discriminator_type,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4995,7 +4995,7 @@ CORBA_EnumDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_enum  (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5006,7 +5006,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5016,7 +5016,7 @@ CORBA_AliasDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_alias  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5027,7 +5027,7 @@ id,
     name,
     version,
     original_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5037,7 +5037,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5048,7 +5048,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5064,7 +5064,7 @@ CORBA_ValueDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_value  (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5081,7 +5081,7 @@ id,
     abstract_base_values,
     supported_interfaces,
     initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5091,7 +5091,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_value_box  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5102,7 +5102,7 @@ id,
     name,
     version,
     original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5112,7 +5112,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_exception  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5123,7 +5123,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5132,7 +5132,7 @@ CORBA_NativeDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5142,7 +5142,7 @@ CORBA_NativeDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_native  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5152,7 +5152,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_abstract_in
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5163,7 +5163,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5173,7 +5173,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_local_interfac
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5184,33 +5184,33 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ExceptionDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5283,44 +5283,44 @@ POA_CORBA_AttributeDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_AttributeDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_AttributeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_AttributeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_AttributeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_AttributeDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_AttributeDef_tie<T>::type_def  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::type_def  (
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5328,27 +5328,27 @@ void POA_CORBA_AttributeDef_tie<T>::type_def  (
 {
   this->ptr_->type_def (
 type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::AttributeMode POA_CORBA_AttributeDef_tie<T>::mode  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::mode  (
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5356,27 +5356,27 @@ void POA_CORBA_AttributeDef_tie<T>::mode  (
 {
   this->ptr_->mode (
 mode
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AttributeDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5384,27 +5384,27 @@ void POA_CORBA_AttributeDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AttributeDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5412,27 +5412,27 @@ void POA_CORBA_AttributeDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AttributeDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5440,59 +5440,59 @@ void POA_CORBA_AttributeDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_AttributeDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AttributeDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_AttributeDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_AttributeDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5501,7 +5501,7 @@ void POA_CORBA_AttributeDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5511,33 +5511,33 @@ void POA_CORBA_AttributeDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_AttributeDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5610,44 +5610,44 @@ POA_CORBA_OperationDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_OperationDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_OperationDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_OperationDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_OperationDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_OperationDef_tie<T>::result  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_OperationDef_tie<T>::result_def  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::result_def  (
     CORBA_IDLType_ptr result_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5655,27 +5655,27 @@ void POA_CORBA_OperationDef_tie<T>::result_def  (
 {
   this->ptr_->result_def (
 result_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ParDescriptionSeq * POA_CORBA_OperationDef_tie<T>::params  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::params  (
     const CORBA_ParDescriptionSeq & params
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5683,27 +5683,27 @@ void POA_CORBA_OperationDef_tie<T>::params  (
 {
   this->ptr_->params (
 params
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::OperationMode POA_CORBA_OperationDef_tie<T>::mode  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::mode  (
     CORBA::OperationMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5711,27 +5711,27 @@ void POA_CORBA_OperationDef_tie<T>::mode  (
 {
   this->ptr_->mode (
 mode
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContextIdSeq * POA_CORBA_OperationDef_tie<T>::contexts  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::contexts  (
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5739,27 +5739,27 @@ void POA_CORBA_OperationDef_tie<T>::contexts  (
 {
   this->ptr_->contexts (
 contexts
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ExceptionDefSeq * POA_CORBA_OperationDef_tie<T>::exceptions  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::exceptions  (
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5767,27 +5767,27 @@ void POA_CORBA_OperationDef_tie<T>::exceptions  (
 {
   this->ptr_->exceptions (
 exceptions
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_OperationDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5795,27 +5795,27 @@ void POA_CORBA_OperationDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_OperationDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5823,27 +5823,27 @@ void POA_CORBA_OperationDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_OperationDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5851,59 +5851,59 @@ void POA_CORBA_OperationDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_OperationDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_OperationDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_OperationDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_OperationDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5912,7 +5912,7 @@ void POA_CORBA_OperationDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5922,33 +5922,33 @@ void POA_CORBA_OperationDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_OperationDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6021,31 +6021,31 @@ POA_CORBA_InterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_InterfaceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_InterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_InterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_InterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_CORBA_InterfaceDef_tie<T>::base_interfaces  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::base_interfaces  (
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6053,14 +6053,14 @@ void POA_CORBA_InterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
 base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_InterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6068,20 +6068,20 @@ CORBA::Boolean POA_CORBA_InterfaceDef_tie<T>::is_a  (
 {
   return this->ptr_->is_a (
 interface_id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_InterfaceDef_tie<T>::describe_interface  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6092,7 +6092,7 @@ CORBA_AttributeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_attribute  (
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6104,7 +6104,7 @@ id,
     version,
     type,
     mode
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6118,7 +6118,7 @@ CORBA_OperationDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_operation  (
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6133,14 +6133,14 @@ id,
     params,
     exceptions,
     contexts
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_InterfaceDef_tie<T>::lookup  (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6148,7 +6148,7 @@ CORBA_Contained_ptr POA_CORBA_InterfaceDef_tie<T>::lookup  (
 {
   return this->ptr_->lookup (
 search_name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6156,7 +6156,7 @@ template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6165,7 +6165,7 @@ CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::contents  (
   return this->ptr_->contents (
 limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6175,7 +6175,7 @@ CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::lookup_name  (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6186,7 +6186,7 @@ search_name,
     levels_to_search,
     limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6195,7 +6195,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_InterfaceDef_tie<T>::describe_conten
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6205,7 +6205,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_InterfaceDef_tie<T>::describe_conten
 limit_type,
     exclude_inherited,
     max_returned_objs
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6214,7 +6214,7 @@ CORBA_ModuleDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6224,7 +6224,7 @@ CORBA_ModuleDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_module  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6235,7 +6235,7 @@ CORBA_ConstantDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_constant  (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6247,7 +6247,7 @@ id,
     version,
     type,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6257,7 +6257,7 @@ CORBA_StructDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_struct  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6268,7 +6268,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6279,7 +6279,7 @@ CORBA_UnionDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_union  (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6291,7 +6291,7 @@ id,
     version,
     discriminator_type,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6301,7 +6301,7 @@ CORBA_EnumDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_enum  (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6312,7 +6312,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6322,7 +6322,7 @@ CORBA_AliasDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_alias  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6333,7 +6333,7 @@ id,
     name,
     version,
     original_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6343,7 +6343,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6354,7 +6354,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6370,7 +6370,7 @@ CORBA_ValueDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_value  (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6387,7 +6387,7 @@ id,
     abstract_base_values,
     supported_interfaces,
     initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6397,7 +6397,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_value_box  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6408,7 +6408,7 @@ id,
     name,
     version,
     original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6418,7 +6418,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_exception  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6429,7 +6429,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6438,7 +6438,7 @@ CORBA_NativeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6448,7 +6448,7 @@ CORBA_NativeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_native  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6458,7 +6458,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_abstract_in
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6469,7 +6469,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6479,7 +6479,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_local_interfac
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6490,27 +6490,27 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_InterfaceDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6518,27 +6518,27 @@ void POA_CORBA_InterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_InterfaceDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6546,27 +6546,27 @@ void POA_CORBA_InterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_InterfaceDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6574,59 +6574,59 @@ void POA_CORBA_InterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_InterfaceDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_InterfaceDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_InterfaceDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_InterfaceDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6635,7 +6635,7 @@ void POA_CORBA_InterfaceDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6645,46 +6645,46 @@ void POA_CORBA_InterfaceDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_InterfaceDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_InterfaceDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6757,31 +6757,31 @@ POA_CORBA_AbstractInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_AbstractInterfaceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_AbstractInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_AbstractInterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_AbstractInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::base_interfaces  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::base_interfaces  (
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6789,14 +6789,14 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
 base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_AbstractInterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6804,20 +6804,20 @@ CORBA::Boolean POA_CORBA_AbstractInterfaceDef_tie<T>::is_a  (
 {
   return this->ptr_->is_a (
 interface_id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_AbstractInterfaceDef_tie<T>::describe_interface  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6828,7 +6828,7 @@ CORBA_AttributeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_attribute
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6840,7 +6840,7 @@ id,
     version,
     type,
     mode
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6854,7 +6854,7 @@ CORBA_OperationDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_operation
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6869,14 +6869,14 @@ id,
     params,
     exceptions,
     contexts
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::lookup  (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6884,7 +6884,7 @@ CORBA_Contained_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::lookup  (
 {
   return this->ptr_->lookup (
 search_name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6892,7 +6892,7 @@ template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6901,7 +6901,7 @@ CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::contents  (
   return this->ptr_->contents (
 limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6911,7 +6911,7 @@ CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::lookup_name  (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6922,7 +6922,7 @@ search_name,
     levels_to_search,
     limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6931,7 +6931,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::describ
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6941,7 +6941,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::describ
 limit_type,
     exclude_inherited,
     max_returned_objs
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6950,7 +6950,7 @@ CORBA_ModuleDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6960,7 +6960,7 @@ CORBA_ModuleDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_module  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6971,7 +6971,7 @@ CORBA_ConstantDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_constant  (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6983,7 +6983,7 @@ id,
     version,
     type,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -6993,7 +6993,7 @@ CORBA_StructDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_struct  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7004,7 +7004,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7015,7 +7015,7 @@ CORBA_UnionDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_union  (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7027,7 +7027,7 @@ id,
     version,
     discriminator_type,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7037,7 +7037,7 @@ CORBA_EnumDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_enum  (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7048,7 +7048,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7058,7 +7058,7 @@ CORBA_AliasDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_alias  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7069,7 +7069,7 @@ id,
     name,
     version,
     original_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7079,7 +7079,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_interface
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7090,7 +7090,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7106,7 +7106,7 @@ CORBA_ValueDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_value  (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7123,7 +7123,7 @@ id,
     abstract_base_values,
     supported_interfaces,
     initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7133,7 +7133,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_value_box  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7144,7 +7144,7 @@ id,
     name,
     version,
     original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7154,7 +7154,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_exception
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7165,7 +7165,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7174,7 +7174,7 @@ CORBA_NativeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7184,7 +7184,7 @@ CORBA_NativeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_native  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7194,7 +7194,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_abs
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7205,7 +7205,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7215,7 +7215,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_local_
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7226,27 +7226,27 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AbstractInterfaceDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7254,27 +7254,27 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AbstractInterfaceDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7282,27 +7282,27 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AbstractInterfaceDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7310,59 +7310,59 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AbstractInterfaceDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_AbstractInterfaceDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7371,7 +7371,7 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7381,46 +7381,46 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_AbstractInterfaceDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7493,31 +7493,31 @@ POA_CORBA_LocalInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_LocalInterfaceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_LocalInterfaceDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_LocalInterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_LocalInterfaceDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_CORBA_LocalInterfaceDef_tie<T>::base_interfaces  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::base_interfaces  (
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7525,14 +7525,14 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
 base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_LocalInterfaceDef_tie<T>::is_a  (
     const char * interface_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7540,20 +7540,20 @@ CORBA::Boolean POA_CORBA_LocalInterfaceDef_tie<T>::is_a  (
 {
   return this->ptr_->is_a (
 interface_id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_LocalInterfaceDef_tie<T>::describe_interface  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7564,7 +7564,7 @@ CORBA_AttributeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_attribute  (
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7576,7 +7576,7 @@ id,
     version,
     type,
     mode
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7590,7 +7590,7 @@ CORBA_OperationDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_operation  (
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7605,14 +7605,14 @@ id,
     params,
     exceptions,
     contexts
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_LocalInterfaceDef_tie<T>::lookup  (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7620,7 +7620,7 @@ CORBA_Contained_ptr POA_CORBA_LocalInterfaceDef_tie<T>::lookup  (
 {
   return this->ptr_->lookup (
 search_name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7628,7 +7628,7 @@ template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7637,7 +7637,7 @@ CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::contents  (
   return this->ptr_->contents (
 limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7647,7 +7647,7 @@ CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::lookup_name  (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7658,7 +7658,7 @@ search_name,
     levels_to_search,
     limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7667,7 +7667,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_LocalInterfaceDef_tie<T>::describe_c
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7677,7 +7677,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_LocalInterfaceDef_tie<T>::describe_c
 limit_type,
     exclude_inherited,
     max_returned_objs
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7686,7 +7686,7 @@ CORBA_ModuleDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7696,7 +7696,7 @@ CORBA_ModuleDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_module  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7707,7 +7707,7 @@ CORBA_ConstantDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_constant  (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7719,7 +7719,7 @@ id,
     version,
     type,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7729,7 +7729,7 @@ CORBA_StructDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_struct  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7740,7 +7740,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7751,7 +7751,7 @@ CORBA_UnionDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_union  (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7763,7 +7763,7 @@ id,
     version,
     discriminator_type,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7773,7 +7773,7 @@ CORBA_EnumDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_enum  (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7784,7 +7784,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7794,7 +7794,7 @@ CORBA_AliasDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_alias  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7805,7 +7805,7 @@ id,
     name,
     version,
     original_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7815,7 +7815,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7826,7 +7826,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7842,7 +7842,7 @@ CORBA_ValueDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_value  (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7859,7 +7859,7 @@ id,
     abstract_base_values,
     supported_interfaces,
     initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7869,7 +7869,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_value_box  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7880,7 +7880,7 @@ id,
     name,
     version,
     original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7890,7 +7890,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_exception  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7901,7 +7901,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7910,7 +7910,7 @@ CORBA_NativeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7920,7 +7920,7 @@ CORBA_NativeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_native  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7930,7 +7930,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_abstra
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7941,7 +7941,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -7951,7 +7951,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_local_int
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7962,27 +7962,27 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_LocalInterfaceDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7990,27 +7990,27 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_LocalInterfaceDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8018,27 +8018,27 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_LocalInterfaceDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8046,59 +8046,59 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_LocalInterfaceDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_LocalInterfaceDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_LocalInterfaceDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_LocalInterfaceDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8107,7 +8107,7 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8117,46 +8117,46 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_LocalInterfaceDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_LocalInterfaceDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
index 929682e2d11..7cea15e7880 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
@@ -216,31 +216,31 @@ public:
     const char * version,
     IR::ComponentDef_ptr base_component,
     const CORBA_InterfaceDefSeq & supports_interfaces
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ComponentDef_ptr result);
@@ -268,7 +268,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequest
     const char * version,
     IR::ComponentDef_ptr base_component,
     const CORBA_InterfaceDefSeq & supports_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -280,12 +280,12 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -313,25 +313,25 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (TAO_EN
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_component::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_component::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -343,7 +343,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (TAO_ENV_S
 
 char *
 TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -353,10 +353,10 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_most_deriv
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -379,31 +379,31 @@ public:
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::HomeDef_ptr result);
@@ -433,7 +433,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::TAO_ServerRequestInfo_
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -446,12 +446,12 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::TAO_ServerRequestInfo_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -482,25 +482,25 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (TAO_ENV_SIN
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_home::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_home::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -512,7 +512,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (TAO_ENV_SINGLE
 
 char *
 TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -522,10 +522,10 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_most_derived_in
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -565,17 +565,17 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::~_TAO_ComponentReposi
 IR::_TAO_ComponentRepository_Proxy_Impl&
 POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy (
     ::IR::ComponentRepository *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -585,7 +585,7 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy (
 void
 POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -660,7 +660,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create
     const char * version,
     IR::ComponentDef_ptr base_component,
     const CORBA_InterfaceDefSeq & supports_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -676,7 +676,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create
       _collocated_tao_target_->_object_key (),
       "create_component",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -690,7 +690,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create
         version,
         base_component,
         supports_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -702,7 +702,7 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -718,7 +718,7 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home
       _collocated_tao_target_->_object_key (),
       "create_home",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -733,7 +733,7 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home
         base_home,
         managed_component,
         primary_key
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -764,7 +764,7 @@ void POA_IR::ComponentRepository::create_component_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -805,12 +805,12 @@ void POA_IR::ComponentRepository::create_component_skel (
       version.in (),
       base_component.in (),
       supports_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -821,7 +821,7 @@ void POA_IR::ComponentRepository::create_component_skel (
           version.in (),
           base_component.in (),
           supports_interfaces
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -830,7 +830,7 @@ void POA_IR::ComponentRepository::create_component_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -838,12 +838,12 @@ void POA_IR::ComponentRepository::create_component_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -871,7 +871,7 @@ void POA_IR::ComponentRepository::create_home_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -915,12 +915,12 @@ void POA_IR::ComponentRepository::create_home_skel (
       base_home.in (),
       managed_component.in (),
       primary_key.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -932,7 +932,7 @@ void POA_IR::ComponentRepository::create_home_skel (
           base_home.in (),
           managed_component.in (),
           primary_key.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -941,7 +941,7 @@ void POA_IR::ComponentRepository::create_home_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -949,12 +949,12 @@ void POA_IR::ComponentRepository::create_home_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -982,7 +982,7 @@ void POA_IR::ComponentRepository::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -992,7 +992,7 @@ void POA_IR::ComponentRepository::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1005,11 +1005,11 @@ void POA_IR::ComponentRepository::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1022,7 +1022,7 @@ void POA_IR::ComponentRepository::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference;
@@ -1041,7 +1041,7 @@ void POA_IR::ComponentRepository::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -1068,10 +1068,10 @@ void POA_IR::ComponentRepository::_interface_skel (
 
 CORBA::Boolean POA_IR::ComponentRepository::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -1102,12 +1102,12 @@ void* POA_IR::ComponentRepository::_downcast (
   return 0;
 }
 
-void POA_IR::ComponentRepository::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_IR::ComponentRepository::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -1117,9 +1117,9 @@ const char* POA_IR::ComponentRepository::_interface_repository_id (void) const
 }
 
 IR::ComponentRepository*
-POA_IR::ComponentRepository::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::ComponentRepository::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -1286,31 +1286,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ProvidesDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDef_ptr result);
@@ -1328,44 +1328,44 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ServerRequestInfo_I
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::ProvidesDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1377,7 +1377,7 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (TAO_ENV_SINGLE_
 
 char *
 TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1387,10 +1387,10 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_most_derived_int
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1430,17 +1430,17 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::~_TAO_ProvidesDef_Strategized
 IR::_TAO_ProvidesDef_Proxy_Impl&
 POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy (
     ::IR::ProvidesDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -1450,7 +1450,7 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy (
 void
 POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -1520,7 +1520,7 @@ POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_TAO_ProvidesDef_ThruPOA_Proxy_Impl
 
 CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1536,7 +1536,7 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_ty
       _collocated_tao_target_->_object_key (),
       "interface_type",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1545,7 +1545,7 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_ty
           "IDL:omg.org/IR/ProvidesDef:1.0"
         )
     )->interface_type (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -1575,7 +1575,7 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ProvidesDef *_tao_impl =
@@ -1596,18 +1596,18 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->interface_type (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1616,7 +1616,7 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1624,12 +1624,12 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1657,7 +1657,7 @@ void POA_IR::ProvidesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1667,7 +1667,7 @@ void POA_IR::ProvidesDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1680,11 +1680,11 @@ void POA_IR::ProvidesDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1697,7 +1697,7 @@ void POA_IR::ProvidesDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference;
@@ -1716,7 +1716,7 @@ void POA_IR::ProvidesDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -1743,10 +1743,10 @@ void POA_IR::ProvidesDef::_interface_skel (
 
 CORBA::Boolean POA_IR::ProvidesDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -1774,12 +1774,12 @@ void* POA_IR::ProvidesDef::_downcast (
   return 0;
 }
 
-void POA_IR::ProvidesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_IR::ProvidesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -1789,9 +1789,9 @@ const char* POA_IR::ProvidesDef::_interface_repository_id (void) const
 }
 
 IR::ProvidesDef*
-POA_IR::ProvidesDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -1959,31 +1959,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::UsesDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDef_ptr result);
@@ -2001,44 +2001,44 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::TAO_ServerRequestInfo_IR_Us
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::UsesDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2050,7 +2050,7 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2060,10 +2060,10 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2080,31 +2080,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::UsesDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -2122,44 +2122,44 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::TAO_ServerRequestInfo_IR_UsesD
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::UsesDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2171,7 +2171,7 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (TAO_ENV_SINGLE_ARG_DEC
 
 char *
 TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2181,10 +2181,10 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2224,17 +2224,17 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::~_TAO_UsesDef_Strategized_Proxy_B
 IR::_TAO_UsesDef_Proxy_Impl&
 POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy (
     ::IR::UsesDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -2244,7 +2244,7 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy (
 void
 POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -2314,7 +2314,7 @@ POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_TAO_UsesDef_ThruPOA_Proxy_Impl (void)
 
 CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2330,7 +2330,7 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
       _collocated_tao_target_->_object_key (),
       "interface_type",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2339,13 +2339,13 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
           "IDL:omg.org/IR/UsesDef:1.0"
         )
     )->interface_type (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2361,7 +2361,7 @@ CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple (
       _collocated_tao_target_->_object_key (),
       "is_multiple",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -2370,7 +2370,7 @@ CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple (
           "IDL:omg.org/IR/UsesDef:1.0"
         )
     )->is_multiple (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -2400,7 +2400,7 @@ void POA_IR::UsesDef::_get_interface_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::UsesDef *_tao_impl =
@@ -2421,18 +2421,18 @@ void POA_IR::UsesDef::_get_interface_type_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->interface_type (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2441,7 +2441,7 @@ void POA_IR::UsesDef::_get_interface_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2449,12 +2449,12 @@ void POA_IR::UsesDef::_get_interface_type_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2482,7 +2482,7 @@ void POA_IR::UsesDef::_get_is_multiple_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::UsesDef *_tao_impl =
@@ -2503,18 +2503,18 @@ void POA_IR::UsesDef::_get_is_multiple_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_multiple (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2522,7 +2522,7 @@ void POA_IR::UsesDef::_get_is_multiple_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2530,12 +2530,12 @@ void POA_IR::UsesDef::_get_is_multiple_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2563,7 +2563,7 @@ void POA_IR::UsesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2573,7 +2573,7 @@ void POA_IR::UsesDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2586,11 +2586,11 @@ void POA_IR::UsesDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2603,7 +2603,7 @@ void POA_IR::UsesDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference;
@@ -2622,7 +2622,7 @@ void POA_IR::UsesDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -2649,10 +2649,10 @@ void POA_IR::UsesDef::_interface_skel (
 
 CORBA::Boolean POA_IR::UsesDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -2680,12 +2680,12 @@ void* POA_IR::UsesDef::_downcast (
   return 0;
 }
 
-void POA_IR::UsesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_IR::UsesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -2695,9 +2695,9 @@ const char* POA_IR::UsesDef::_interface_repository_id (void) const
 }
 
 IR::UsesDef*
-POA_IR::UsesDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -2866,31 +2866,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::EventDef *tao_impl
     ,
     const char * event_id
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -2910,7 +2910,7 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a (
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::EventDef *tao_impl,
     const char * event_id
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2918,12 +2918,12 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a (
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2939,25 +2939,25 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_EventDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_EventDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2969,7 +2969,7 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_IR_EventDef_is_a::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2979,10 +2979,10 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_EventDef_is_a::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2999,31 +2999,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::EventDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef_ptr result);
@@ -3041,44 +3041,44 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::TAO_ServerRequestInfo_IR_EventDef_e
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::EventDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_EventDef_event_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_EventDef_event_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3090,7 +3090,7 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_IR_EventDef_event_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3100,10 +3100,10 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_EventDef_event_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3143,17 +3143,17 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::~_TAO_EventDef_Strategized_Proxy
 IR::_TAO_EventDef_Proxy_Impl&
 POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy (
     ::IR::EventDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -3163,7 +3163,7 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy (
 void
 POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -3234,7 +3234,7 @@ POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::_TAO_EventDef_ThruPOA_Proxy_Impl (void
 CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
     const char * event_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3250,7 +3250,7 @@ CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
       _collocated_tao_target_->_object_key (),
       "is_a",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -3260,13 +3260,13 @@ CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
         )
     )->is_a (
         event_id
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3282,7 +3282,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
       _collocated_tao_target_->_object_key (),
       "event",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -3291,7 +3291,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
           "IDL:omg.org/IR/EventDef:1.0"
         )
     )->event (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -3321,7 +3321,7 @@ void POA_IR::EventDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3350,19 +3350,19 @@ void POA_IR::EventDef::is_a_skel (
       _tao_upcall,
       _tao_impl,
       event_id.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_a (
           event_id.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3370,7 +3370,7 @@ void POA_IR::EventDef::is_a_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3378,12 +3378,12 @@ void POA_IR::EventDef::is_a_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3411,7 +3411,7 @@ void POA_IR::EventDef::_get_event_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef *_tao_impl =
@@ -3432,18 +3432,18 @@ void POA_IR::EventDef::_get_event_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->event (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3452,7 +3452,7 @@ void POA_IR::EventDef::_get_event_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3460,12 +3460,12 @@ void POA_IR::EventDef::_get_event_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3493,7 +3493,7 @@ void POA_IR::EventDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3503,7 +3503,7 @@ void POA_IR::EventDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3516,11 +3516,11 @@ void POA_IR::EventDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3533,7 +3533,7 @@ void POA_IR::EventDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference;
@@ -3552,7 +3552,7 @@ void POA_IR::EventDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -3579,10 +3579,10 @@ void POA_IR::EventDef::_interface_skel (
 
 CORBA::Boolean POA_IR::EventDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -3610,12 +3610,12 @@ void* POA_IR::EventDef::_downcast (
   return 0;
 }
 
-void POA_IR::EventDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_IR::EventDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -3625,9 +3625,9 @@ const char* POA_IR::EventDef::_interface_repository_id (void) const
 }
 
 IR::EventDef*
-POA_IR::EventDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -3818,17 +3818,17 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::~_TAO_EmitsDef_Strategized_Proxy
 IR::_TAO_EmitsDef_Proxy_Impl&
 POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy (
     ::IR::EmitsDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -3838,7 +3838,7 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy (
 void
 POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -3933,7 +3933,7 @@ void POA_IR::EmitsDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3943,7 +3943,7 @@ void POA_IR::EmitsDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3956,11 +3956,11 @@ void POA_IR::EmitsDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3973,7 +3973,7 @@ void POA_IR::EmitsDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference;
@@ -3992,7 +3992,7 @@ void POA_IR::EmitsDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -4019,10 +4019,10 @@ void POA_IR::EmitsDef::_interface_skel (
 
 CORBA::Boolean POA_IR::EmitsDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -4053,12 +4053,12 @@ void* POA_IR::EmitsDef::_downcast (
   return 0;
 }
 
-void POA_IR::EmitsDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_IR::EmitsDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -4068,9 +4068,9 @@ const char* POA_IR::EmitsDef::_interface_repository_id (void) const
 }
 
 IR::EmitsDef*
-POA_IR::EmitsDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -4261,17 +4261,17 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::~_TAO_PublishesDef_Strategiz
 IR::_TAO_PublishesDef_Proxy_Impl&
 POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy (
     ::IR::PublishesDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -4281,7 +4281,7 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy (
 void
 POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -4376,7 +4376,7 @@ void POA_IR::PublishesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4386,7 +4386,7 @@ void POA_IR::PublishesDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4399,11 +4399,11 @@ void POA_IR::PublishesDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4416,7 +4416,7 @@ void POA_IR::PublishesDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference;
@@ -4435,7 +4435,7 @@ void POA_IR::PublishesDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -4462,10 +4462,10 @@ void POA_IR::PublishesDef::_interface_skel (
 
 CORBA::Boolean POA_IR::PublishesDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -4496,12 +4496,12 @@ void* POA_IR::PublishesDef::_downcast (
   return 0;
 }
 
-void POA_IR::PublishesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_IR::PublishesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -4511,9 +4511,9 @@ const char* POA_IR::PublishesDef::_interface_repository_id (void) const
 }
 
 IR::PublishesDef*
-POA_IR::PublishesDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -4704,17 +4704,17 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::~_TAO_ConsumesDef_Strategized
 IR::_TAO_ConsumesDef_Proxy_Impl&
 POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy (
     ::IR::ConsumesDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -4724,7 +4724,7 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy (
 void
 POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -4819,7 +4819,7 @@ void POA_IR::ConsumesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4829,7 +4829,7 @@ void POA_IR::ConsumesDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4842,11 +4842,11 @@ void POA_IR::ConsumesDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4859,7 +4859,7 @@ void POA_IR::ConsumesDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference;
@@ -4878,7 +4878,7 @@ void POA_IR::ConsumesDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -4905,10 +4905,10 @@ void POA_IR::ConsumesDef::_interface_skel (
 
 CORBA::Boolean POA_IR::ConsumesDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -4939,12 +4939,12 @@ void* POA_IR::ConsumesDef::_downcast (
   return 0;
 }
 
-void POA_IR::ConsumesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_IR::ConsumesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -4954,9 +4954,9 @@ const char* POA_IR::ConsumesDef::_interface_repository_id (void) const
 }
 
 IR::ConsumesDef*
-POA_IR::ConsumesDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -5165,31 +5165,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDefSeq * result);
@@ -5207,44 +5207,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ServerReques
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::ComponentDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5256,7 +5256,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (TAO_ENV_
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5266,10 +5266,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_most_deri
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5287,31 +5287,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
     ,
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -5330,7 +5330,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerReques
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::ComponentDef *tao_impl,
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5338,12 +5338,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerReques
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5359,25 +5359,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (TAO_E
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -5385,7 +5385,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (TAO_ENV_
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5395,10 +5395,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_most_deri
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_IR_ComponentDef_base_component_get : public TAO_ServerRequestInfo
@@ -5408,31 +5408,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ComponentDef_ptr result);
@@ -5450,44 +5450,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::TAO_ServerRequestInfo_
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::ComponentDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5499,7 +5499,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (TAO_ENV_SINGLE
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5509,10 +5509,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_most_derived_in
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5529,31 +5529,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ProvidesDefSeq * result);
@@ -5571,44 +5571,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ServerRequest
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::ComponentDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5620,7 +5620,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (TAO_ENV_S
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5630,10 +5630,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_most_deriv
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5650,31 +5650,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::UsesDefSeq * result);
@@ -5692,44 +5692,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ServerRequestInfo
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::ComponentDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5741,7 +5741,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (TAO_ENV_SINGL
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5751,10 +5751,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_most_derived_i
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5771,31 +5771,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::EmitsDefSeq * result);
@@ -5813,44 +5813,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::TAO_ServerRequestInfo_IR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::ComponentDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5862,7 +5862,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (TAO_ENV_SINGLE_A
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5872,10 +5872,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_most_derived_inte
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5892,31 +5892,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::PublishesDefSeq * result);
@@ -5934,44 +5934,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ServerRequestInf
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::ComponentDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5983,7 +5983,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (TAO_ENV_SING
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5993,10 +5993,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_most_derived_
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6013,31 +6013,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ConsumesDefSeq * result);
@@ -6055,44 +6055,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ServerRequestInfo
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::ComponentDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6104,7 +6104,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (TAO_ENV_SINGL
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6114,10 +6114,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_most_derived_i
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6134,31 +6134,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -6176,44 +6176,44 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::TAO_ServerRequestInfo_IR_Com
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::ComponentDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6225,7 +6225,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_D
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6235,10 +6235,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_most_derived_interfac
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6259,31 +6259,31 @@ public:
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ProvidesDef_ptr result);
@@ -6309,7 +6309,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::TAO_ServerRequestInfo_IR_
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6320,12 +6320,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::TAO_ServerRequestInfo_IR_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6350,25 +6350,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6380,7 +6380,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6390,10 +6390,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6415,31 +6415,31 @@ public:
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
     const CORBA::Boolean & is_multiple
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::UsesDef_ptr result);
@@ -6467,7 +6467,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::TAO_ServerRequestInfo_IR_Comp
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
     const CORBA::Boolean & is_multiple
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6479,12 +6479,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::TAO_ServerRequestInfo_IR_Comp
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6512,25 +6512,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_uses::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_uses::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6542,7 +6542,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (TAO_ENV_SINGLE_ARG_DE
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6552,10 +6552,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6576,31 +6576,31 @@ public:
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::EmitsDef_ptr result);
@@ -6626,7 +6626,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::TAO_ServerRequestInfo_IR_Com
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6637,12 +6637,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::TAO_ServerRequestInfo_IR_Com
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6667,25 +6667,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (TAO_ENV_SINGLE_AR
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_emits::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_emits::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6697,7 +6697,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (TAO_ENV_SINGLE_ARG_D
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6707,10 +6707,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_most_derived_interfac
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6731,31 +6731,31 @@ public:
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::PublishesDef_ptr result);
@@ -6781,7 +6781,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::TAO_ServerRequestInfo_IR
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6792,12 +6792,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::TAO_ServerRequestInfo_IR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6822,25 +6822,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (TAO_ENV_SINGL
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6852,7 +6852,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (TAO_ENV_SINGLE_A
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6862,10 +6862,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_most_derived_inte
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6886,31 +6886,31 @@ public:
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ConsumesDef_ptr result);
@@ -6936,7 +6936,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::TAO_ServerRequestInfo_IR_
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6947,12 +6947,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::TAO_ServerRequestInfo_IR_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6977,25 +6977,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -7007,7 +7007,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -7017,10 +7017,10 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -7060,17 +7060,17 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::~_TAO_ComponentDef_Strategiz
 IR::_TAO_ComponentDef_Proxy_Impl&
 POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy (
     ::IR::ComponentDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -7080,7 +7080,7 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy (
 void
 POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -7150,7 +7150,7 @@ POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_TAO_ComponentDef_ThruPOA_Proxy_Im
 
 CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7166,7 +7166,7 @@ CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_
       _collocated_tao_target_->_object_key (),
       "supported_interfaces",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7175,14 +7175,14 @@ CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->supported_interfaces (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7196,7 +7196,7 @@ void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
       _collocated_tao_target_->_object_key (),
       "supported_interfaces",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -7206,14 +7206,14 @@ void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
         )
     )->supported_interfaces (
         supported_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7229,7 +7229,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_componen
       _collocated_tao_target_->_object_key (),
       "base_component",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7238,13 +7238,13 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_componen
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->base_component (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_interfaces (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7260,7 +7260,7 @@ IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_inte
       _collocated_tao_target_->_object_key (),
       "provides_interfaces",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7269,13 +7269,13 @@ IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_inte
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->provides_interfaces (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7291,7 +7291,7 @@ IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
       _collocated_tao_target_->_object_key (),
       "uses_interfaces",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7300,13 +7300,13 @@ IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->uses_interfaces (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7322,7 +7322,7 @@ IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
       _collocated_tao_target_->_object_key (),
       "emits_events",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7331,13 +7331,13 @@ IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->emits_events (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_events (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7353,7 +7353,7 @@ IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_ev
       _collocated_tao_target_->_object_key (),
       "publishes_events",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7362,13 +7362,13 @@ IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_ev
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->publishes_events (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_events (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7384,7 +7384,7 @@ IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_even
       _collocated_tao_target_->_object_key (),
       "consumes_events",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7393,13 +7393,13 @@ IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_even
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->consumes_events (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7415,7 +7415,7 @@ CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic (
       _collocated_tao_target_->_object_key (),
       "is_basic",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -7424,7 +7424,7 @@ CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic (
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->is_basic (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -7434,7 +7434,7 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7450,7 +7450,7 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide
       _collocated_tao_target_->_object_key (),
       "create_provides",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7463,7 +7463,7 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide
         name,
         version,
         interface_type
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7474,7 +7474,7 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
     CORBA::Boolean is_multiple
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7490,7 +7490,7 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
       _collocated_tao_target_->_object_key (),
       "create_uses",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7504,7 +7504,7 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
         version,
         interface_type,
         is_multiple
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7514,7 +7514,7 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7530,7 +7530,7 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
       _collocated_tao_target_->_object_key (),
       "create_emits",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7543,7 +7543,7 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
         name,
         version,
         value
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7553,7 +7553,7 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7569,7 +7569,7 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis
       _collocated_tao_target_->_object_key (),
       "create_publishes",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7582,7 +7582,7 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis
         name,
         version,
         value
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7592,7 +7592,7 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7608,7 +7608,7 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume
       _collocated_tao_target_->_object_key (),
       "create_consumes",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7621,7 +7621,7 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume
         name,
         version,
         value
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -7654,7 +7654,7 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -7675,18 +7675,18 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->supported_interfaces (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7695,7 +7695,7 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7703,12 +7703,12 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7736,7 +7736,7 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7765,25 +7765,25 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel (
       _tao_upcall,
       _tao_impl,
       supported_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->supported_interfaces (
           supported_interfaces
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7791,12 +7791,12 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7817,7 +7817,7 @@ void POA_IR::ComponentDef::_get_base_component_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -7838,18 +7838,18 @@ void POA_IR::ComponentDef::_get_base_component_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->base_component (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7858,7 +7858,7 @@ void POA_IR::ComponentDef::_get_base_component_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7866,12 +7866,12 @@ void POA_IR::ComponentDef::_get_base_component_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7899,7 +7899,7 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -7920,18 +7920,18 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->provides_interfaces (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7940,7 +7940,7 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7948,12 +7948,12 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7981,7 +7981,7 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8002,18 +8002,18 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->uses_interfaces (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8022,7 +8022,7 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8030,12 +8030,12 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8063,7 +8063,7 @@ void POA_IR::ComponentDef::_get_emits_events_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8084,18 +8084,18 @@ void POA_IR::ComponentDef::_get_emits_events_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->emits_events (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8104,7 +8104,7 @@ void POA_IR::ComponentDef::_get_emits_events_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8112,12 +8112,12 @@ void POA_IR::ComponentDef::_get_emits_events_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8145,7 +8145,7 @@ void POA_IR::ComponentDef::_get_publishes_events_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8166,18 +8166,18 @@ void POA_IR::ComponentDef::_get_publishes_events_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->publishes_events (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8186,7 +8186,7 @@ void POA_IR::ComponentDef::_get_publishes_events_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8194,12 +8194,12 @@ void POA_IR::ComponentDef::_get_publishes_events_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8227,7 +8227,7 @@ void POA_IR::ComponentDef::_get_consumes_events_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8248,18 +8248,18 @@ void POA_IR::ComponentDef::_get_consumes_events_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->consumes_events (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8268,7 +8268,7 @@ void POA_IR::ComponentDef::_get_consumes_events_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8276,12 +8276,12 @@ void POA_IR::ComponentDef::_get_consumes_events_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8309,7 +8309,7 @@ void POA_IR::ComponentDef::_get_is_basic_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8330,18 +8330,18 @@ void POA_IR::ComponentDef::_get_is_basic_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_basic (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8349,7 +8349,7 @@ void POA_IR::ComponentDef::_get_is_basic_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8357,12 +8357,12 @@ void POA_IR::ComponentDef::_get_is_basic_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8390,7 +8390,7 @@ void POA_IR::ComponentDef::create_provides_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8428,12 +8428,12 @@ void POA_IR::ComponentDef::create_provides_skel (
       name.in (),
       version.in (),
       interface_type.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8443,7 +8443,7 @@ void POA_IR::ComponentDef::create_provides_skel (
           name.in (),
           version.in (),
           interface_type.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8452,7 +8452,7 @@ void POA_IR::ComponentDef::create_provides_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8460,12 +8460,12 @@ void POA_IR::ComponentDef::create_provides_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8493,7 +8493,7 @@ void POA_IR::ComponentDef::create_uses_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8534,12 +8534,12 @@ void POA_IR::ComponentDef::create_uses_skel (
       version.in (),
       interface_type.in (),
       is_multiple
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8550,7 +8550,7 @@ void POA_IR::ComponentDef::create_uses_skel (
           version.in (),
           interface_type.in (),
           is_multiple
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8559,7 +8559,7 @@ void POA_IR::ComponentDef::create_uses_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8567,12 +8567,12 @@ void POA_IR::ComponentDef::create_uses_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8600,7 +8600,7 @@ void POA_IR::ComponentDef::create_emits_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8638,12 +8638,12 @@ void POA_IR::ComponentDef::create_emits_skel (
       name.in (),
       version.in (),
       value.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8653,7 +8653,7 @@ void POA_IR::ComponentDef::create_emits_skel (
           name.in (),
           version.in (),
           value.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8662,7 +8662,7 @@ void POA_IR::ComponentDef::create_emits_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8670,12 +8670,12 @@ void POA_IR::ComponentDef::create_emits_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8703,7 +8703,7 @@ void POA_IR::ComponentDef::create_publishes_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8741,12 +8741,12 @@ void POA_IR::ComponentDef::create_publishes_skel (
       name.in (),
       version.in (),
       value.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8756,7 +8756,7 @@ void POA_IR::ComponentDef::create_publishes_skel (
           name.in (),
           version.in (),
           value.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8765,7 +8765,7 @@ void POA_IR::ComponentDef::create_publishes_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8773,12 +8773,12 @@ void POA_IR::ComponentDef::create_publishes_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8806,7 +8806,7 @@ void POA_IR::ComponentDef::create_consumes_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8844,12 +8844,12 @@ void POA_IR::ComponentDef::create_consumes_skel (
       name.in (),
       version.in (),
       value.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8859,7 +8859,7 @@ void POA_IR::ComponentDef::create_consumes_skel (
           name.in (),
           version.in (),
           value.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8868,7 +8868,7 @@ void POA_IR::ComponentDef::create_consumes_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8876,12 +8876,12 @@ void POA_IR::ComponentDef::create_consumes_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8909,7 +8909,7 @@ void POA_IR::ComponentDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8919,7 +8919,7 @@ void POA_IR::ComponentDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8932,11 +8932,11 @@ void POA_IR::ComponentDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8949,7 +8949,7 @@ void POA_IR::ComponentDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference;
@@ -8968,7 +8968,7 @@ void POA_IR::ComponentDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -8995,10 +8995,10 @@ void POA_IR::ComponentDef::_interface_skel (
 
 CORBA::Boolean POA_IR::ComponentDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9035,12 +9035,12 @@ void* POA_IR::ComponentDef::_downcast (
   return 0;
 }
 
-void POA_IR::ComponentDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_IR::ComponentDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -9050,9 +9050,9 @@ const char* POA_IR::ComponentDef::_interface_repository_id (void) const
 }
 
 IR::ComponentDef*
-POA_IR::ComponentDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -9221,31 +9221,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::PrimaryKeyDef *tao_impl
     ,
     const char * primary_key_id
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -9265,7 +9265,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKey
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::PrimaryKeyDef *tao_impl,
     const char * primary_key_id
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -9273,12 +9273,12 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKey
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -9294,25 +9294,25 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9324,7 +9324,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -9334,10 +9334,10 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -9354,31 +9354,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::PrimaryKeyDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef_ptr result);
@@ -9396,44 +9396,44 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ServerRequestInfo_IR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::PrimaryKeyDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9445,7 +9445,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (TAO_ENV_SINGLE_A
 
 char *
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -9455,10 +9455,10 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_most_derived_inte
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -9498,17 +9498,17 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::~_TAO_PrimaryKeyDef_Strateg
 IR::_TAO_PrimaryKeyDef_Proxy_Impl&
 POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy (
     ::IR::PrimaryKeyDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -9518,7 +9518,7 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy (
 void
 POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -9589,7 +9589,7 @@ POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::_TAO_PrimaryKeyDef_ThruPOA_Proxy_
 CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
     const char * primary_key_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9605,7 +9605,7 @@ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
       _collocated_tao_target_->_object_key (),
       "is_a",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -9615,13 +9615,13 @@ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
         )
     )->is_a (
         primary_key_id
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9637,7 +9637,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
       _collocated_tao_target_->_object_key (),
       "primary_key",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -9646,7 +9646,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
           "IDL:omg.org/IR/PrimaryKeyDef:1.0"
         )
     )->primary_key (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -9676,7 +9676,7 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9705,19 +9705,19 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
       _tao_upcall,
       _tao_impl,
       primary_key_id.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_a (
           primary_key_id.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9725,7 +9725,7 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -9733,12 +9733,12 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9766,7 +9766,7 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::PrimaryKeyDef *_tao_impl =
@@ -9787,18 +9787,18 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->primary_key (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9807,7 +9807,7 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -9815,12 +9815,12 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9848,7 +9848,7 @@ void POA_IR::PrimaryKeyDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9858,7 +9858,7 @@ void POA_IR::PrimaryKeyDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9871,11 +9871,11 @@ void POA_IR::PrimaryKeyDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9888,7 +9888,7 @@ void POA_IR::PrimaryKeyDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference;
@@ -9907,7 +9907,7 @@ void POA_IR::PrimaryKeyDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9934,10 +9934,10 @@ void POA_IR::PrimaryKeyDef::_interface_skel (
 
 CORBA::Boolean POA_IR::PrimaryKeyDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9965,12 +9965,12 @@ void* POA_IR::PrimaryKeyDef::_downcast (
   return 0;
 }
 
-void POA_IR::PrimaryKeyDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_IR::PrimaryKeyDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -9980,9 +9980,9 @@ const char* POA_IR::PrimaryKeyDef::_interface_repository_id (void) const
 }
 
 IR::PrimaryKeyDef*
-POA_IR::PrimaryKeyDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::PrimaryKeyDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -10233,17 +10233,17 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::~_TAO_FactoryDef_Strategized_P
 IR::_TAO_FactoryDef_Proxy_Impl&
 POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy (
     ::IR::FactoryDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -10253,7 +10253,7 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy (
 void
 POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -10348,7 +10348,7 @@ void POA_IR::FactoryDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10358,7 +10358,7 @@ void POA_IR::FactoryDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10371,11 +10371,11 @@ void POA_IR::FactoryDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10388,7 +10388,7 @@ void POA_IR::FactoryDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference;
@@ -10407,7 +10407,7 @@ void POA_IR::FactoryDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10434,10 +10434,10 @@ void POA_IR::FactoryDef::_interface_skel (
 
 CORBA::Boolean POA_IR::FactoryDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10468,12 +10468,12 @@ void* POA_IR::FactoryDef::_downcast (
   return 0;
 }
 
-void POA_IR::FactoryDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_IR::FactoryDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -10483,9 +10483,9 @@ const char* POA_IR::FactoryDef::_interface_repository_id (void) const
 }
 
 IR::FactoryDef*
-POA_IR::FactoryDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -10736,17 +10736,17 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::~_TAO_FinderDef_Strategized_Pro
 IR::_TAO_FinderDef_Proxy_Impl&
 POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy (
     ::IR::FinderDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -10756,7 +10756,7 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy (
 void
 POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -10851,7 +10851,7 @@ void POA_IR::FinderDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10861,7 +10861,7 @@ void POA_IR::FinderDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10874,11 +10874,11 @@ void POA_IR::FinderDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10891,7 +10891,7 @@ void POA_IR::FinderDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference;
@@ -10910,7 +10910,7 @@ void POA_IR::FinderDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10937,10 +10937,10 @@ void POA_IR::FinderDef::_interface_skel (
 
 CORBA::Boolean POA_IR::FinderDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10971,12 +10971,12 @@ void* POA_IR::FinderDef::_downcast (
   return 0;
 }
 
-void POA_IR::FinderDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_IR::FinderDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -10986,9 +10986,9 @@ const char* POA_IR::FinderDef::_interface_repository_id (void) const
 }
 
 IR::FinderDef*
-POA_IR::FinderDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -11191,31 +11191,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::HomeDef_ptr result);
@@ -11233,44 +11233,44 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::TAO_ServerRequestInfo_IR_HomeDef
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::HomeDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11282,7 +11282,7 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11292,10 +11292,10 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11312,31 +11312,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ComponentDef_ptr result);
@@ -11354,44 +11354,44 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::TAO_ServerRequestInfo_IR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::HomeDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11403,7 +11403,7 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (TAO_ENV_SINGLE_A
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11413,10 +11413,10 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_most_derived_inte
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11433,31 +11433,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::PrimaryKeyDef_ptr result);
@@ -11475,44 +11475,44 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::TAO_ServerRequestInfo_IR_HomeD
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::HomeDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11524,7 +11524,7 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DEC
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11534,10 +11534,10 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_most_derived_interface
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11554,31 +11554,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::FactoryDefSeq * result);
@@ -11596,44 +11596,44 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::TAO_ServerRequestInfo_IR_HomeDef
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::HomeDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11645,7 +11645,7 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11655,10 +11655,10 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11675,31 +11675,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::FinderDefSeq * result);
@@ -11717,44 +11717,44 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::TAO_ServerRequestInfo_IR_HomeDef_f
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::HomeDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11766,7 +11766,7 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11776,10 +11776,10 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11796,31 +11796,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -11838,44 +11838,44 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::TAO_ServerRequestInfo_IR_HomeDef_
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::HomeDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11887,7 +11887,7 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11897,10 +11897,10 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11921,31 +11921,31 @@ public:
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::PrimaryKeyDef_ptr result);
@@ -11971,7 +11971,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::TAO_ServerRequestInfo_IR_Ho
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -11982,12 +11982,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::TAO_ServerRequestInfo_IR_Ho
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12012,25 +12012,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12042,7 +12042,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12052,10 +12052,10 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12077,31 +12077,31 @@ public:
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::FactoryDef_ptr result);
@@ -12129,7 +12129,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::TAO_ServerRequestInfo_IR_HomeDe
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12141,12 +12141,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::TAO_ServerRequestInfo_IR_HomeDe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12174,25 +12174,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (TAO_ENV_SINGLE_ARG_D
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12204,7 +12204,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (TAO_ENV_SINGLE_ARG_DECL
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12214,10 +12214,10 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12239,31 +12239,31 @@ public:
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::FinderDef_ptr result);
@@ -12291,7 +12291,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::TAO_ServerRequestInfo_IR_HomeDef
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12303,12 +12303,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::TAO_ServerRequestInfo_IR_HomeDef
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12336,25 +12336,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (TAO_ENV_SINGLE_ARG_DE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12366,7 +12366,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12376,10 +12376,10 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12419,17 +12419,17 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::~_TAO_HomeDef_Strategized_Proxy_B
 IR::_TAO_HomeDef_Proxy_Impl&
 POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy (
     ::IR::HomeDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -12439,7 +12439,7 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy (
 void
 POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -12509,7 +12509,7 @@ POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_TAO_HomeDef_ThruPOA_Proxy_Impl (void)
 
 IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12525,7 +12525,7 @@ IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
       _collocated_tao_target_->_object_key (),
       "base_home",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12534,13 +12534,13 @@ IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->base_home (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12556,7 +12556,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component
       _collocated_tao_target_->_object_key (),
       "managed_component",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12565,13 +12565,13 @@ IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->managed_component (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12587,7 +12587,7 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
       _collocated_tao_target_->_object_key (),
       "primary_key",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12596,13 +12596,13 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->primary_key (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12618,7 +12618,7 @@ IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
       _collocated_tao_target_->_object_key (),
       "factories",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12627,13 +12627,13 @@ IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->factories (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12649,7 +12649,7 @@ IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
       _collocated_tao_target_->_object_key (),
       "finders",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12658,13 +12658,13 @@ IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->finders (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12680,7 +12680,7 @@ CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic (
       _collocated_tao_target_->_object_key (),
       "is_basic",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -12689,7 +12689,7 @@ CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->is_basic (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -12699,7 +12699,7 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12715,7 +12715,7 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke
       _collocated_tao_target_->_object_key (),
       "create_primary_key",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12728,7 +12728,7 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke
         name,
         version,
         primary_key
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -12739,7 +12739,7 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12755,7 +12755,7 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
       _collocated_tao_target_->_object_key (),
       "create_factory",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12769,7 +12769,7 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
         version,
         params,
         exceptions
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -12780,7 +12780,7 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12796,7 +12796,7 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
       _collocated_tao_target_->_object_key (),
       "create_finder",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12810,7 +12810,7 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
         version,
         params,
         exceptions
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -12843,7 +12843,7 @@ void POA_IR::HomeDef::_get_base_home_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -12864,18 +12864,18 @@ void POA_IR::HomeDef::_get_base_home_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->base_home (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -12884,7 +12884,7 @@ void POA_IR::HomeDef::_get_base_home_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -12892,12 +12892,12 @@ void POA_IR::HomeDef::_get_base_home_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -12925,7 +12925,7 @@ void POA_IR::HomeDef::_get_managed_component_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -12946,18 +12946,18 @@ void POA_IR::HomeDef::_get_managed_component_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->managed_component (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -12966,7 +12966,7 @@ void POA_IR::HomeDef::_get_managed_component_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -12974,12 +12974,12 @@ void POA_IR::HomeDef::_get_managed_component_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13007,7 +13007,7 @@ void POA_IR::HomeDef::_get_primary_key_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13028,18 +13028,18 @@ void POA_IR::HomeDef::_get_primary_key_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->primary_key (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13048,7 +13048,7 @@ void POA_IR::HomeDef::_get_primary_key_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -13056,12 +13056,12 @@ void POA_IR::HomeDef::_get_primary_key_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13089,7 +13089,7 @@ void POA_IR::HomeDef::_get_factories_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13110,18 +13110,18 @@ void POA_IR::HomeDef::_get_factories_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->factories (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13130,7 +13130,7 @@ void POA_IR::HomeDef::_get_factories_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -13138,12 +13138,12 @@ void POA_IR::HomeDef::_get_factories_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13171,7 +13171,7 @@ void POA_IR::HomeDef::_get_finders_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13192,18 +13192,18 @@ void POA_IR::HomeDef::_get_finders_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->finders (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13212,7 +13212,7 @@ void POA_IR::HomeDef::_get_finders_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -13220,12 +13220,12 @@ void POA_IR::HomeDef::_get_finders_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13253,7 +13253,7 @@ void POA_IR::HomeDef::_get_is_basic_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13274,18 +13274,18 @@ void POA_IR::HomeDef::_get_is_basic_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_basic (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13293,7 +13293,7 @@ void POA_IR::HomeDef::_get_is_basic_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -13301,12 +13301,12 @@ void POA_IR::HomeDef::_get_is_basic_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13334,7 +13334,7 @@ void POA_IR::HomeDef::create_primary_key_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13372,12 +13372,12 @@ void POA_IR::HomeDef::create_primary_key_skel (
       name.in (),
       version.in (),
       primary_key.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -13387,7 +13387,7 @@ void POA_IR::HomeDef::create_primary_key_skel (
           name.in (),
           version.in (),
           primary_key.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13396,7 +13396,7 @@ void POA_IR::HomeDef::create_primary_key_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -13404,12 +13404,12 @@ void POA_IR::HomeDef::create_primary_key_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13437,7 +13437,7 @@ void POA_IR::HomeDef::create_factory_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13478,12 +13478,12 @@ void POA_IR::HomeDef::create_factory_skel (
       version.in (),
       params,
       exceptions
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -13494,7 +13494,7 @@ void POA_IR::HomeDef::create_factory_skel (
           version.in (),
           params,
           exceptions
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13503,7 +13503,7 @@ void POA_IR::HomeDef::create_factory_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -13511,12 +13511,12 @@ void POA_IR::HomeDef::create_factory_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13544,7 +13544,7 @@ void POA_IR::HomeDef::create_finder_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13585,12 +13585,12 @@ void POA_IR::HomeDef::create_finder_skel (
       version.in (),
       params,
       exceptions
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -13601,7 +13601,7 @@ void POA_IR::HomeDef::create_finder_skel (
           version.in (),
           params,
           exceptions
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13610,7 +13610,7 @@ void POA_IR::HomeDef::create_finder_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -13618,12 +13618,12 @@ void POA_IR::HomeDef::create_finder_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13651,7 +13651,7 @@ void POA_IR::HomeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13661,7 +13661,7 @@ void POA_IR::HomeDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -13674,11 +13674,11 @@ void POA_IR::HomeDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -13691,7 +13691,7 @@ void POA_IR::HomeDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference;
@@ -13710,7 +13710,7 @@ void POA_IR::HomeDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -13737,10 +13737,10 @@ void POA_IR::HomeDef::_interface_skel (
 
 CORBA::Boolean POA_IR::HomeDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -13777,12 +13777,12 @@ void* POA_IR::HomeDef::_downcast (
   return 0;
 }
 
-void POA_IR::HomeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_IR::HomeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -13792,9 +13792,9 @@ const char* POA_IR::HomeDef::_interface_repository_id (void) const
 }
 
 IR::HomeDef*
-POA_IR::HomeDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
index ce0d7b2a01a..cd49eb534e2 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
@@ -67,7 +67,7 @@ TAO_NAMESPACE  POA_IR
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -78,31 +78,31 @@ TAO_NAMESPACE  POA_IR
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::IR::ComponentRepository *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
@@ -113,7 +113,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         IR::ComponentDef_ptr base_component,
         const CORBA_InterfaceDefSeq & supports_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -123,7 +123,7 @@ TAO_NAMESPACE  POA_IR
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::HomeDef_ptr create_home (
@@ -133,7 +133,7 @@ TAO_NAMESPACE  POA_IR
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
         CORBA_ValueDef_ptr primary_key
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -143,196 +143,196 @@ TAO_NAMESPACE  POA_IR
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void lookup_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void get_canonical_typecode_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void get_primitive_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_string_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_wstring_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_sequence_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_array_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_fixed_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void lookup_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void contents_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void lookup_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_contents_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_module_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_constant_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_struct_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_union_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_enum_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_alias_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_value_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_value_box_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_exception_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_native_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_abstract_interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_local_interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void destroy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -352,7 +352,7 @@ TAO_NAMESPACE  POA_IR
 
     virtual ::IR::_TAO_ComponentRepository_Proxy_Impl &select_proxy (
       ::IR::ComponentRepository *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -361,7 +361,7 @@ TAO_NAMESPACE  POA_IR
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -409,7 +409,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         IR::ComponentDef_ptr base_component,
         const CORBA_InterfaceDefSeq & supports_interfaces
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -423,7 +423,7 @@ TAO_NAMESPACE  POA_IR
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
         CORBA_ValueDef_ptr primary_key
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -455,7 +455,7 @@ TAO_NAMESPACE  POA_IR
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -466,37 +466,37 @@ TAO_NAMESPACE  POA_IR
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::IR::ProvidesDef *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA_InterfaceDef_ptr interface_type (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -506,98 +506,98 @@ TAO_NAMESPACE  POA_IR
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void move_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void destroy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -617,7 +617,7 @@ TAO_NAMESPACE  POA_IR
 
     virtual ::IR::_TAO_ProvidesDef_Proxy_Impl &select_proxy (
       ::IR::ProvidesDef *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -626,7 +626,7 @@ TAO_NAMESPACE  POA_IR
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 private:
@@ -669,7 +669,7 @@ private:
 
     virtual CORBA_InterfaceDef_ptr interface_type (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -701,7 +701,7 @@ private:
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -712,37 +712,37 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::IR::UsesDef *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA_InterfaceDef_ptr interface_type (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -752,11 +752,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual CORBA::Boolean is_multiple (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -766,98 +766,98 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void move_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void destroy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -877,7 +877,7 @@ private:
 
     virtual ::IR::_TAO_UsesDef_Proxy_Impl &select_proxy (
       ::IR::UsesDef *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -886,7 +886,7 @@ private:
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 private:
@@ -929,7 +929,7 @@ private:
 
     virtual CORBA_InterfaceDef_ptr interface_type (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -937,7 +937,7 @@ private:
 
     virtual CORBA::Boolean is_multiple (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -969,7 +969,7 @@ private:
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -980,38 +980,38 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::IR::EventDef *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA::Boolean is_a (
         const char * event_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1021,11 +1021,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual CORBA_ValueDef_ptr event (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1035,98 +1035,98 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void move_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void destroy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -1146,7 +1146,7 @@ private:
 
     virtual ::IR::_TAO_EventDef_Proxy_Impl &select_proxy (
       ::IR::EventDef *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -1155,7 +1155,7 @@ private:
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 private:
@@ -1199,7 +1199,7 @@ private:
     virtual CORBA::Boolean is_a (
         CORBA_Object *_collocated_tao_target_,
         const char * event_id
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1207,7 +1207,7 @@ private:
 
     virtual CORBA_ValueDef_ptr event (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1239,7 +1239,7 @@ private:
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -1250,31 +1250,31 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::IR::EmitsDef *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
@@ -1283,105 +1283,105 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_event_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void move_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void destroy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -1401,7 +1401,7 @@ private:
 
     virtual ::IR::_TAO_EmitsDef_Proxy_Impl &select_proxy (
       ::IR::EmitsDef *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -1410,7 +1410,7 @@ private:
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 private:
@@ -1477,7 +1477,7 @@ private:
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -1488,31 +1488,31 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::IR::PublishesDef *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
@@ -1521,105 +1521,105 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_event_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void move_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void destroy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -1639,7 +1639,7 @@ private:
 
     virtual ::IR::_TAO_PublishesDef_Proxy_Impl &select_proxy (
       ::IR::PublishesDef *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -1648,7 +1648,7 @@ private:
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 private:
@@ -1715,7 +1715,7 @@ private:
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -1726,31 +1726,31 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::IR::ConsumesDef *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
@@ -1759,105 +1759,105 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_event_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void move_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void destroy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -1877,7 +1877,7 @@ private:
 
     virtual ::IR::_TAO_ConsumesDef_Proxy_Impl &select_proxy (
       ::IR::ConsumesDef *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -1886,7 +1886,7 @@ private:
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 private:
@@ -1953,7 +1953,7 @@ private:
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -1964,37 +1964,37 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::IR::ComponentDef *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA_InterfaceDefSeq * supported_interfaces (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2004,12 +2004,12 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void supported_interfaces (
         const CORBA_InterfaceDefSeq & supported_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2019,11 +2019,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::ComponentDef_ptr base_component (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2033,11 +2033,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::ProvidesDefSeq * provides_interfaces (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2047,11 +2047,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::UsesDefSeq * uses_interfaces (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2061,11 +2061,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::EmitsDefSeq * emits_events (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2075,11 +2075,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::PublishesDefSeq * publishes_events (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2089,11 +2089,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::ConsumesDefSeq * consumes_events (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2103,11 +2103,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual CORBA::Boolean is_basic (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2117,7 +2117,7 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::ProvidesDef_ptr create_provides (
@@ -2125,7 +2125,7 @@ private:
         const char * name,
         const char * version,
         CORBA_InterfaceDef_ptr interface_type
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2135,7 +2135,7 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::UsesDef_ptr create_uses (
@@ -2144,7 +2144,7 @@ private:
         const char * version,
         CORBA_InterfaceDef_ptr interface_type,
         CORBA::Boolean is_multiple
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2154,7 +2154,7 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::EmitsDef_ptr create_emits (
@@ -2162,7 +2162,7 @@ private:
         const char * name,
         const char * version,
         CORBA_ValueDef_ptr value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2172,7 +2172,7 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::PublishesDef_ptr create_publishes (
@@ -2180,7 +2180,7 @@ private:
         const char * name,
         const char * version,
         CORBA_ValueDef_ptr value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2190,7 +2190,7 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::ConsumesDef_ptr create_consumes (
@@ -2198,7 +2198,7 @@ private:
         const char * name,
         const char * version,
         CORBA_ValueDef_ptr value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2208,266 +2208,266 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _get_base_interfaces_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_base_interfaces_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_attribute_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_operation_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void lookup_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void contents_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void lookup_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_contents_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_module_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_constant_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_struct_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_union_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_enum_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_alias_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_value_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_value_box_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_exception_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_native_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_abstract_interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_local_interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void move_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void destroy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -2487,7 +2487,7 @@ private:
 
     virtual ::IR::_TAO_ComponentDef_Proxy_Impl &select_proxy (
       ::IR::ComponentDef *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -2496,7 +2496,7 @@ private:
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 private:
@@ -2539,7 +2539,7 @@ private:
 
     virtual CORBA_InterfaceDefSeq * supported_interfaces (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2548,7 +2548,7 @@ private:
     virtual void supported_interfaces (
         CORBA_Object *_collocated_tao_target_,
         const CORBA_InterfaceDefSeq & supported_interfaces
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2556,7 +2556,7 @@ private:
 
     virtual IR::ComponentDef_ptr base_component (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2564,7 +2564,7 @@ private:
 
     virtual IR::ProvidesDefSeq * provides_interfaces (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2572,7 +2572,7 @@ private:
 
     virtual IR::UsesDefSeq * uses_interfaces (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2580,7 +2580,7 @@ private:
 
     virtual IR::EmitsDefSeq * emits_events (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2588,7 +2588,7 @@ private:
 
     virtual IR::PublishesDefSeq * publishes_events (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2596,7 +2596,7 @@ private:
 
     virtual IR::ConsumesDefSeq * consumes_events (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2604,7 +2604,7 @@ private:
 
     virtual CORBA::Boolean is_basic (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2616,7 +2616,7 @@ private:
         const char * name,
         const char * version,
         CORBA_InterfaceDef_ptr interface_type
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2629,7 +2629,7 @@ private:
         const char * version,
         CORBA_InterfaceDef_ptr interface_type,
         CORBA::Boolean is_multiple
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2641,7 +2641,7 @@ private:
         const char * name,
         const char * version,
         CORBA_ValueDef_ptr value
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2653,7 +2653,7 @@ private:
         const char * name,
         const char * version,
         CORBA_ValueDef_ptr value
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2665,7 +2665,7 @@ private:
         const char * name,
         const char * version,
         CORBA_ValueDef_ptr value
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2697,7 +2697,7 @@ private:
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -2708,38 +2708,38 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::IR::PrimaryKeyDef *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA::Boolean is_a (
         const char * primary_key_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2749,11 +2749,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual CORBA_ValueDef_ptr primary_key (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2763,98 +2763,98 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void move_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void destroy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -2874,7 +2874,7 @@ private:
 
     virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
       ::IR::PrimaryKeyDef *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -2883,7 +2883,7 @@ private:
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 private:
@@ -2927,7 +2927,7 @@ private:
     virtual CORBA::Boolean is_a (
         CORBA_Object *_collocated_tao_target_,
         const char * primary_key_id
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2935,7 +2935,7 @@ private:
 
     virtual CORBA_ValueDef_ptr primary_key (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2967,7 +2967,7 @@ private:
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -2978,31 +2978,31 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::IR::FactoryDef *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
@@ -3011,168 +3011,168 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_result_def_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_result_def_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_params_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_params_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_mode_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_mode_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_contexts_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_contexts_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_exceptions_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_exceptions_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void move_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void destroy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -3192,7 +3192,7 @@ private:
 
     virtual ::IR::_TAO_FactoryDef_Proxy_Impl &select_proxy (
       ::IR::FactoryDef *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -3201,7 +3201,7 @@ private:
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 private:
@@ -3268,7 +3268,7 @@ private:
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -3279,31 +3279,31 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::IR::FinderDef *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
@@ -3312,168 +3312,168 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_result_def_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_result_def_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_params_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_params_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_mode_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_mode_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_contexts_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_contexts_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_exceptions_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_exceptions_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void move_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void destroy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -3493,7 +3493,7 @@ private:
 
     virtual ::IR::_TAO_FinderDef_Proxy_Impl &select_proxy (
       ::IR::FinderDef *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -3502,7 +3502,7 @@ private:
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 private:
@@ -3569,7 +3569,7 @@ private:
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -3580,37 +3580,37 @@ private:
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::IR::HomeDef *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual IR::HomeDef_ptr base_home (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3620,11 +3620,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::ComponentDef_ptr managed_component (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3634,11 +3634,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::PrimaryKeyDef_ptr primary_key (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3648,11 +3648,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::FactoryDefSeq * factories (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3662,11 +3662,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::FinderDefSeq * finders (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3676,11 +3676,11 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual CORBA::Boolean is_basic (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3690,7 +3690,7 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::PrimaryKeyDef_ptr create_primary_key (
@@ -3698,7 +3698,7 @@ private:
         const char * name,
         const char * version,
         CORBA_ValueDef_ptr primary_key
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3708,7 +3708,7 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::FactoryDef_ptr create_factory (
@@ -3717,7 +3717,7 @@ private:
         const char * version,
         const CORBA_ParDescriptionSeq & params,
         const CORBA_ExceptionDefSeq & exceptions
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3727,7 +3727,7 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual IR::FinderDef_ptr create_finder (
@@ -3736,7 +3736,7 @@ private:
         const char * version,
         const CORBA_ParDescriptionSeq & params,
         const CORBA_ExceptionDefSeq & exceptions
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3746,266 +3746,266 @@ private:
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _get_base_interfaces_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_base_interfaces_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_attribute_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_operation_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void lookup_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void contents_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void lookup_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_contents_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_module_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_constant_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_struct_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_union_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_enum_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_alias_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_value_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_value_box_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_exception_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_native_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_abstract_interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void create_local_interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void describe_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void move_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void destroy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -4025,7 +4025,7 @@ private:
 
     virtual ::IR::_TAO_HomeDef_Proxy_Impl &select_proxy (
       ::IR::HomeDef *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -4034,7 +4034,7 @@ private:
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 private:
@@ -4077,7 +4077,7 @@ private:
 
     virtual IR::HomeDef_ptr base_home (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -4085,7 +4085,7 @@ private:
 
     virtual IR::ComponentDef_ptr managed_component (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -4093,7 +4093,7 @@ private:
 
     virtual IR::PrimaryKeyDef_ptr primary_key (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -4101,7 +4101,7 @@ private:
 
     virtual IR::FactoryDefSeq * factories (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -4109,7 +4109,7 @@ private:
 
     virtual IR::FinderDefSeq * finders (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -4117,7 +4117,7 @@ private:
 
     virtual CORBA::Boolean is_basic (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -4129,7 +4129,7 @@ private:
         const char * name,
         const char * version,
         CORBA_ValueDef_ptr primary_key
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -4142,7 +4142,7 @@ private:
         const char * version,
         const CORBA_ParDescriptionSeq & params,
         const CORBA_ExceptionDefSeq & exceptions
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -4155,7 +4155,7 @@ private:
         const char * version,
         const CORBA_ParDescriptionSeq & params,
         const CORBA_ExceptionDefSeq & exceptions
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i
index 96f3fd02407..8a5a82037d4 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i
@@ -23,7 +23,7 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -31,14 +31,14 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_id_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::get_canonical_typecode_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -46,14 +46,14 @@ ACE_INLINE void POA_IR::ComponentRepository::get_canonical_typecode_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::get_primitive_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -61,14 +61,14 @@ ACE_INLINE void POA_IR::ComponentRepository::get_primitive_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_string_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -76,14 +76,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_string_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_wstring_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -91,14 +91,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_wstring_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_sequence_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -106,14 +106,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_sequence_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_array_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -121,14 +121,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_array_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_fixed_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -136,14 +136,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_fixed_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -151,14 +151,14 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -166,14 +166,14 @@ ACE_INLINE void POA_IR::ComponentRepository::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -181,14 +181,14 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -196,14 +196,14 @@ ACE_INLINE void POA_IR::ComponentRepository::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -211,14 +211,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -226,14 +226,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -241,14 +241,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -256,14 +256,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -271,14 +271,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -286,14 +286,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -301,14 +301,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -316,14 +316,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -331,14 +331,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -346,14 +346,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -361,14 +361,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -376,14 +376,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -391,14 +391,14 @@ ACE_INLINE void POA_IR::ComponentRepository::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -406,14 +406,14 @@ ACE_INLINE void POA_IR::ComponentRepository::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
@@ -421,14 +421,14 @@ ACE_INLINE void POA_IR::ComponentRepository::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
@@ -436,14 +436,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
@@ -451,14 +451,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
@@ -466,14 +466,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
@@ -481,14 +481,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
@@ -496,14 +496,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
@@ -511,14 +511,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
@@ -526,14 +526,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
@@ -541,14 +541,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
@@ -556,14 +556,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
@@ -571,14 +571,14 @@ ACE_INLINE void POA_IR::ProvidesDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
@@ -586,14 +586,14 @@ ACE_INLINE void POA_IR::ProvidesDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
@@ -601,14 +601,14 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
@@ -616,14 +616,14 @@ ACE_INLINE void POA_IR::ProvidesDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
@@ -631,14 +631,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
@@ -646,14 +646,14 @@ ACE_INLINE void POA_IR::UsesDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
@@ -661,14 +661,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
@@ -676,14 +676,14 @@ ACE_INLINE void POA_IR::UsesDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
@@ -691,14 +691,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
@@ -706,14 +706,14 @@ ACE_INLINE void POA_IR::UsesDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
@@ -721,14 +721,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
@@ -736,14 +736,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
@@ -751,14 +751,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
@@ -766,14 +766,14 @@ ACE_INLINE void POA_IR::UsesDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
@@ -781,14 +781,14 @@ ACE_INLINE void POA_IR::UsesDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
@@ -796,14 +796,14 @@ ACE_INLINE void POA_IR::UsesDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
@@ -811,14 +811,14 @@ ACE_INLINE void POA_IR::UsesDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
@@ -826,14 +826,14 @@ ACE_INLINE void POA_IR::EventDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
@@ -841,14 +841,14 @@ ACE_INLINE void POA_IR::EventDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
@@ -856,14 +856,14 @@ ACE_INLINE void POA_IR::EventDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
@@ -871,14 +871,14 @@ ACE_INLINE void POA_IR::EventDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
@@ -886,14 +886,14 @@ ACE_INLINE void POA_IR::EventDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
@@ -901,14 +901,14 @@ ACE_INLINE void POA_IR::EventDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
@@ -916,14 +916,14 @@ ACE_INLINE void POA_IR::EventDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
@@ -931,14 +931,14 @@ ACE_INLINE void POA_IR::EventDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
@@ -946,14 +946,14 @@ ACE_INLINE void POA_IR::EventDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
@@ -961,14 +961,14 @@ ACE_INLINE void POA_IR::EventDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
@@ -976,14 +976,14 @@ ACE_INLINE void POA_IR::EventDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
@@ -991,14 +991,14 @@ ACE_INLINE void POA_IR::EventDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
@@ -1006,14 +1006,14 @@ ACE_INLINE void POA_IR::EventDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1021,14 +1021,14 @@ ACE_INLINE void POA_IR::EmitsDef::is_a_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_event_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1036,14 +1036,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_event_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1051,14 +1051,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1066,14 +1066,14 @@ ACE_INLINE void POA_IR::EmitsDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1081,14 +1081,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1096,14 +1096,14 @@ ACE_INLINE void POA_IR::EmitsDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1111,14 +1111,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1126,14 +1126,14 @@ ACE_INLINE void POA_IR::EmitsDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1141,14 +1141,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1156,14 +1156,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1171,14 +1171,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1186,14 +1186,14 @@ ACE_INLINE void POA_IR::EmitsDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1201,14 +1201,14 @@ ACE_INLINE void POA_IR::EmitsDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1216,14 +1216,14 @@ ACE_INLINE void POA_IR::EmitsDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
@@ -1231,14 +1231,14 @@ ACE_INLINE void POA_IR::EmitsDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1246,14 +1246,14 @@ ACE_INLINE void POA_IR::PublishesDef::is_a_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_event_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1261,14 +1261,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_event_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1276,14 +1276,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1291,14 +1291,14 @@ ACE_INLINE void POA_IR::PublishesDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1306,14 +1306,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1321,14 +1321,14 @@ ACE_INLINE void POA_IR::PublishesDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1336,14 +1336,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1351,14 +1351,14 @@ ACE_INLINE void POA_IR::PublishesDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1366,14 +1366,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1381,14 +1381,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1396,14 +1396,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1411,14 +1411,14 @@ ACE_INLINE void POA_IR::PublishesDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1426,14 +1426,14 @@ ACE_INLINE void POA_IR::PublishesDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1441,14 +1441,14 @@ ACE_INLINE void POA_IR::PublishesDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
@@ -1456,14 +1456,14 @@ ACE_INLINE void POA_IR::PublishesDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1471,14 +1471,14 @@ ACE_INLINE void POA_IR::ConsumesDef::is_a_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_event_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1486,14 +1486,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_event_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1501,14 +1501,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1516,14 +1516,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1531,14 +1531,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1546,14 +1546,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1561,14 +1561,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1576,14 +1576,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1591,14 +1591,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1606,14 +1606,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1621,14 +1621,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1636,14 +1636,14 @@ ACE_INLINE void POA_IR::ConsumesDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1651,14 +1651,14 @@ ACE_INLINE void POA_IR::ConsumesDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1666,14 +1666,14 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
@@ -1681,14 +1681,14 @@ ACE_INLINE void POA_IR::ConsumesDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1696,14 +1696,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1711,14 +1711,14 @@ ACE_INLINE void POA_IR::ComponentDef::_set_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1726,14 +1726,14 @@ ACE_INLINE void POA_IR::ComponentDef::is_a_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1741,14 +1741,14 @@ ACE_INLINE void POA_IR::ComponentDef::describe_interface_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1756,14 +1756,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_attribute_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1771,14 +1771,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_operation_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1786,14 +1786,14 @@ ACE_INLINE void POA_IR::ComponentDef::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1801,14 +1801,14 @@ ACE_INLINE void POA_IR::ComponentDef::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1816,14 +1816,14 @@ ACE_INLINE void POA_IR::ComponentDef::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1831,14 +1831,14 @@ ACE_INLINE void POA_IR::ComponentDef::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1846,14 +1846,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1861,14 +1861,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1876,14 +1876,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1891,14 +1891,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1906,14 +1906,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1921,14 +1921,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1936,14 +1936,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1951,14 +1951,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1966,14 +1966,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1981,14 +1981,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -1996,14 +1996,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2011,14 +2011,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2026,14 +2026,14 @@ ACE_INLINE void POA_IR::ComponentDef::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2041,14 +2041,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2056,14 +2056,14 @@ ACE_INLINE void POA_IR::ComponentDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2071,14 +2071,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2086,14 +2086,14 @@ ACE_INLINE void POA_IR::ComponentDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2101,14 +2101,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2116,14 +2116,14 @@ ACE_INLINE void POA_IR::ComponentDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2131,14 +2131,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2146,14 +2146,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2161,14 +2161,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2176,14 +2176,14 @@ ACE_INLINE void POA_IR::ComponentDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2191,14 +2191,14 @@ ACE_INLINE void POA_IR::ComponentDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2206,14 +2206,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2221,14 +2221,14 @@ ACE_INLINE void POA_IR::ComponentDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
@@ -2236,14 +2236,14 @@ ACE_INLINE void POA_IR::ComponentDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
@@ -2251,14 +2251,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
@@ -2266,14 +2266,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
@@ -2281,14 +2281,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
@@ -2296,14 +2296,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
@@ -2311,14 +2311,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
@@ -2326,14 +2326,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
@@ -2341,14 +2341,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
@@ -2356,14 +2356,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
@@ -2371,14 +2371,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
@@ -2386,14 +2386,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
@@ -2401,14 +2401,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
@@ -2416,14 +2416,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
@@ -2431,14 +2431,14 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_result_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2446,14 +2446,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_result_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_result_def_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2461,14 +2461,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_result_def_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_result_def_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2476,14 +2476,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_result_def_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_params_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2491,14 +2491,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_params_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_params_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2506,14 +2506,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_params_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_mode_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2521,14 +2521,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_mode_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_mode_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2536,14 +2536,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_mode_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_contexts_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2551,14 +2551,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_contexts_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_contexts_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2566,14 +2566,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_contexts_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_exceptions_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2581,14 +2581,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_exceptions_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_exceptions_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2596,14 +2596,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_exceptions_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2611,14 +2611,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2626,14 +2626,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2641,14 +2641,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2656,14 +2656,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2671,14 +2671,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2686,14 +2686,14 @@ ACE_INLINE void POA_IR::FactoryDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2701,14 +2701,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2716,14 +2716,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2731,14 +2731,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2746,14 +2746,14 @@ ACE_INLINE void POA_IR::FactoryDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2761,14 +2761,14 @@ ACE_INLINE void POA_IR::FactoryDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2776,14 +2776,14 @@ ACE_INLINE void POA_IR::FactoryDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
@@ -2791,14 +2791,14 @@ ACE_INLINE void POA_IR::FactoryDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_result_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -2806,14 +2806,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_result_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_result_def_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -2821,14 +2821,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_result_def_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_result_def_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -2836,14 +2836,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_result_def_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_params_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -2851,14 +2851,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_params_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_params_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -2866,14 +2866,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_params_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_mode_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -2881,14 +2881,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_mode_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_mode_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -2896,14 +2896,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_mode_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_contexts_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -2911,14 +2911,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_contexts_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_contexts_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -2926,14 +2926,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_contexts_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_exceptions_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -2941,14 +2941,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_exceptions_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_exceptions_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -2956,14 +2956,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_exceptions_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -2971,14 +2971,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -2986,14 +2986,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -3001,14 +3001,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -3016,14 +3016,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -3031,14 +3031,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -3046,14 +3046,14 @@ ACE_INLINE void POA_IR::FinderDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -3061,14 +3061,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -3076,14 +3076,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -3091,14 +3091,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -3106,14 +3106,14 @@ ACE_INLINE void POA_IR::FinderDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -3121,14 +3121,14 @@ ACE_INLINE void POA_IR::FinderDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -3136,14 +3136,14 @@ ACE_INLINE void POA_IR::FinderDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
@@ -3151,14 +3151,14 @@ ACE_INLINE void POA_IR::FinderDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3166,14 +3166,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3181,14 +3181,14 @@ ACE_INLINE void POA_IR::HomeDef::_set_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3196,14 +3196,14 @@ ACE_INLINE void POA_IR::HomeDef::is_a_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3211,14 +3211,14 @@ ACE_INLINE void POA_IR::HomeDef::describe_interface_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3226,14 +3226,14 @@ ACE_INLINE void POA_IR::HomeDef::create_attribute_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3241,14 +3241,14 @@ ACE_INLINE void POA_IR::HomeDef::create_operation_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3256,14 +3256,14 @@ ACE_INLINE void POA_IR::HomeDef::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3271,14 +3271,14 @@ ACE_INLINE void POA_IR::HomeDef::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3286,14 +3286,14 @@ ACE_INLINE void POA_IR::HomeDef::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3301,14 +3301,14 @@ ACE_INLINE void POA_IR::HomeDef::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3316,14 +3316,14 @@ ACE_INLINE void POA_IR::HomeDef::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3331,14 +3331,14 @@ ACE_INLINE void POA_IR::HomeDef::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3346,14 +3346,14 @@ ACE_INLINE void POA_IR::HomeDef::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3361,14 +3361,14 @@ ACE_INLINE void POA_IR::HomeDef::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3376,14 +3376,14 @@ ACE_INLINE void POA_IR::HomeDef::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3391,14 +3391,14 @@ ACE_INLINE void POA_IR::HomeDef::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3406,14 +3406,14 @@ ACE_INLINE void POA_IR::HomeDef::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3421,14 +3421,14 @@ ACE_INLINE void POA_IR::HomeDef::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3436,14 +3436,14 @@ ACE_INLINE void POA_IR::HomeDef::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3451,14 +3451,14 @@ ACE_INLINE void POA_IR::HomeDef::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3466,14 +3466,14 @@ ACE_INLINE void POA_IR::HomeDef::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3481,14 +3481,14 @@ ACE_INLINE void POA_IR::HomeDef::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3496,14 +3496,14 @@ ACE_INLINE void POA_IR::HomeDef::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3511,14 +3511,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3526,14 +3526,14 @@ ACE_INLINE void POA_IR::HomeDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3541,14 +3541,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3556,14 +3556,14 @@ ACE_INLINE void POA_IR::HomeDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3571,14 +3571,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3586,14 +3586,14 @@ ACE_INLINE void POA_IR::HomeDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3601,14 +3601,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3616,14 +3616,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3631,14 +3631,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3646,14 +3646,14 @@ ACE_INLINE void POA_IR::HomeDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3661,14 +3661,14 @@ ACE_INLINE void POA_IR::HomeDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3676,14 +3676,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3691,14 +3691,14 @@ ACE_INLINE void POA_IR::HomeDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
@@ -3706,6 +3706,6 @@ ACE_INLINE void POA_IR::HomeDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
index 500e9839c58..cc915fc6a37 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
@@ -64,7 +64,7 @@ TAO_NAMESPACE  POA_IR
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     IR::ComponentDef_ptr create_component (
         const char * id,
@@ -72,7 +72,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         IR::ComponentDef_ptr base_component,
         const CORBA_InterfaceDefSeq & supports_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -85,7 +85,7 @@ TAO_NAMESPACE  POA_IR
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
         CORBA_ValueDef_ptr primary_key
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -93,7 +93,7 @@ TAO_NAMESPACE  POA_IR
 
         CORBA_Contained_ptr lookup_id (
         const char * search_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -101,7 +101,7 @@ TAO_NAMESPACE  POA_IR
 
         CORBA::TypeCode_ptr get_canonical_typecode (
         CORBA::TypeCode_ptr tc
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -109,7 +109,7 @@ TAO_NAMESPACE  POA_IR
 
         CORBA_PrimitiveDef_ptr get_primitive (
         CORBA::PrimitiveKind kind
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -117,7 +117,7 @@ TAO_NAMESPACE  POA_IR
 
         CORBA_StringDef_ptr create_string (
         CORBA::ULong bound
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -125,7 +125,7 @@ TAO_NAMESPACE  POA_IR
 
         CORBA_WstringDef_ptr create_wstring (
         CORBA::ULong bound
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -134,7 +134,7 @@ TAO_NAMESPACE  POA_IR
         CORBA_SequenceDef_ptr create_sequence (
         CORBA::ULong bound,
         CORBA_IDLType_ptr element_type
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -143,7 +143,7 @@ TAO_NAMESPACE  POA_IR
         CORBA_ArrayDef_ptr create_array (
         CORBA::ULong length,
         CORBA_IDLType_ptr element_type
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -152,7 +152,7 @@ TAO_NAMESPACE  POA_IR
         CORBA_FixedDef_ptr create_fixed (
         CORBA::UShort digits,
         CORBA::Short scale
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -160,7 +160,7 @@ TAO_NAMESPACE  POA_IR
 
         CORBA_Contained_ptr lookup (
         const char * search_name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -169,7 +169,7 @@ TAO_NAMESPACE  POA_IR
         CORBA_ContainedSeq * contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -180,7 +180,7 @@ TAO_NAMESPACE  POA_IR
         CORBA::Long levels_to_search,
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -190,7 +190,7 @@ TAO_NAMESPACE  POA_IR
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited,
         CORBA::Long max_returned_objs
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -200,7 +200,7 @@ TAO_NAMESPACE  POA_IR
         const char * id,
         const char * name,
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -212,7 +212,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         CORBA_IDLType_ptr type,
         const CORBA::Any & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -223,7 +223,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_StructMemberSeq & members
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -235,7 +235,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         CORBA_IDLType_ptr discriminator_type,
         const CORBA_UnionMemberSeq & members
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -246,7 +246,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_EnumMemberSeq & members
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -257,7 +257,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         CORBA_IDLType_ptr original_type
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -268,7 +268,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_InterfaceDefSeq & base_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -285,7 +285,7 @@ TAO_NAMESPACE  POA_IR
         const CORBA_ValueDefSeq & abstract_base_values,
         const CORBA_InterfaceDefSeq & supported_interfaces,
         const CORBA_InitializerSeq & initializers
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -296,7 +296,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         CORBA_IDLType_ptr original_type_def
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -307,7 +307,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_StructMemberSeq & members
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -317,7 +317,7 @@ TAO_NAMESPACE  POA_IR
         const char * id,
         const char * name,
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -328,7 +328,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_AbstractInterfaceDefSeq & base_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -339,21 +339,21 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_InterfaceDefSeq & base_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::DefinitionKind def_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -399,17 +399,17 @@ TAO_NAMESPACE  POA_IR
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA_InterfaceDef_ptr interface_type (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -417,14 +417,14 @@ TAO_NAMESPACE  POA_IR
 
         void id (
         const char * id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -432,14 +432,14 @@ TAO_NAMESPACE  POA_IR
 
         void name (
         const char * name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * version (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -447,35 +447,35 @@ TAO_NAMESPACE  POA_IR
 
         void version (
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Container_ptr defined_in (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * absolute_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Repository_ptr containing_repository (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Contained::Description * describe (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -485,21 +485,21 @@ TAO_NAMESPACE  POA_IR
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::DefinitionKind def_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -545,24 +545,24 @@ TAO_NAMESPACE  POA_IR
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA_InterfaceDef_ptr interface_type (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::Boolean is_multiple (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -570,14 +570,14 @@ TAO_NAMESPACE  POA_IR
 
         void id (
         const char * id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -585,14 +585,14 @@ TAO_NAMESPACE  POA_IR
 
         void name (
         const char * name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * version (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -600,35 +600,35 @@ TAO_NAMESPACE  POA_IR
 
         void version (
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Container_ptr defined_in (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * absolute_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Repository_ptr containing_repository (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Contained::Description * describe (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -638,21 +638,21 @@ TAO_NAMESPACE  POA_IR
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::DefinitionKind def_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -698,25 +698,25 @@ TAO_NAMESPACE  POA_IR
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::Boolean is_a (
         const char * event_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_ValueDef_ptr event (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -724,14 +724,14 @@ TAO_NAMESPACE  POA_IR
 
         void id (
         const char * id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -739,14 +739,14 @@ TAO_NAMESPACE  POA_IR
 
         void name (
         const char * name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * version (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -754,35 +754,35 @@ TAO_NAMESPACE  POA_IR
 
         void version (
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Container_ptr defined_in (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * absolute_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Repository_ptr containing_repository (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Contained::Description * describe (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -792,21 +792,21 @@ TAO_NAMESPACE  POA_IR
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::DefinitionKind def_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -852,25 +852,25 @@ TAO_NAMESPACE  POA_IR
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::Boolean is_a (
         const char * event_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_ValueDef_ptr event (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -878,14 +878,14 @@ TAO_NAMESPACE  POA_IR
 
         void id (
         const char * id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -893,14 +893,14 @@ TAO_NAMESPACE  POA_IR
 
         void name (
         const char * name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * version (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -908,35 +908,35 @@ TAO_NAMESPACE  POA_IR
 
         void version (
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Container_ptr defined_in (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * absolute_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Repository_ptr containing_repository (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Contained::Description * describe (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -946,21 +946,21 @@ TAO_NAMESPACE  POA_IR
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::DefinitionKind def_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1006,25 +1006,25 @@ TAO_NAMESPACE  POA_IR
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::Boolean is_a (
         const char * event_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_ValueDef_ptr event (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1032,14 +1032,14 @@ TAO_NAMESPACE  POA_IR
 
         void id (
         const char * id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1047,14 +1047,14 @@ TAO_NAMESPACE  POA_IR
 
         void name (
         const char * name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * version (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1062,35 +1062,35 @@ TAO_NAMESPACE  POA_IR
 
         void version (
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Container_ptr defined_in (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * absolute_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Repository_ptr containing_repository (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Contained::Description * describe (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1100,21 +1100,21 @@ TAO_NAMESPACE  POA_IR
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::DefinitionKind def_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1160,25 +1160,25 @@ TAO_NAMESPACE  POA_IR
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::Boolean is_a (
         const char * event_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_ValueDef_ptr event (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1186,14 +1186,14 @@ TAO_NAMESPACE  POA_IR
 
         void id (
         const char * id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1201,14 +1201,14 @@ TAO_NAMESPACE  POA_IR
 
         void name (
         const char * name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * version (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1216,35 +1216,35 @@ TAO_NAMESPACE  POA_IR
 
         void version (
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Container_ptr defined_in (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * absolute_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Repository_ptr containing_repository (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Contained::Description * describe (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1254,21 +1254,21 @@ TAO_NAMESPACE  POA_IR
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::DefinitionKind def_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1314,10 +1314,10 @@ TAO_NAMESPACE  POA_IR
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA_InterfaceDefSeq * supported_interfaces (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1325,56 +1325,56 @@ TAO_NAMESPACE  POA_IR
 
         void supported_interfaces (
         const CORBA_InterfaceDefSeq & supported_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         IR::ComponentDef_ptr base_component (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         IR::ProvidesDefSeq * provides_interfaces (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         IR::UsesDefSeq * uses_interfaces (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         IR::EmitsDefSeq * emits_events (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         IR::PublishesDefSeq * publishes_events (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         IR::ConsumesDefSeq * consumes_events (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::Boolean is_basic (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1385,7 +1385,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         CORBA_InterfaceDef_ptr interface_type
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1397,7 +1397,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         CORBA_InterfaceDef_ptr interface_type,
         CORBA::Boolean is_multiple
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1408,7 +1408,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         CORBA_ValueDef_ptr value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1419,7 +1419,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         CORBA_ValueDef_ptr value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1430,14 +1430,14 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         CORBA_ValueDef_ptr value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_InterfaceDefSeq * base_interfaces (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1445,7 +1445,7 @@ TAO_NAMESPACE  POA_IR
 
         void base_interfaces (
         const CORBA_InterfaceDefSeq & base_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1453,14 +1453,14 @@ TAO_NAMESPACE  POA_IR
 
         CORBA::Boolean is_a (
         const char * interface_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1472,7 +1472,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         CORBA_IDLType_ptr type,
         CORBA::AttributeMode mode
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1487,7 +1487,7 @@ TAO_NAMESPACE  POA_IR
         const CORBA_ParDescriptionSeq & params,
         const CORBA_ExceptionDefSeq & exceptions,
         const CORBA_ContextIdSeq & contexts
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1495,7 +1495,7 @@ TAO_NAMESPACE  POA_IR
 
         CORBA_Contained_ptr lookup (
         const char * search_name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1504,7 +1504,7 @@ TAO_NAMESPACE  POA_IR
         CORBA_ContainedSeq * contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1515,7 +1515,7 @@ TAO_NAMESPACE  POA_IR
         CORBA::Long levels_to_search,
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1525,7 +1525,7 @@ TAO_NAMESPACE  POA_IR
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited,
         CORBA::Long max_returned_objs
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1535,7 +1535,7 @@ TAO_NAMESPACE  POA_IR
         const char * id,
         const char * name,
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1547,7 +1547,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         CORBA_IDLType_ptr type,
         const CORBA::Any & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1558,7 +1558,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_StructMemberSeq & members
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1570,7 +1570,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         CORBA_IDLType_ptr discriminator_type,
         const CORBA_UnionMemberSeq & members
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1581,7 +1581,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_EnumMemberSeq & members
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1592,7 +1592,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         CORBA_IDLType_ptr original_type
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1603,7 +1603,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_InterfaceDefSeq & base_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1620,7 +1620,7 @@ TAO_NAMESPACE  POA_IR
         const CORBA_ValueDefSeq & abstract_base_values,
         const CORBA_InterfaceDefSeq & supported_interfaces,
         const CORBA_InitializerSeq & initializers
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1631,7 +1631,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         CORBA_IDLType_ptr original_type_def
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1642,7 +1642,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_StructMemberSeq & members
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1652,7 +1652,7 @@ TAO_NAMESPACE  POA_IR
         const char * id,
         const char * name,
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1663,7 +1663,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_AbstractInterfaceDefSeq & base_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1674,14 +1674,14 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_InterfaceDefSeq & base_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1689,14 +1689,14 @@ TAO_NAMESPACE  POA_IR
 
         void id (
         const char * id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1704,14 +1704,14 @@ TAO_NAMESPACE  POA_IR
 
         void name (
         const char * name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * version (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1719,35 +1719,35 @@ TAO_NAMESPACE  POA_IR
 
         void version (
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Container_ptr defined_in (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * absolute_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Repository_ptr containing_repository (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Contained::Description * describe (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1757,28 +1757,28 @@ TAO_NAMESPACE  POA_IR
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::TypeCode_ptr type (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::DefinitionKind def_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1824,25 +1824,25 @@ TAO_NAMESPACE  POA_IR
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::Boolean is_a (
         const char * primary_key_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_ValueDef_ptr primary_key (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1850,14 +1850,14 @@ TAO_NAMESPACE  POA_IR
 
         void id (
         const char * id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1865,14 +1865,14 @@ TAO_NAMESPACE  POA_IR
 
         void name (
         const char * name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * version (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1880,35 +1880,35 @@ TAO_NAMESPACE  POA_IR
 
         void version (
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Container_ptr defined_in (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * absolute_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Repository_ptr containing_repository (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Contained::Description * describe (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1918,21 +1918,21 @@ TAO_NAMESPACE  POA_IR
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::DefinitionKind def_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1978,17 +1978,17 @@ TAO_NAMESPACE  POA_IR
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr result (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_IDLType_ptr result_def (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1996,14 +1996,14 @@ TAO_NAMESPACE  POA_IR
 
         void result_def (
         CORBA_IDLType_ptr result_def
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_ParDescriptionSeq * params (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2011,14 +2011,14 @@ TAO_NAMESPACE  POA_IR
 
         void params (
         const CORBA_ParDescriptionSeq & params
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::OperationMode mode (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2026,14 +2026,14 @@ TAO_NAMESPACE  POA_IR
 
         void mode (
         CORBA::OperationMode mode
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_ContextIdSeq * contexts (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2041,14 +2041,14 @@ TAO_NAMESPACE  POA_IR
 
         void contexts (
         const CORBA_ContextIdSeq & contexts
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_ExceptionDefSeq * exceptions (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2056,14 +2056,14 @@ TAO_NAMESPACE  POA_IR
 
         void exceptions (
         const CORBA_ExceptionDefSeq & exceptions
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2071,14 +2071,14 @@ TAO_NAMESPACE  POA_IR
 
         void id (
         const char * id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2086,14 +2086,14 @@ TAO_NAMESPACE  POA_IR
 
         void name (
         const char * name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * version (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2101,35 +2101,35 @@ TAO_NAMESPACE  POA_IR
 
         void version (
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Container_ptr defined_in (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * absolute_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Repository_ptr containing_repository (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Contained::Description * describe (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2139,21 +2139,21 @@ TAO_NAMESPACE  POA_IR
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::DefinitionKind def_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2199,17 +2199,17 @@ TAO_NAMESPACE  POA_IR
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::TypeCode_ptr result (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_IDLType_ptr result_def (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2217,14 +2217,14 @@ TAO_NAMESPACE  POA_IR
 
         void result_def (
         CORBA_IDLType_ptr result_def
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_ParDescriptionSeq * params (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2232,14 +2232,14 @@ TAO_NAMESPACE  POA_IR
 
         void params (
         const CORBA_ParDescriptionSeq & params
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::OperationMode mode (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2247,14 +2247,14 @@ TAO_NAMESPACE  POA_IR
 
         void mode (
         CORBA::OperationMode mode
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_ContextIdSeq * contexts (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2262,14 +2262,14 @@ TAO_NAMESPACE  POA_IR
 
         void contexts (
         const CORBA_ContextIdSeq & contexts
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_ExceptionDefSeq * exceptions (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2277,14 +2277,14 @@ TAO_NAMESPACE  POA_IR
 
         void exceptions (
         const CORBA_ExceptionDefSeq & exceptions
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2292,14 +2292,14 @@ TAO_NAMESPACE  POA_IR
 
         void id (
         const char * id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2307,14 +2307,14 @@ TAO_NAMESPACE  POA_IR
 
         void name (
         const char * name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * version (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2322,35 +2322,35 @@ TAO_NAMESPACE  POA_IR
 
         void version (
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Container_ptr defined_in (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * absolute_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Repository_ptr containing_repository (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Contained::Description * describe (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2360,21 +2360,21 @@ TAO_NAMESPACE  POA_IR
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::DefinitionKind def_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2420,45 +2420,45 @@ TAO_NAMESPACE  POA_IR
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     IR::HomeDef_ptr base_home (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         IR::ComponentDef_ptr managed_component (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         IR::PrimaryKeyDef_ptr primary_key (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         IR::FactoryDefSeq * factories (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         IR::FinderDefSeq * finders (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::Boolean is_basic (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2469,7 +2469,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         CORBA_ValueDef_ptr primary_key
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2481,7 +2481,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         const CORBA_ParDescriptionSeq & params,
         const CORBA_ExceptionDefSeq & exceptions
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2493,14 +2493,14 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         const CORBA_ParDescriptionSeq & params,
         const CORBA_ExceptionDefSeq & exceptions
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_InterfaceDefSeq * base_interfaces (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2508,7 +2508,7 @@ TAO_NAMESPACE  POA_IR
 
         void base_interfaces (
         const CORBA_InterfaceDefSeq & base_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2516,14 +2516,14 @@ TAO_NAMESPACE  POA_IR
 
         CORBA::Boolean is_a (
         const char * interface_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2535,7 +2535,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         CORBA_IDLType_ptr type,
         CORBA::AttributeMode mode
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2550,7 +2550,7 @@ TAO_NAMESPACE  POA_IR
         const CORBA_ParDescriptionSeq & params,
         const CORBA_ExceptionDefSeq & exceptions,
         const CORBA_ContextIdSeq & contexts
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2558,7 +2558,7 @@ TAO_NAMESPACE  POA_IR
 
         CORBA_Contained_ptr lookup (
         const char * search_name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2567,7 +2567,7 @@ TAO_NAMESPACE  POA_IR
         CORBA_ContainedSeq * contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2578,7 +2578,7 @@ TAO_NAMESPACE  POA_IR
         CORBA::Long levels_to_search,
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2588,7 +2588,7 @@ TAO_NAMESPACE  POA_IR
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited,
         CORBA::Long max_returned_objs
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2598,7 +2598,7 @@ TAO_NAMESPACE  POA_IR
         const char * id,
         const char * name,
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2610,7 +2610,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         CORBA_IDLType_ptr type,
         const CORBA::Any & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2621,7 +2621,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_StructMemberSeq & members
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2633,7 +2633,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         CORBA_IDLType_ptr discriminator_type,
         const CORBA_UnionMemberSeq & members
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2644,7 +2644,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_EnumMemberSeq & members
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2655,7 +2655,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         CORBA_IDLType_ptr original_type
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2666,7 +2666,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_InterfaceDefSeq & base_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2683,7 +2683,7 @@ TAO_NAMESPACE  POA_IR
         const CORBA_ValueDefSeq & abstract_base_values,
         const CORBA_InterfaceDefSeq & supported_interfaces,
         const CORBA_InitializerSeq & initializers
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2694,7 +2694,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         CORBA_IDLType_ptr original_type_def
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2705,7 +2705,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_StructMemberSeq & members
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2715,7 +2715,7 @@ TAO_NAMESPACE  POA_IR
         const char * id,
         const char * name,
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2726,7 +2726,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_AbstractInterfaceDefSeq & base_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2737,14 +2737,14 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         const CORBA_InterfaceDefSeq & base_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2752,14 +2752,14 @@ TAO_NAMESPACE  POA_IR
 
         void id (
         const char * id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2767,14 +2767,14 @@ TAO_NAMESPACE  POA_IR
 
         void name (
         const char * name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * version (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2782,35 +2782,35 @@ TAO_NAMESPACE  POA_IR
 
         void version (
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Container_ptr defined_in (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         char * absolute_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Repository_ptr containing_repository (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA_Contained::Description * describe (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2820,28 +2820,28 @@ TAO_NAMESPACE  POA_IR
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::TypeCode_ptr type (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         CORBA::DefinitionKind def_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
index 6742e31f286..4b3ff1655a0 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
@@ -90,12 +90,12 @@ POA_IR::ComponentRepository_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::ComponentRepository_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::ComponentRepository_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ComponentRepository::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->ComponentRepository::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
@@ -105,7 +105,7 @@ IR::ComponentDef_ptr POA_IR::ComponentRepository_tie<T>::create_component  (
     const char * version,
     IR::ComponentDef_ptr base_component,
     const CORBA_InterfaceDefSeq & supports_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -117,7 +117,7 @@ id,
     version,
     base_component,
     supports_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -129,7 +129,7 @@ IR::HomeDef_ptr POA_IR::ComponentRepository_tie<T>::create_home  (
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -142,14 +142,14 @@ id,
     base_home,
     managed_component,
     primary_key
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup_id  (
     const char * search_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -157,14 +157,14 @@ CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup_id  (
 {
   return this->ptr_->lookup_id (
 search_id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::ComponentRepository_tie<T>::get_canonical_typecode  (
     CORBA::TypeCode_ptr tc
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -172,14 +172,14 @@ CORBA::TypeCode_ptr POA_IR::ComponentRepository_tie<T>::get_canonical_typecode
 {
   return this->ptr_->get_canonical_typecode (
 tc
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_PrimitiveDef_ptr POA_IR::ComponentRepository_tie<T>::get_primitive  (
     CORBA::PrimitiveKind kind
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -187,14 +187,14 @@ CORBA_PrimitiveDef_ptr POA_IR::ComponentRepository_tie<T>::get_primitive  (
 {
   return this->ptr_->get_primitive (
 kind
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_StringDef_ptr POA_IR::ComponentRepository_tie<T>::create_string  (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -202,14 +202,14 @@ CORBA_StringDef_ptr POA_IR::ComponentRepository_tie<T>::create_string  (
 {
   return this->ptr_->create_string (
 bound
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_WstringDef_ptr POA_IR::ComponentRepository_tie<T>::create_wstring  (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -217,7 +217,7 @@ CORBA_WstringDef_ptr POA_IR::ComponentRepository_tie<T>::create_wstring  (
 {
   return this->ptr_->create_wstring (
 bound
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -225,7 +225,7 @@ template <class T> ACE_INLINE
 CORBA_SequenceDef_ptr POA_IR::ComponentRepository_tie<T>::create_sequence  (
     CORBA::ULong bound,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -234,7 +234,7 @@ CORBA_SequenceDef_ptr POA_IR::ComponentRepository_tie<T>::create_sequence  (
   return this->ptr_->create_sequence (
 bound,
     element_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -242,7 +242,7 @@ template <class T> ACE_INLINE
 CORBA_ArrayDef_ptr POA_IR::ComponentRepository_tie<T>::create_array  (
     CORBA::ULong length,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -251,7 +251,7 @@ CORBA_ArrayDef_ptr POA_IR::ComponentRepository_tie<T>::create_array  (
   return this->ptr_->create_array (
 length,
     element_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -259,7 +259,7 @@ template <class T> ACE_INLINE
 CORBA_FixedDef_ptr POA_IR::ComponentRepository_tie<T>::create_fixed  (
     CORBA::UShort digits,
     CORBA::Short scale
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -268,14 +268,14 @@ CORBA_FixedDef_ptr POA_IR::ComponentRepository_tie<T>::create_fixed  (
   return this->ptr_->create_fixed (
 digits,
     scale
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup  (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -283,7 +283,7 @@ CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup  (
 {
   return this->ptr_->lookup (
 search_name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -291,7 +291,7 @@ template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -300,7 +300,7 @@ CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::contents  (
   return this->ptr_->contents (
 limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -310,7 +310,7 @@ CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::lookup_name  (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -321,7 +321,7 @@ search_name,
     levels_to_search,
     limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -330,7 +330,7 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentRepository_tie<T>::describe_c
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -340,7 +340,7 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentRepository_tie<T>::describe_c
 limit_type,
     exclude_inherited,
     max_returned_objs
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -349,7 +349,7 @@ CORBA_ModuleDef_ptr POA_IR::ComponentRepository_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -359,7 +359,7 @@ CORBA_ModuleDef_ptr POA_IR::ComponentRepository_tie<T>::create_module  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -370,7 +370,7 @@ CORBA_ConstantDef_ptr POA_IR::ComponentRepository_tie<T>::create_constant  (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -382,7 +382,7 @@ id,
     version,
     type,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -392,7 +392,7 @@ CORBA_StructDef_ptr POA_IR::ComponentRepository_tie<T>::create_struct  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -403,7 +403,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -414,7 +414,7 @@ CORBA_UnionDef_ptr POA_IR::ComponentRepository_tie<T>::create_union  (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -426,7 +426,7 @@ id,
     version,
     discriminator_type,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -436,7 +436,7 @@ CORBA_EnumDef_ptr POA_IR::ComponentRepository_tie<T>::create_enum  (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -447,7 +447,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -457,7 +457,7 @@ CORBA_AliasDef_ptr POA_IR::ComponentRepository_tie<T>::create_alias  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -468,7 +468,7 @@ id,
     name,
     version,
     original_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -478,7 +478,7 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -489,7 +489,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -505,7 +505,7 @@ CORBA_ValueDef_ptr POA_IR::ComponentRepository_tie<T>::create_value  (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -522,7 +522,7 @@ id,
     abstract_base_values,
     supported_interfaces,
     initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -532,7 +532,7 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentRepository_tie<T>::create_value_box  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -543,7 +543,7 @@ id,
     name,
     version,
     original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -553,7 +553,7 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentRepository_tie<T>::create_exception  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -564,7 +564,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -573,7 +573,7 @@ CORBA_NativeDef_ptr POA_IR::ComponentRepository_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -583,7 +583,7 @@ CORBA_NativeDef_ptr POA_IR::ComponentRepository_tie<T>::create_native  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -593,7 +593,7 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_abstra
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -604,7 +604,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -614,7 +614,7 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_local_int
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -625,33 +625,33 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::ComponentRepository_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentRepository_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -724,44 +724,44 @@ POA_IR::ProvidesDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::ProvidesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::ProvidesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ProvidesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->ProvidesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef_ptr POA_IR::ProvidesDef_tie<T>::interface_type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->interface_type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ProvidesDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -769,27 +769,27 @@ void POA_IR::ProvidesDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ProvidesDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -797,27 +797,27 @@ void POA_IR::ProvidesDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ProvidesDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -825,59 +825,59 @@ void POA_IR::ProvidesDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::ProvidesDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ProvidesDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::ProvidesDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::ProvidesDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -886,7 +886,7 @@ void POA_IR::ProvidesDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -896,33 +896,33 @@ void POA_IR::ProvidesDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::ProvidesDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -995,57 +995,57 @@ POA_IR::UsesDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::UsesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::UsesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->UsesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->UsesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef_ptr POA_IR::UsesDef_tie<T>::interface_type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->interface_type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::UsesDef_tie<T>::is_multiple  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_multiple (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::UsesDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1053,27 +1053,27 @@ void POA_IR::UsesDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::UsesDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1081,27 +1081,27 @@ void POA_IR::UsesDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::UsesDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1109,59 +1109,59 @@ void POA_IR::UsesDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::UsesDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::UsesDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::UsesDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::UsesDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1170,7 +1170,7 @@ void POA_IR::UsesDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1180,33 +1180,33 @@ void POA_IR::UsesDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::UsesDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1279,18 +1279,18 @@ POA_IR::EventDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::EventDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::EventDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->EventDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->EventDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::EventDef_tie<T>::is_a  (
     const char * event_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1298,40 +1298,40 @@ CORBA::Boolean POA_IR::EventDef_tie<T>::is_a  (
 {
   return this->ptr_->is_a (
 event_id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::EventDef_tie<T>::event  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EventDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1339,27 +1339,27 @@ void POA_IR::EventDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EventDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1367,27 +1367,27 @@ void POA_IR::EventDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EventDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1395,59 +1395,59 @@ void POA_IR::EventDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::EventDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EventDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::EventDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::EventDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1456,7 +1456,7 @@ void POA_IR::EventDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1466,33 +1466,33 @@ void POA_IR::EventDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::EventDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1565,18 +1565,18 @@ POA_IR::EmitsDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::EmitsDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::EmitsDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->EmitsDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->EmitsDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::EmitsDef_tie<T>::is_a  (
     const char * event_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1584,40 +1584,40 @@ CORBA::Boolean POA_IR::EmitsDef_tie<T>::is_a  (
 {
   return this->ptr_->is_a (
 event_id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::EmitsDef_tie<T>::event  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EmitsDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1625,27 +1625,27 @@ void POA_IR::EmitsDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EmitsDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1653,27 +1653,27 @@ void POA_IR::EmitsDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EmitsDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1681,59 +1681,59 @@ void POA_IR::EmitsDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::EmitsDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EmitsDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::EmitsDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::EmitsDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1742,7 +1742,7 @@ void POA_IR::EmitsDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1752,33 +1752,33 @@ void POA_IR::EmitsDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::EmitsDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1851,18 +1851,18 @@ POA_IR::PublishesDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::PublishesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::PublishesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->PublishesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->PublishesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::PublishesDef_tie<T>::is_a  (
     const char * event_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1870,40 +1870,40 @@ CORBA::Boolean POA_IR::PublishesDef_tie<T>::is_a  (
 {
   return this->ptr_->is_a (
 event_id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::PublishesDef_tie<T>::event  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PublishesDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1911,27 +1911,27 @@ void POA_IR::PublishesDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PublishesDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1939,27 +1939,27 @@ void POA_IR::PublishesDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PublishesDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1967,59 +1967,59 @@ void POA_IR::PublishesDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::PublishesDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PublishesDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::PublishesDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::PublishesDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2028,7 +2028,7 @@ void POA_IR::PublishesDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2038,33 +2038,33 @@ void POA_IR::PublishesDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::PublishesDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2137,18 +2137,18 @@ POA_IR::ConsumesDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::ConsumesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::ConsumesDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ConsumesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->ConsumesDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::ConsumesDef_tie<T>::is_a  (
     const char * event_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2156,40 +2156,40 @@ CORBA::Boolean POA_IR::ConsumesDef_tie<T>::is_a  (
 {
   return this->ptr_->is_a (
 event_id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::ConsumesDef_tie<T>::event  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ConsumesDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2197,27 +2197,27 @@ void POA_IR::ConsumesDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ConsumesDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2225,27 +2225,27 @@ void POA_IR::ConsumesDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ConsumesDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2253,59 +2253,59 @@ void POA_IR::ConsumesDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::ConsumesDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ConsumesDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::ConsumesDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::ConsumesDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2314,7 +2314,7 @@ void POA_IR::ConsumesDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2324,33 +2324,33 @@ void POA_IR::ConsumesDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::ConsumesDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2423,31 +2423,31 @@ POA_IR::ComponentDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::ComponentDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::ComponentDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ComponentDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->ComponentDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_IR::ComponentDef_tie<T>::supported_interfaces  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::supported_interfaces  (
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2455,98 +2455,98 @@ void POA_IR::ComponentDef_tie<T>::supported_interfaces  (
 {
   this->ptr_->supported_interfaces (
 supported_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::ComponentDef_ptr POA_IR::ComponentDef_tie<T>::base_component  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_component (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::ProvidesDefSeq * POA_IR::ComponentDef_tie<T>::provides_interfaces  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->provides_interfaces (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::UsesDefSeq * POA_IR::ComponentDef_tie<T>::uses_interfaces  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->uses_interfaces (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::EmitsDefSeq * POA_IR::ComponentDef_tie<T>::emits_events  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->emits_events (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::PublishesDefSeq * POA_IR::ComponentDef_tie<T>::publishes_events  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->publishes_events (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::ConsumesDefSeq * POA_IR::ComponentDef_tie<T>::consumes_events  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->consumes_events (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::ComponentDef_tie<T>::is_basic  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_basic (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2556,7 +2556,7 @@ IR::ProvidesDef_ptr POA_IR::ComponentDef_tie<T>::create_provides  (
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2567,7 +2567,7 @@ id,
     name,
     version,
     interface_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2578,7 +2578,7 @@ IR::UsesDef_ptr POA_IR::ComponentDef_tie<T>::create_uses  (
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
     CORBA::Boolean is_multiple
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2590,7 +2590,7 @@ id,
     version,
     interface_type,
     is_multiple
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2600,7 +2600,7 @@ IR::EmitsDef_ptr POA_IR::ComponentDef_tie<T>::create_emits  (
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2611,7 +2611,7 @@ id,
     name,
     version,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2621,7 +2621,7 @@ IR::PublishesDef_ptr POA_IR::ComponentDef_tie<T>::create_publishes  (
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2632,7 +2632,7 @@ id,
     name,
     version,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2642,7 +2642,7 @@ IR::ConsumesDef_ptr POA_IR::ComponentDef_tie<T>::create_consumes  (
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2653,27 +2653,27 @@ id,
     name,
     version,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_IR::ComponentDef_tie<T>::base_interfaces  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::base_interfaces  (
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2681,14 +2681,14 @@ void POA_IR::ComponentDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
 base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::ComponentDef_tie<T>::is_a  (
     const char * interface_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2696,20 +2696,20 @@ CORBA::Boolean POA_IR::ComponentDef_tie<T>::is_a  (
 {
   return this->ptr_->is_a (
 interface_id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_IR::ComponentDef_tie<T>::describe_interface  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2720,7 +2720,7 @@ CORBA_AttributeDef_ptr POA_IR::ComponentDef_tie<T>::create_attribute  (
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2732,7 +2732,7 @@ id,
     version,
     type,
     mode
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2746,7 +2746,7 @@ CORBA_OperationDef_ptr POA_IR::ComponentDef_tie<T>::create_operation  (
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2761,14 +2761,14 @@ id,
     params,
     exceptions,
     contexts
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_IR::ComponentDef_tie<T>::lookup  (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2776,7 +2776,7 @@ CORBA_Contained_ptr POA_IR::ComponentDef_tie<T>::lookup  (
 {
   return this->ptr_->lookup (
 search_name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2784,7 +2784,7 @@ template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2793,7 +2793,7 @@ CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::contents  (
   return this->ptr_->contents (
 limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2803,7 +2803,7 @@ CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::lookup_name  (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2814,7 +2814,7 @@ search_name,
     levels_to_search,
     limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2823,7 +2823,7 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentDef_tie<T>::describe_contents
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2833,7 +2833,7 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentDef_tie<T>::describe_contents
 limit_type,
     exclude_inherited,
     max_returned_objs
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2842,7 +2842,7 @@ CORBA_ModuleDef_ptr POA_IR::ComponentDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2852,7 +2852,7 @@ CORBA_ModuleDef_ptr POA_IR::ComponentDef_tie<T>::create_module  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2863,7 +2863,7 @@ CORBA_ConstantDef_ptr POA_IR::ComponentDef_tie<T>::create_constant  (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2875,7 +2875,7 @@ id,
     version,
     type,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2885,7 +2885,7 @@ CORBA_StructDef_ptr POA_IR::ComponentDef_tie<T>::create_struct  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2896,7 +2896,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2907,7 +2907,7 @@ CORBA_UnionDef_ptr POA_IR::ComponentDef_tie<T>::create_union  (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2919,7 +2919,7 @@ id,
     version,
     discriminator_type,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2929,7 +2929,7 @@ CORBA_EnumDef_ptr POA_IR::ComponentDef_tie<T>::create_enum  (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2940,7 +2940,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2950,7 +2950,7 @@ CORBA_AliasDef_ptr POA_IR::ComponentDef_tie<T>::create_alias  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2961,7 +2961,7 @@ id,
     name,
     version,
     original_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2971,7 +2971,7 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2982,7 +2982,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -2998,7 +2998,7 @@ CORBA_ValueDef_ptr POA_IR::ComponentDef_tie<T>::create_value  (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3015,7 +3015,7 @@ id,
     abstract_base_values,
     supported_interfaces,
     initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3025,7 +3025,7 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentDef_tie<T>::create_value_box  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3036,7 +3036,7 @@ id,
     name,
     version,
     original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3046,7 +3046,7 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentDef_tie<T>::create_exception  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3057,7 +3057,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3066,7 +3066,7 @@ CORBA_NativeDef_ptr POA_IR::ComponentDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3076,7 +3076,7 @@ CORBA_NativeDef_ptr POA_IR::ComponentDef_tie<T>::create_native  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3086,7 +3086,7 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_abstract_inte
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3097,7 +3097,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -3107,7 +3107,7 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_local_interface
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3118,27 +3118,27 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ComponentDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3146,27 +3146,27 @@ void POA_IR::ComponentDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ComponentDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3174,27 +3174,27 @@ void POA_IR::ComponentDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ComponentDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3202,59 +3202,59 @@ void POA_IR::ComponentDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::ComponentDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ComponentDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::ComponentDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::ComponentDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3263,7 +3263,7 @@ void POA_IR::ComponentDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3273,46 +3273,46 @@ void POA_IR::ComponentDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::ComponentDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::ComponentDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3385,18 +3385,18 @@ POA_IR::PrimaryKeyDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::PrimaryKeyDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::PrimaryKeyDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->PrimaryKeyDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->PrimaryKeyDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::PrimaryKeyDef_tie<T>::is_a  (
     const char * primary_key_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3404,40 +3404,40 @@ CORBA::Boolean POA_IR::PrimaryKeyDef_tie<T>::is_a  (
 {
   return this->ptr_->is_a (
 primary_key_id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::PrimaryKeyDef_tie<T>::primary_key  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->primary_key (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PrimaryKeyDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3445,27 +3445,27 @@ void POA_IR::PrimaryKeyDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PrimaryKeyDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3473,27 +3473,27 @@ void POA_IR::PrimaryKeyDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PrimaryKeyDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3501,59 +3501,59 @@ void POA_IR::PrimaryKeyDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::PrimaryKeyDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PrimaryKeyDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::PrimaryKeyDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::PrimaryKeyDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3562,7 +3562,7 @@ void POA_IR::PrimaryKeyDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3572,33 +3572,33 @@ void POA_IR::PrimaryKeyDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::PrimaryKeyDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3671,44 +3671,44 @@ POA_IR::FactoryDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::FactoryDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::FactoryDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->FactoryDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->FactoryDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::FactoryDef_tie<T>::result  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_IR::FactoryDef_tie<T>::result_def  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::result_def  (
     CORBA_IDLType_ptr result_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3716,27 +3716,27 @@ void POA_IR::FactoryDef_tie<T>::result_def  (
 {
   this->ptr_->result_def (
 result_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ParDescriptionSeq * POA_IR::FactoryDef_tie<T>::params  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::params  (
     const CORBA_ParDescriptionSeq & params
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3744,27 +3744,27 @@ void POA_IR::FactoryDef_tie<T>::params  (
 {
   this->ptr_->params (
 params
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::OperationMode POA_IR::FactoryDef_tie<T>::mode  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::mode  (
     CORBA::OperationMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3772,27 +3772,27 @@ void POA_IR::FactoryDef_tie<T>::mode  (
 {
   this->ptr_->mode (
 mode
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContextIdSeq * POA_IR::FactoryDef_tie<T>::contexts  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::contexts  (
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3800,27 +3800,27 @@ void POA_IR::FactoryDef_tie<T>::contexts  (
 {
   this->ptr_->contexts (
 contexts
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ExceptionDefSeq * POA_IR::FactoryDef_tie<T>::exceptions  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::exceptions  (
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3828,27 +3828,27 @@ void POA_IR::FactoryDef_tie<T>::exceptions  (
 {
   this->ptr_->exceptions (
 exceptions
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FactoryDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3856,27 +3856,27 @@ void POA_IR::FactoryDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FactoryDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3884,27 +3884,27 @@ void POA_IR::FactoryDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FactoryDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3912,59 +3912,59 @@ void POA_IR::FactoryDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::FactoryDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FactoryDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::FactoryDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::FactoryDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3973,7 +3973,7 @@ void POA_IR::FactoryDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3983,33 +3983,33 @@ void POA_IR::FactoryDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::FactoryDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4082,44 +4082,44 @@ POA_IR::FinderDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::FinderDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::FinderDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->FinderDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->FinderDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::FinderDef_tie<T>::result  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_IR::FinderDef_tie<T>::result_def  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::result_def  (
     CORBA_IDLType_ptr result_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4127,27 +4127,27 @@ void POA_IR::FinderDef_tie<T>::result_def  (
 {
   this->ptr_->result_def (
 result_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ParDescriptionSeq * POA_IR::FinderDef_tie<T>::params  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::params  (
     const CORBA_ParDescriptionSeq & params
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4155,27 +4155,27 @@ void POA_IR::FinderDef_tie<T>::params  (
 {
   this->ptr_->params (
 params
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::OperationMode POA_IR::FinderDef_tie<T>::mode  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::mode  (
     CORBA::OperationMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4183,27 +4183,27 @@ void POA_IR::FinderDef_tie<T>::mode  (
 {
   this->ptr_->mode (
 mode
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContextIdSeq * POA_IR::FinderDef_tie<T>::contexts  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::contexts  (
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4211,27 +4211,27 @@ void POA_IR::FinderDef_tie<T>::contexts  (
 {
   this->ptr_->contexts (
 contexts
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ExceptionDefSeq * POA_IR::FinderDef_tie<T>::exceptions  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::exceptions  (
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4239,27 +4239,27 @@ void POA_IR::FinderDef_tie<T>::exceptions  (
 {
   this->ptr_->exceptions (
 exceptions
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FinderDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4267,27 +4267,27 @@ void POA_IR::FinderDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FinderDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4295,27 +4295,27 @@ void POA_IR::FinderDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FinderDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4323,59 +4323,59 @@ void POA_IR::FinderDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::FinderDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FinderDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::FinderDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::FinderDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4384,7 +4384,7 @@ void POA_IR::FinderDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4394,33 +4394,33 @@ void POA_IR::FinderDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::FinderDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4493,89 +4493,89 @@ POA_IR::HomeDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::HomeDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_IR::HomeDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->HomeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->HomeDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 IR::HomeDef_ptr POA_IR::HomeDef_tie<T>::base_home  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_home (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::ComponentDef_ptr POA_IR::HomeDef_tie<T>::managed_component  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->managed_component (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::PrimaryKeyDef_ptr POA_IR::HomeDef_tie<T>::primary_key  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->primary_key (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::FactoryDefSeq * POA_IR::HomeDef_tie<T>::factories  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->factories (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::FinderDefSeq * POA_IR::HomeDef_tie<T>::finders  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->finders (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::HomeDef_tie<T>::is_basic  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_basic (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4585,7 +4585,7 @@ IR::PrimaryKeyDef_ptr POA_IR::HomeDef_tie<T>::create_primary_key  (
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4596,7 +4596,7 @@ id,
     name,
     version,
     primary_key
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4607,7 +4607,7 @@ IR::FactoryDef_ptr POA_IR::HomeDef_tie<T>::create_factory  (
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4619,7 +4619,7 @@ id,
     version,
     params,
     exceptions
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4630,7 +4630,7 @@ IR::FinderDef_ptr POA_IR::HomeDef_tie<T>::create_finder  (
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4642,27 +4642,27 @@ id,
     version,
     params,
     exceptions
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_IR::HomeDef_tie<T>::base_interfaces  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::base_interfaces  (
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4670,14 +4670,14 @@ void POA_IR::HomeDef_tie<T>::base_interfaces  (
 {
   this->ptr_->base_interfaces (
 base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::HomeDef_tie<T>::is_a  (
     const char * interface_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4685,20 +4685,20 @@ CORBA::Boolean POA_IR::HomeDef_tie<T>::is_a  (
 {
   return this->ptr_->is_a (
 interface_id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_IR::HomeDef_tie<T>::describe_interface  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4709,7 +4709,7 @@ CORBA_AttributeDef_ptr POA_IR::HomeDef_tie<T>::create_attribute  (
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4721,7 +4721,7 @@ id,
     version,
     type,
     mode
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4735,7 +4735,7 @@ CORBA_OperationDef_ptr POA_IR::HomeDef_tie<T>::create_operation  (
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4750,14 +4750,14 @@ id,
     params,
     exceptions,
     contexts
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_IR::HomeDef_tie<T>::lookup  (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4765,7 +4765,7 @@ CORBA_Contained_ptr POA_IR::HomeDef_tie<T>::lookup  (
 {
   return this->ptr_->lookup (
 search_name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4773,7 +4773,7 @@ template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4782,7 +4782,7 @@ CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::contents  (
   return this->ptr_->contents (
 limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4792,7 +4792,7 @@ CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::lookup_name  (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4803,7 +4803,7 @@ search_name,
     levels_to_search,
     limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4812,7 +4812,7 @@ CORBA_Container::DescriptionSeq * POA_IR::HomeDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4822,7 +4822,7 @@ CORBA_Container::DescriptionSeq * POA_IR::HomeDef_tie<T>::describe_contents  (
 limit_type,
     exclude_inherited,
     max_returned_objs
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4831,7 +4831,7 @@ CORBA_ModuleDef_ptr POA_IR::HomeDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4841,7 +4841,7 @@ CORBA_ModuleDef_ptr POA_IR::HomeDef_tie<T>::create_module  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4852,7 +4852,7 @@ CORBA_ConstantDef_ptr POA_IR::HomeDef_tie<T>::create_constant  (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4864,7 +4864,7 @@ id,
     version,
     type,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4874,7 +4874,7 @@ CORBA_StructDef_ptr POA_IR::HomeDef_tie<T>::create_struct  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4885,7 +4885,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4896,7 +4896,7 @@ CORBA_UnionDef_ptr POA_IR::HomeDef_tie<T>::create_union  (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4908,7 +4908,7 @@ id,
     version,
     discriminator_type,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4918,7 +4918,7 @@ CORBA_EnumDef_ptr POA_IR::HomeDef_tie<T>::create_enum  (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4929,7 +4929,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4939,7 +4939,7 @@ CORBA_AliasDef_ptr POA_IR::HomeDef_tie<T>::create_alias  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4950,7 +4950,7 @@ id,
     name,
     version,
     original_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4960,7 +4960,7 @@ CORBA_InterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4971,7 +4971,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -4987,7 +4987,7 @@ CORBA_ValueDef_ptr POA_IR::HomeDef_tie<T>::create_value  (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5004,7 +5004,7 @@ id,
     abstract_base_values,
     supported_interfaces,
     initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5014,7 +5014,7 @@ CORBA_ValueBoxDef_ptr POA_IR::HomeDef_tie<T>::create_value_box  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5025,7 +5025,7 @@ id,
     name,
     version,
     original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5035,7 +5035,7 @@ CORBA_ExceptionDef_ptr POA_IR::HomeDef_tie<T>::create_exception  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5046,7 +5046,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5055,7 +5055,7 @@ CORBA_NativeDef_ptr POA_IR::HomeDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5065,7 +5065,7 @@ CORBA_NativeDef_ptr POA_IR::HomeDef_tie<T>::create_native  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5075,7 +5075,7 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_abstract_interface
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5086,7 +5086,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -5096,7 +5096,7 @@ CORBA_LocalInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_local_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5107,27 +5107,27 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::HomeDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5135,27 +5135,27 @@ void POA_IR::HomeDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::HomeDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5163,27 +5163,27 @@ void POA_IR::HomeDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::HomeDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5191,59 +5191,59 @@ void POA_IR::HomeDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::HomeDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::HomeDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::HomeDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::HomeDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5252,7 +5252,7 @@ void POA_IR::HomeDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5262,46 +5262,46 @@ void POA_IR::HomeDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::HomeDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::HomeDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
index 60601af3a69..66afb133074 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
@@ -186,31 +186,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::UShort result);
@@ -228,44 +228,44 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::TAO_ServerRequestInfo_CORBA_Fix
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_FixedDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -277,7 +277,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (TAO_ENV_SINGLE_ARG_DECL
 
 char *
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -287,10 +287,10 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -308,31 +308,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl
     ,
     const CORBA::UShort & digits
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -351,7 +351,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_Fix
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_FixedDef *tao_impl,
     const CORBA::UShort & digits
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -359,12 +359,12 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_Fix
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -380,25 +380,25 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (TAO_ENV_SINGLE_ARG_D
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -406,7 +406,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (TAO_ENV_SINGLE_ARG_DECL
 
 char *
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -416,10 +416,10 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_FixedDef_scale_get : public TAO_ServerRequestInfo
@@ -429,31 +429,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Short result);
@@ -471,44 +471,44 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::TAO_ServerRequestInfo_CORBA_Fixe
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_FixedDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -520,7 +520,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -530,10 +530,10 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -551,31 +551,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl
     ,
     const CORBA::Short & scale
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -594,7 +594,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_Fixe
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_FixedDef *tao_impl,
     const CORBA::Short & scale
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -602,12 +602,12 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_Fixe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -623,25 +623,25 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (TAO_ENV_SINGLE_ARG_DE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -649,7 +649,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -659,10 +659,10 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -695,17 +695,17 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::~_TAO_CORBA_FixedDef_Strategized_P
 _TAO_CORBA_FixedDef_Proxy_Impl&
 _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_FixedDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -715,7 +715,7 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -785,7 +785,7 @@ _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::_TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl (
 
 CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -801,7 +801,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
       _collocated_tao_target_->_object_key (),
       "digits",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -810,14 +810,14 @@ CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
           "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->digits (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
     CORBA_Object *_collocated_tao_target_,
     CORBA::UShort digits
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -831,7 +831,7 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
       _collocated_tao_target_->_object_key (),
       "digits",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -841,14 +841,14 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
         )
     )->digits (
         digits
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -864,7 +864,7 @@ CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
       _collocated_tao_target_->_object_key (),
       "scale",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -873,14 +873,14 @@ CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
           "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->scale (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Short scale
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -894,7 +894,7 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
       _collocated_tao_target_->_object_key (),
       "scale",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -904,7 +904,7 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
         )
     )->scale (
         scale
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -935,7 +935,7 @@ void POA_CORBA_FixedDef::_get_digits_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_FixedDef *_tao_impl =
@@ -956,18 +956,18 @@ void POA_CORBA_FixedDef::_get_digits_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->digits (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -975,7 +975,7 @@ void POA_CORBA_FixedDef::_get_digits_skel (
       CORBA::UShort _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -983,12 +983,12 @@ void POA_CORBA_FixedDef::_get_digits_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1016,7 +1016,7 @@ void POA_CORBA_FixedDef::_set_digits_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1045,25 +1045,25 @@ void POA_CORBA_FixedDef::_set_digits_skel (
       _tao_upcall,
       _tao_impl,
       digits
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->digits (
           digits
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1071,12 +1071,12 @@ void POA_CORBA_FixedDef::_set_digits_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1097,7 +1097,7 @@ void POA_CORBA_FixedDef::_get_scale_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_FixedDef *_tao_impl =
@@ -1118,18 +1118,18 @@ void POA_CORBA_FixedDef::_get_scale_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->scale (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1137,7 +1137,7 @@ void POA_CORBA_FixedDef::_get_scale_skel (
       CORBA::Short _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1145,12 +1145,12 @@ void POA_CORBA_FixedDef::_get_scale_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1178,7 +1178,7 @@ void POA_CORBA_FixedDef::_set_scale_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1207,25 +1207,25 @@ void POA_CORBA_FixedDef::_set_scale_skel (
       _tao_upcall,
       _tao_impl,
       scale
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->scale (
           scale
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1233,12 +1233,12 @@ void POA_CORBA_FixedDef::_set_scale_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1259,7 +1259,7 @@ void POA_CORBA_FixedDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1269,7 +1269,7 @@ void POA_CORBA_FixedDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1282,11 +1282,11 @@ void POA_CORBA_FixedDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1299,7 +1299,7 @@ void POA_CORBA_FixedDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference;
@@ -1318,7 +1318,7 @@ void POA_CORBA_FixedDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -1345,10 +1345,10 @@ void POA_CORBA_FixedDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_FixedDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -1376,12 +1376,12 @@ void* POA_CORBA_FixedDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_FixedDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_FixedDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -1391,9 +1391,9 @@ const char* POA_CORBA_FixedDef::_interface_repository_id (void) const
 }
 
 CORBA_FixedDef*
-POA_CORBA_FixedDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -1564,31 +1564,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -1606,44 +1606,44 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ServerRequestInfo_CORBA
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueMemberDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1655,7 +1655,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1665,10 +1665,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1685,31 +1685,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -1727,44 +1727,44 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ServerRequestInfo_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueMemberDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1776,7 +1776,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (TAO_ENV_SINGLE_
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1786,10 +1786,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_most_derived_int
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1807,31 +1807,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
     ,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1850,7 +1850,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_C
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueMemberDef *tao_impl,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1858,12 +1858,12 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1879,25 +1879,25 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (TAO_ENV_SING
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1905,7 +1905,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (TAO_ENV_SINGLE_
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1915,10 +1915,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_most_derived_int
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get : public TAO_ServerRequestInfo
@@ -1928,31 +1928,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Visibility result);
@@ -1970,44 +1970,44 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueMemberDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2019,7 +2019,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2029,10 +2029,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2050,31 +2050,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
     ,
     const CORBA::Visibility & access
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -2093,7 +2093,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_COR
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueMemberDef *tao_impl,
     const CORBA::Visibility & access
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2101,12 +2101,12 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2122,25 +2122,25 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2148,7 +2148,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2158,10 +2158,10 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -2194,17 +2194,17 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueMemberDef_S
 _TAO_CORBA_ValueMemberDef_Proxy_Impl&
 _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_ValueMemberDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -2214,7 +2214,7 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -2284,7 +2284,7 @@ _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueMemberDef_ThruPOA_
 
 CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2300,7 +2300,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type (
       _collocated_tao_target_->_object_key (),
       "type",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2309,13 +2309,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2331,7 +2331,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
       _collocated_tao_target_->_object_key (),
       "type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2340,14 +2340,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type_def (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2361,7 +2361,7 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
       _collocated_tao_target_->_object_key (),
       "type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2371,14 +2371,14 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
         )
     )->type_def (
         type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2394,7 +2394,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
       _collocated_tao_target_->_object_key (),
       "access",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -2403,14 +2403,14 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->access (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Visibility access
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2424,7 +2424,7 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
       _collocated_tao_target_->_object_key (),
       "access",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2434,7 +2434,7 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
         )
     )->access (
         access
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2465,7 +2465,7 @@ void POA_CORBA_ValueMemberDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl =
@@ -2486,18 +2486,18 @@ void POA_CORBA_ValueMemberDef::_get_type_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2506,7 +2506,7 @@ void POA_CORBA_ValueMemberDef::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2514,12 +2514,12 @@ void POA_CORBA_ValueMemberDef::_get_type_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2547,7 +2547,7 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl =
@@ -2568,18 +2568,18 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type_def (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2588,7 +2588,7 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2596,12 +2596,12 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2629,7 +2629,7 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2658,25 +2658,25 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel (
       _tao_upcall,
       _tao_impl,
       type_def.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->type_def (
           type_def.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2684,12 +2684,12 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2710,7 +2710,7 @@ void POA_CORBA_ValueMemberDef::_get_access_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl =
@@ -2731,18 +2731,18 @@ void POA_CORBA_ValueMemberDef::_get_access_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->access (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2750,7 +2750,7 @@ void POA_CORBA_ValueMemberDef::_get_access_skel (
       CORBA::Visibility _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2758,12 +2758,12 @@ void POA_CORBA_ValueMemberDef::_get_access_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2791,7 +2791,7 @@ void POA_CORBA_ValueMemberDef::_set_access_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2820,25 +2820,25 @@ void POA_CORBA_ValueMemberDef::_set_access_skel (
       _tao_upcall,
       _tao_impl,
       access
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->access (
           access
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2846,12 +2846,12 @@ void POA_CORBA_ValueMemberDef::_set_access_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2872,7 +2872,7 @@ void POA_CORBA_ValueMemberDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2882,7 +2882,7 @@ void POA_CORBA_ValueMemberDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2895,11 +2895,11 @@ void POA_CORBA_ValueMemberDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2912,7 +2912,7 @@ void POA_CORBA_ValueMemberDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference;
@@ -2931,7 +2931,7 @@ void POA_CORBA_ValueMemberDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -2958,10 +2958,10 @@ void POA_CORBA_ValueMemberDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_ValueMemberDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -2989,12 +2989,12 @@ void* POA_CORBA_ValueMemberDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -3004,9 +3004,9 @@ const char* POA_CORBA_ValueMemberDef::_interface_repository_id (void) const
 }
 
 CORBA_ValueMemberDef*
-POA_CORBA_ValueMemberDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -3213,31 +3213,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDefSeq * result);
@@ -3255,44 +3255,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ServerRequest
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3304,7 +3304,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (TAO_ENV_S
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3314,10 +3314,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_most_deriv
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3335,31 +3335,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3378,7 +3378,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequest
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3386,12 +3386,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3407,25 +3407,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (TAO_EN
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3433,7 +3433,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (TAO_ENV_S
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3443,10 +3443,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_most_deriv
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get : public TAO_ServerRequestInfo
@@ -3456,31 +3456,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InitializerSeq * result);
@@ -3498,44 +3498,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3547,7 +3547,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3557,10 +3557,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3578,31 +3578,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3621,7 +3621,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_COR
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3629,12 +3629,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3650,25 +3650,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3676,7 +3676,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3686,10 +3686,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get : public TAO_ServerRequestInfo
@@ -3699,31 +3699,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef_ptr result);
@@ -3741,44 +3741,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::TAO_ServerRequestInfo_CORBA
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3790,7 +3790,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3800,10 +3800,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3821,31 +3821,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
     CORBA_ValueDef_ptr base_value
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3864,7 +3864,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
     CORBA_ValueDef_ptr base_value
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3872,12 +3872,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3893,25 +3893,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3919,7 +3919,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3929,10 +3929,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get : public TAO_ServerRequestInfo
@@ -3942,31 +3942,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDefSeq * result);
@@ -3984,44 +3984,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ServerRequest
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4033,7 +4033,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (TAO_ENV_S
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4043,10 +4043,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_most_deriv
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4064,31 +4064,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
     const CORBA_ValueDefSeq & abstract_base_values
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -4107,7 +4107,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequest
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
     const CORBA_ValueDefSeq & abstract_base_values
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4115,12 +4115,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4136,25 +4136,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (TAO_EN
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4162,7 +4162,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (TAO_ENV_S
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4172,10 +4172,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_most_deriv
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get : public TAO_ServerRequestInfo
@@ -4185,31 +4185,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -4227,44 +4227,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4276,7 +4276,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (TAO_ENV_SINGLE_ARG
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4286,10 +4286,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_most_derived_interf
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4307,31 +4307,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
     const CORBA::Boolean & is_abstract
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -4350,7 +4350,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORB
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
     const CORBA::Boolean & is_abstract
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4358,12 +4358,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4379,25 +4379,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (TAO_ENV_SINGLE_
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4405,7 +4405,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (TAO_ENV_SINGLE_ARG
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4415,10 +4415,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_most_derived_interf
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get : public TAO_ServerRequestInfo
@@ -4428,31 +4428,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -4470,44 +4470,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ServerRequestInfo_CORBA_
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4519,7 +4519,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (TAO_ENV_SINGLE_ARG_D
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4529,10 +4529,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_most_derived_interfac
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4550,31 +4550,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
     const CORBA::Boolean & is_custom
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -4593,7 +4593,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
     const CORBA::Boolean & is_custom
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4601,12 +4601,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4622,25 +4622,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (TAO_ENV_SINGLE_AR
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4648,7 +4648,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (TAO_ENV_SINGLE_ARG_D
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4658,10 +4658,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_most_derived_interfac
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get : public TAO_ServerRequestInfo
@@ -4671,31 +4671,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -4713,44 +4713,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ServerRequestInfo_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4762,7 +4762,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (TAO_ENV_SINGLE_
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4772,10 +4772,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_most_derived_int
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4793,31 +4793,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
     const CORBA::Boolean & is_truncatable
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -4836,7 +4836,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_C
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
     const CORBA::Boolean & is_truncatable
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4844,12 +4844,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4865,25 +4865,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (TAO_ENV_SING
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4891,7 +4891,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (TAO_ENV_SINGLE_
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4901,10 +4901,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_most_derived_int
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_a : public TAO_ServerRequestInfo
@@ -4915,31 +4915,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
     const char * id
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -4959,7 +4959,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
     const char * id
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4967,12 +4967,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4988,25 +4988,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5018,7 +5018,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5028,10 +5028,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5048,31 +5048,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef::FullValueDescription * result);
@@ -5090,44 +5090,44 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::TAO_ServerRequestInfo_CORBA
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5139,7 +5139,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (TAO_ENV_SINGLE_ARG_
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5149,10 +5149,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_most_derived_interfa
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5174,31 +5174,31 @@ public:
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Visibility & access
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueMemberDef_ptr result);
@@ -5226,7 +5226,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Visibility & access
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5238,12 +5238,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5271,25 +5271,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (TAO_ENV_SIN
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5301,7 +5301,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (TAO_ENV_SINGLE
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5311,10 +5311,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_most_derived_in
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5336,31 +5336,31 @@ public:
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_AttributeDef_ptr result);
@@ -5388,7 +5388,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_COR
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5400,12 +5400,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5433,25 +5433,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5463,7 +5463,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5473,10 +5473,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5501,31 +5501,31 @@ public:
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_OperationDef_ptr result);
@@ -5559,7 +5559,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_COR
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5574,12 +5574,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5616,25 +5616,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5646,7 +5646,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (TAO_ENV_SINGLE_AR
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5656,10 +5656,10 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_most_derived_inter
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5699,17 +5699,17 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueDef_Strategized_P
 _TAO_CORBA_ValueDef_Proxy_Impl&
 _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_ValueDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -5719,7 +5719,7 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -5789,7 +5789,7 @@ _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl (
 
 CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5805,7 +5805,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interf
       _collocated_tao_target_->_object_key (),
       "supported_interfaces",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -5814,14 +5814,14 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interf
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->supported_interfaces (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5835,7 +5835,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
       _collocated_tao_target_->_object_key (),
       "supported_interfaces",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -5845,14 +5845,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
         )
     )->supported_interfaces (
         supported_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5868,7 +5868,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
       _collocated_tao_target_->_object_key (),
       "initializers",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -5877,14 +5877,14 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->initializers (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5898,7 +5898,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
       _collocated_tao_target_->_object_key (),
       "initializers",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -5908,14 +5908,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
         )
     )->initializers (
         initializers
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5931,7 +5931,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
       _collocated_tao_target_->_object_key (),
       "base_value",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -5940,14 +5940,14 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->base_value (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
     CORBA_Object *_collocated_tao_target_,
     CORBA_ValueDef_ptr base_value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5961,7 +5961,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
       _collocated_tao_target_->_object_key (),
       "base_value",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -5971,14 +5971,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
         )
     )->base_value (
         base_value
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5994,7 +5994,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values
       _collocated_tao_target_->_object_key (),
       "abstract_base_values",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6003,14 +6003,14 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->abstract_base_values (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_ValueDefSeq & abstract_base_values
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6024,7 +6024,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
       _collocated_tao_target_->_object_key (),
       "abstract_base_values",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6034,14 +6034,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
         )
     )->abstract_base_values (
         abstract_base_values
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6057,7 +6057,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
       _collocated_tao_target_->_object_key (),
       "is_abstract",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -6066,14 +6066,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_abstract (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Boolean is_abstract
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6087,7 +6087,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
       _collocated_tao_target_->_object_key (),
       "is_abstract",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6097,14 +6097,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
         )
     )->is_abstract (
         is_abstract
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6120,7 +6120,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
       _collocated_tao_target_->_object_key (),
       "is_custom",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -6129,14 +6129,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_custom (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Boolean is_custom
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6150,7 +6150,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
       _collocated_tao_target_->_object_key (),
       "is_custom",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6160,14 +6160,14 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
         )
     )->is_custom (
         is_custom
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6183,7 +6183,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
       _collocated_tao_target_->_object_key (),
       "is_truncatable",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -6192,14 +6192,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_truncatable (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Boolean is_truncatable
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6213,7 +6213,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
       _collocated_tao_target_->_object_key (),
       "is_truncatable",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6223,7 +6223,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
         )
     )->is_truncatable (
         is_truncatable
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -6231,7 +6231,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
 CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6247,7 +6247,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a (
       _collocated_tao_target_->_object_key (),
       "is_a",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -6257,13 +6257,13 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a (
         )
     )->is_a (
         id
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::describe_value (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6279,7 +6279,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::d
       _collocated_tao_target_->_object_key (),
       "describe_value",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6288,7 +6288,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::d
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->describe_value (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -6299,7 +6299,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::Visibility access
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6315,7 +6315,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me
       _collocated_tao_target_->_object_key (),
       "create_value_member",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6329,7 +6329,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me
         version,
         type,
         access
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -6340,7 +6340,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6356,7 +6356,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute
       _collocated_tao_target_->_object_key (),
       "create_attribute",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6370,7 +6370,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute
         version,
         type,
         mode
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -6384,7 +6384,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6400,7 +6400,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation
       _collocated_tao_target_->_object_key (),
       "create_operation",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6417,7 +6417,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation
         params,
         exceptions,
         contexts
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -6449,7 +6449,7 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -6470,18 +6470,18 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->supported_interfaces (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6490,7 +6490,7 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -6498,12 +6498,12 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6531,7 +6531,7 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -6560,25 +6560,25 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel (
       _tao_upcall,
       _tao_impl,
       supported_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->supported_interfaces (
           supported_interfaces
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -6586,12 +6586,12 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6612,7 +6612,7 @@ void POA_CORBA_ValueDef::_get_initializers_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -6633,18 +6633,18 @@ void POA_CORBA_ValueDef::_get_initializers_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->initializers (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6653,7 +6653,7 @@ void POA_CORBA_ValueDef::_get_initializers_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -6661,12 +6661,12 @@ void POA_CORBA_ValueDef::_get_initializers_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6694,7 +6694,7 @@ void POA_CORBA_ValueDef::_set_initializers_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -6723,25 +6723,25 @@ void POA_CORBA_ValueDef::_set_initializers_skel (
       _tao_upcall,
       _tao_impl,
       initializers
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->initializers (
           initializers
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -6749,12 +6749,12 @@ void POA_CORBA_ValueDef::_set_initializers_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6775,7 +6775,7 @@ void POA_CORBA_ValueDef::_get_base_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -6796,18 +6796,18 @@ void POA_CORBA_ValueDef::_get_base_value_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->base_value (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6816,7 +6816,7 @@ void POA_CORBA_ValueDef::_get_base_value_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -6824,12 +6824,12 @@ void POA_CORBA_ValueDef::_get_base_value_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6857,7 +6857,7 @@ void POA_CORBA_ValueDef::_set_base_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -6886,25 +6886,25 @@ void POA_CORBA_ValueDef::_set_base_value_skel (
       _tao_upcall,
       _tao_impl,
       base_value.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->base_value (
           base_value.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -6912,12 +6912,12 @@ void POA_CORBA_ValueDef::_set_base_value_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6938,7 +6938,7 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -6959,18 +6959,18 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->abstract_base_values (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6979,7 +6979,7 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -6987,12 +6987,12 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7020,7 +7020,7 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7049,25 +7049,25 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel (
       _tao_upcall,
       _tao_impl,
       abstract_base_values
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->abstract_base_values (
           abstract_base_values
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7075,12 +7075,12 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7101,7 +7101,7 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7122,18 +7122,18 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_abstract (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7141,7 +7141,7 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7149,12 +7149,12 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7182,7 +7182,7 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7211,25 +7211,25 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel (
       _tao_upcall,
       _tao_impl,
       is_abstract
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->is_abstract (
           is_abstract
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7237,12 +7237,12 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7263,7 +7263,7 @@ void POA_CORBA_ValueDef::_get_is_custom_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7284,18 +7284,18 @@ void POA_CORBA_ValueDef::_get_is_custom_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_custom (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7303,7 +7303,7 @@ void POA_CORBA_ValueDef::_get_is_custom_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7311,12 +7311,12 @@ void POA_CORBA_ValueDef::_get_is_custom_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7344,7 +7344,7 @@ void POA_CORBA_ValueDef::_set_is_custom_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7373,25 +7373,25 @@ void POA_CORBA_ValueDef::_set_is_custom_skel (
       _tao_upcall,
       _tao_impl,
       is_custom
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->is_custom (
           is_custom
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7399,12 +7399,12 @@ void POA_CORBA_ValueDef::_set_is_custom_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7425,7 +7425,7 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7446,18 +7446,18 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_truncatable (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7465,7 +7465,7 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7473,12 +7473,12 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7506,7 +7506,7 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7535,25 +7535,25 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel (
       _tao_upcall,
       _tao_impl,
       is_truncatable
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->is_truncatable (
           is_truncatable
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7561,12 +7561,12 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7587,7 +7587,7 @@ void POA_CORBA_ValueDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7616,19 +7616,19 @@ void POA_CORBA_ValueDef::is_a_skel (
       _tao_upcall,
       _tao_impl,
       id.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_a (
           id.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7636,7 +7636,7 @@ void POA_CORBA_ValueDef::is_a_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7644,12 +7644,12 @@ void POA_CORBA_ValueDef::is_a_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7677,7 +7677,7 @@ void POA_CORBA_ValueDef::describe_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7698,18 +7698,18 @@ void POA_CORBA_ValueDef::describe_value_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->describe_value (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7718,7 +7718,7 @@ void POA_CORBA_ValueDef::describe_value_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7726,12 +7726,12 @@ void POA_CORBA_ValueDef::describe_value_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7759,7 +7759,7 @@ void POA_CORBA_ValueDef::create_value_member_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7800,12 +7800,12 @@ void POA_CORBA_ValueDef::create_value_member_skel (
       version.in (),
       type.in (),
       access
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -7816,7 +7816,7 @@ void POA_CORBA_ValueDef::create_value_member_skel (
           version.in (),
           type.in (),
           access
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7825,7 +7825,7 @@ void POA_CORBA_ValueDef::create_value_member_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7833,12 +7833,12 @@ void POA_CORBA_ValueDef::create_value_member_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7866,7 +7866,7 @@ void POA_CORBA_ValueDef::create_attribute_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7907,12 +7907,12 @@ void POA_CORBA_ValueDef::create_attribute_skel (
       version.in (),
       type.in (),
       mode
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -7923,7 +7923,7 @@ void POA_CORBA_ValueDef::create_attribute_skel (
           version.in (),
           type.in (),
           mode
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7932,7 +7932,7 @@ void POA_CORBA_ValueDef::create_attribute_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -7940,12 +7940,12 @@ void POA_CORBA_ValueDef::create_attribute_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7973,7 +7973,7 @@ void POA_CORBA_ValueDef::create_operation_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8023,12 +8023,12 @@ void POA_CORBA_ValueDef::create_operation_skel (
       params,
       exceptions,
       contexts
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8042,7 +8042,7 @@ void POA_CORBA_ValueDef::create_operation_skel (
           params,
           exceptions,
           contexts
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8051,7 +8051,7 @@ void POA_CORBA_ValueDef::create_operation_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8059,12 +8059,12 @@ void POA_CORBA_ValueDef::create_operation_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8092,7 +8092,7 @@ void POA_CORBA_ValueDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8102,7 +8102,7 @@ void POA_CORBA_ValueDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8115,11 +8115,11 @@ void POA_CORBA_ValueDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8132,7 +8132,7 @@ void POA_CORBA_ValueDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference;
@@ -8151,7 +8151,7 @@ void POA_CORBA_ValueDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -8178,10 +8178,10 @@ void POA_CORBA_ValueDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_ValueDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -8215,12 +8215,12 @@ void* POA_CORBA_ValueDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ValueDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_ValueDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -8230,9 +8230,9 @@ const char* POA_CORBA_ValueDef::_interface_repository_id (void) const
 }
 
 CORBA_ValueDef*
-POA_CORBA_ValueDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -8401,31 +8401,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueBoxDef *tao_impl
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -8443,44 +8443,44 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ServerRequest
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueBoxDef *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -8492,7 +8492,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (TAO_ENV_S
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -8502,10 +8502,10 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_most_deriv
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -8523,31 +8523,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueBoxDef *tao_impl
     ,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -8566,7 +8566,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequest
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueBoxDef *tao_impl,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -8574,12 +8574,12 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -8595,25 +8595,25 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (TAO_EN
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -8621,7 +8621,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (TAO_ENV_S
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -8631,10 +8631,10 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_most_deriv
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8667,17 +8667,17 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueBoxDef_Strateg
 _TAO_CORBA_ValueBoxDef_Proxy_Impl&
 _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_ValueBoxDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -8687,7 +8687,7 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -8757,7 +8757,7 @@ _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_
 
 CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8773,7 +8773,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
       _collocated_tao_target_->_object_key (),
       "original_type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -8782,14 +8782,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
           "IDL:omg.org/CORBA/ValueBoxDef:1.0"
         )
     )->original_type_def (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8803,7 +8803,7 @@ void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
       _collocated_tao_target_->_object_key (),
       "original_type_def",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -8813,7 +8813,7 @@ void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
         )
     )->original_type_def (
         original_type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -8846,7 +8846,7 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueBoxDef *_tao_impl =
@@ -8867,18 +8867,18 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->original_type_def (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8887,7 +8887,7 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8895,12 +8895,12 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8928,7 +8928,7 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8957,25 +8957,25 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel (
       _tao_upcall,
       _tao_impl,
       original_type_def.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->original_type_def (
           original_type_def.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -8983,12 +8983,12 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9009,7 +9009,7 @@ void POA_CORBA_ValueBoxDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9019,7 +9019,7 @@ void POA_CORBA_ValueBoxDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9032,11 +9032,11 @@ void POA_CORBA_ValueBoxDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9049,7 +9049,7 @@ void POA_CORBA_ValueBoxDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference;
@@ -9068,7 +9068,7 @@ void POA_CORBA_ValueBoxDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9095,10 +9095,10 @@ void POA_CORBA_ValueBoxDef::_interface_skel (
 
 CORBA::Boolean POA_CORBA_ValueBoxDef::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9132,12 +9132,12 @@ void* POA_CORBA_ValueBoxDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -9147,9 +9147,9 @@ const char* POA_CORBA_ValueBoxDef::_interface_repository_id (void) const
 }
 
 CORBA_ValueBoxDef*
-POA_CORBA_ValueBoxDef::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
index 44ebf1426b3..722fd223576 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
@@ -65,7 +65,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -76,37 +76,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_FixedDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::UShort digits (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -116,12 +116,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void digits (
       CORBA::UShort digits
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -131,11 +131,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA::Short scale (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -145,12 +145,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void scale (
       CORBA::Short scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -160,28 +160,28 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -201,7 +201,7 @@ public:
 
   virtual ::_TAO_CORBA_FixedDef_Proxy_Impl &select_proxy (
     ::CORBA_FixedDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -210,7 +210,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -253,7 +253,7 @@ public:
 
   virtual CORBA::UShort digits (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -262,7 +262,7 @@ public:
   virtual void digits (
       CORBA_Object *_collocated_tao_target_,
       CORBA::UShort digits
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -270,7 +270,7 @@ public:
 
   virtual CORBA::Short scale (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -279,7 +279,7 @@ public:
   virtual void scale (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Short scale
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -311,7 +311,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -322,37 +322,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_ValueMemberDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -362,11 +362,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -376,12 +376,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void type_def (
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -391,11 +391,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA::Visibility access (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -405,12 +405,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void access (
       CORBA::Visibility access
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -420,98 +420,98 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -531,7 +531,7 @@ public:
 
   virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy (
     ::CORBA_ValueMemberDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -540,7 +540,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -583,7 +583,7 @@ public:
 
   virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -591,7 +591,7 @@ public:
 
   virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -600,7 +600,7 @@ public:
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -608,7 +608,7 @@ public:
 
   virtual CORBA::Visibility access (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -617,7 +617,7 @@ public:
   virtual void access (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Visibility access
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -649,7 +649,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -660,37 +660,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_ValueDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_InterfaceDefSeq * supported_interfaces (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -700,12 +700,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void supported_interfaces (
       const CORBA_InterfaceDefSeq & supported_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -715,11 +715,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_InitializerSeq * initializers (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -729,12 +729,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void initializers (
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -744,11 +744,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueDef_ptr base_value (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -758,12 +758,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void base_value (
       CORBA_ValueDef_ptr base_value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -773,11 +773,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueDefSeq * abstract_base_values (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -787,12 +787,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void abstract_base_values (
       const CORBA_ValueDefSeq & abstract_base_values
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -802,11 +802,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_abstract (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -816,12 +816,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void is_abstract (
       CORBA::Boolean is_abstract
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -831,11 +831,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_custom (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -845,12 +845,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void is_custom (
       CORBA::Boolean is_custom
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -860,11 +860,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_truncatable (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -874,12 +874,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void is_truncatable (
       CORBA::Boolean is_truncatable
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -889,12 +889,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -904,11 +904,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueDef::FullValueDescription * describe_value (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -918,7 +918,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueMemberDef_ptr create_value_member (
@@ -927,7 +927,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::Visibility access
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -937,7 +937,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_AttributeDef_ptr create_attribute (
@@ -946,7 +946,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -956,7 +956,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_OperationDef_ptr create_operation (
@@ -968,7 +968,7 @@ public:
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -978,224 +978,224 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void lookup_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void lookup_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_contents_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_module_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_constant_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_struct_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_union_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_enum_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_alias_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_value_box_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_exception_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_native_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_abstract_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void create_local_interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -1215,7 +1215,7 @@ public:
 
   virtual ::_TAO_CORBA_ValueDef_Proxy_Impl &select_proxy (
     ::CORBA_ValueDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1224,7 +1224,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1269,7 +1269,7 @@ public:
 
   virtual CORBA_InterfaceDefSeq * supported_interfaces (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1278,7 +1278,7 @@ public:
   virtual void supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_InterfaceDefSeq & supported_interfaces
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1286,7 +1286,7 @@ public:
 
   virtual CORBA_InitializerSeq * initializers (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1295,7 +1295,7 @@ public:
   virtual void initializers (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1303,7 +1303,7 @@ public:
 
   virtual CORBA_ValueDef_ptr base_value (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1312,7 +1312,7 @@ public:
   virtual void base_value (
       CORBA_Object *_collocated_tao_target_,
       CORBA_ValueDef_ptr base_value
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1320,7 +1320,7 @@ public:
 
   virtual CORBA_ValueDefSeq * abstract_base_values (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1329,7 +1329,7 @@ public:
   virtual void abstract_base_values (
       CORBA_Object *_collocated_tao_target_,
       const CORBA_ValueDefSeq & abstract_base_values
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1337,7 +1337,7 @@ public:
 
   virtual CORBA::Boolean is_abstract (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1346,7 +1346,7 @@ public:
   virtual void is_abstract (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Boolean is_abstract
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1354,7 +1354,7 @@ public:
 
   virtual CORBA::Boolean is_custom (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1363,7 +1363,7 @@ public:
   virtual void is_custom (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Boolean is_custom
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1371,7 +1371,7 @@ public:
 
   virtual CORBA::Boolean is_truncatable (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1380,7 +1380,7 @@ public:
   virtual void is_truncatable (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Boolean is_truncatable
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1389,7 +1389,7 @@ public:
   virtual CORBA::Boolean is_a (
       CORBA_Object *_collocated_tao_target_,
       const char * id
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1397,7 +1397,7 @@ public:
 
   virtual CORBA_ValueDef::FullValueDescription * describe_value (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1410,7 +1410,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::Visibility access
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1423,7 +1423,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1439,7 +1439,7 @@ public:
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1471,7 +1471,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -1482,37 +1482,37 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::CORBA_ValueBoxDef *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_IDLType_ptr original_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1522,12 +1522,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void original_type_def (
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1537,105 +1537,105 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void describe_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void move_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static void destroy_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -1655,7 +1655,7 @@ public:
 
   virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy (
     ::CORBA_ValueBoxDef *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1664,7 +1664,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -1707,7 +1707,7 @@ public:
 
   virtual CORBA_IDLType_ptr original_type_def (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -1716,7 +1716,7 @@ public:
   virtual void original_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i
index 103672775f1..7248973257f 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i
@@ -23,7 +23,7 @@ ACE_INLINE void POA_CORBA_FixedDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_FixedDef_ptr) obj;
@@ -31,14 +31,14 @@ ACE_INLINE void POA_CORBA_FixedDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_FixedDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_FixedDef_ptr) obj;
@@ -46,14 +46,14 @@ ACE_INLINE void POA_CORBA_FixedDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_FixedDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_FixedDef_ptr) obj;
@@ -61,14 +61,14 @@ ACE_INLINE void POA_CORBA_FixedDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
@@ -76,14 +76,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
@@ -91,14 +91,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
@@ -106,14 +106,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
@@ -121,14 +121,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
@@ -136,14 +136,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
@@ -151,14 +151,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
@@ -166,14 +166,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
@@ -181,14 +181,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
@@ -196,14 +196,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
@@ -211,14 +211,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
@@ -226,14 +226,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
@@ -241,14 +241,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
@@ -256,14 +256,14 @@ ACE_INLINE void POA_CORBA_ValueMemberDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -271,14 +271,14 @@ ACE_INLINE void POA_CORBA_ValueDef::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -286,14 +286,14 @@ ACE_INLINE void POA_CORBA_ValueDef::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -301,14 +301,14 @@ ACE_INLINE void POA_CORBA_ValueDef::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -316,14 +316,14 @@ ACE_INLINE void POA_CORBA_ValueDef::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -331,14 +331,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -346,14 +346,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -361,14 +361,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -376,14 +376,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -391,14 +391,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -406,14 +406,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -421,14 +421,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -436,14 +436,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -451,14 +451,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -466,14 +466,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -481,14 +481,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -496,14 +496,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -511,14 +511,14 @@ ACE_INLINE void POA_CORBA_ValueDef::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -526,14 +526,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -541,14 +541,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -556,14 +556,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -571,14 +571,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -586,14 +586,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -601,14 +601,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -616,14 +616,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -631,14 +631,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -646,14 +646,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -661,14 +661,14 @@ ACE_INLINE void POA_CORBA_ValueDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -676,14 +676,14 @@ ACE_INLINE void POA_CORBA_ValueDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -691,14 +691,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -706,14 +706,14 @@ ACE_INLINE void POA_CORBA_ValueDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
@@ -721,14 +721,14 @@ ACE_INLINE void POA_CORBA_ValueDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -736,14 +736,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -751,14 +751,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -766,14 +766,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -781,14 +781,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -796,14 +796,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -811,14 +811,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -826,14 +826,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -841,14 +841,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -856,14 +856,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -871,14 +871,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -886,14 +886,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -901,14 +901,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -916,14 +916,14 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
@@ -931,6 +931,6 @@ ACE_INLINE void POA_CORBA_ValueBoxDef::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
index 9d4328f4b01..0fd833515c9 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
@@ -67,10 +67,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::UShort digits (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -78,14 +78,14 @@ public:
 
     void digits (
       CORBA::UShort digits
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::Short scale (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -93,28 +93,28 @@ public:
 
     void scale (
       CORBA::Short scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -160,17 +160,17 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_IDLType_ptr type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -178,14 +178,14 @@ public:
 
     void type_def (
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::Visibility access (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -193,14 +193,14 @@ public:
 
     void access (
       CORBA::Visibility access
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -208,14 +208,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -223,14 +223,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -238,35 +238,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -276,21 +276,21 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -336,10 +336,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_InterfaceDefSeq * supported_interfaces (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -347,14 +347,14 @@ public:
 
     void supported_interfaces (
       const CORBA_InterfaceDefSeq & supported_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_InitializerSeq * initializers (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -362,14 +362,14 @@ public:
 
     void initializers (
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_ValueDef_ptr base_value (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -377,14 +377,14 @@ public:
 
     void base_value (
       CORBA_ValueDef_ptr base_value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_ValueDefSeq * abstract_base_values (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -392,14 +392,14 @@ public:
 
     void abstract_base_values (
       const CORBA_ValueDefSeq & abstract_base_values
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::Boolean is_abstract (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -407,14 +407,14 @@ public:
 
     void is_abstract (
       CORBA::Boolean is_abstract
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::Boolean is_custom (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -422,14 +422,14 @@ public:
 
     void is_custom (
       CORBA::Boolean is_custom
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::Boolean is_truncatable (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -437,7 +437,7 @@ public:
 
     void is_truncatable (
       CORBA::Boolean is_truncatable
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -445,14 +445,14 @@ public:
 
     CORBA::Boolean is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_ValueDef::FullValueDescription * describe_value (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -464,7 +464,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::Visibility access
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -476,7 +476,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -491,7 +491,7 @@ public:
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -499,7 +499,7 @@ public:
 
     CORBA_Contained_ptr lookup (
       const char * search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -508,7 +508,7 @@ public:
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -519,7 +519,7 @@ public:
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -529,7 +529,7 @@ public:
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -539,7 +539,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -551,7 +551,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -562,7 +562,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -574,7 +574,7 @@ public:
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -585,7 +585,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -596,7 +596,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -607,7 +607,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -624,7 +624,7 @@ public:
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -635,7 +635,7 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -646,7 +646,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -656,7 +656,7 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -667,7 +667,7 @@ public:
       const char * name,
       const char * version,
       const CORBA_AbstractInterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -678,14 +678,14 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -693,14 +693,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -708,14 +708,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -723,35 +723,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -761,28 +761,28 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -828,10 +828,10 @@ public:
 
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_IDLType_ptr original_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -839,14 +839,14 @@ public:
 
     void original_type_def (
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -854,14 +854,14 @@ public:
 
     void id (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -869,14 +869,14 @@ public:
 
     void name (
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * version (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -884,35 +884,35 @@ public:
 
     void version (
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Container_ptr defined_in (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     char * absolute_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Repository_ptr containing_repository (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA_Contained::Description * describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -922,28 +922,28 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
     void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
index 29831f87b03..362bd1e0da5 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
@@ -90,31 +90,31 @@ POA_CORBA_FixedDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_FixedDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_FixedDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_FixedDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_FixedDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::UShort POA_CORBA_FixedDef_tie<T>::digits  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->digits (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_FixedDef_tie<T>::digits  (
     CORBA::UShort digits
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -122,27 +122,27 @@ void POA_CORBA_FixedDef_tie<T>::digits  (
 {
   this->ptr_->digits (
 digits
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Short POA_CORBA_FixedDef_tie<T>::scale  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->scale (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_FixedDef_tie<T>::scale  (
     CORBA::Short scale
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -150,46 +150,46 @@ void POA_CORBA_FixedDef_tie<T>::scale  (
 {
   this->ptr_->scale (
 scale
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_FixedDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_FixedDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_FixedDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -262,44 +262,44 @@ POA_CORBA_ValueMemberDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ValueMemberDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ValueMemberDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ValueMemberDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_ValueMemberDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ValueMemberDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_ValueMemberDef_tie<T>::type_def  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::type_def  (
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -307,27 +307,27 @@ void POA_CORBA_ValueMemberDef_tie<T>::type_def  (
 {
   this->ptr_->type_def (
 type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Visibility POA_CORBA_ValueMemberDef_tie<T>::access  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->access (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::access  (
     CORBA::Visibility access
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -335,27 +335,27 @@ void POA_CORBA_ValueMemberDef_tie<T>::access  (
 {
   this->ptr_->access (
 access
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueMemberDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -363,27 +363,27 @@ void POA_CORBA_ValueMemberDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueMemberDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -391,27 +391,27 @@ void POA_CORBA_ValueMemberDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueMemberDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -419,59 +419,59 @@ void POA_CORBA_ValueMemberDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ValueMemberDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueMemberDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ValueMemberDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ValueMemberDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -480,7 +480,7 @@ void POA_CORBA_ValueMemberDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -490,33 +490,33 @@ void POA_CORBA_ValueMemberDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ValueMemberDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -589,31 +589,31 @@ POA_CORBA_ValueDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ValueDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ValueDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ValueDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_ValueDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_CORBA_ValueDef_tie<T>::supported_interfaces  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::supported_interfaces  (
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -621,27 +621,27 @@ void POA_CORBA_ValueDef_tie<T>::supported_interfaces  (
 {
   this->ptr_->supported_interfaces (
 supported_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InitializerSeq * POA_CORBA_ValueDef_tie<T>::initializers  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->initializers (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::initializers  (
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -649,27 +649,27 @@ void POA_CORBA_ValueDef_tie<T>::initializers  (
 {
   this->ptr_->initializers (
 initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_CORBA_ValueDef_tie<T>::base_value  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_value (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::base_value  (
     CORBA_ValueDef_ptr base_value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -677,27 +677,27 @@ void POA_CORBA_ValueDef_tie<T>::base_value  (
 {
   this->ptr_->base_value (
 base_value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDefSeq * POA_CORBA_ValueDef_tie<T>::abstract_base_values  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->abstract_base_values (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::abstract_base_values  (
     const CORBA_ValueDefSeq & abstract_base_values
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -705,27 +705,27 @@ void POA_CORBA_ValueDef_tie<T>::abstract_base_values  (
 {
   this->ptr_->abstract_base_values (
 abstract_base_values
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_abstract  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_abstract (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::is_abstract  (
     CORBA::Boolean is_abstract
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -733,27 +733,27 @@ void POA_CORBA_ValueDef_tie<T>::is_abstract  (
 {
   this->ptr_->is_abstract (
 is_abstract
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_custom  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_custom (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::is_custom  (
     CORBA::Boolean is_custom
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -761,27 +761,27 @@ void POA_CORBA_ValueDef_tie<T>::is_custom  (
 {
   this->ptr_->is_custom (
 is_custom
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_truncatable  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_truncatable (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::is_truncatable  (
     CORBA::Boolean is_truncatable
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -789,14 +789,14 @@ void POA_CORBA_ValueDef_tie<T>::is_truncatable  (
 {
   this->ptr_->is_truncatable (
 is_truncatable
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_a  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -804,20 +804,20 @@ CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_a  (
 {
   return this->ptr_->is_a (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef::FullValueDescription * POA_CORBA_ValueDef_tie<T>::describe_value  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_value (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -828,7 +828,7 @@ CORBA_ValueMemberDef_ptr POA_CORBA_ValueDef_tie<T>::create_value_member  (
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::Visibility access
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -840,7 +840,7 @@ id,
     version,
     type,
     access
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -851,7 +851,7 @@ CORBA_AttributeDef_ptr POA_CORBA_ValueDef_tie<T>::create_attribute  (
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -863,7 +863,7 @@ id,
     version,
     type,
     mode
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -877,7 +877,7 @@ CORBA_OperationDef_ptr POA_CORBA_ValueDef_tie<T>::create_operation  (
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -892,14 +892,14 @@ id,
     params,
     exceptions,
     contexts
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_ValueDef_tie<T>::lookup  (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -907,7 +907,7 @@ CORBA_Contained_ptr POA_CORBA_ValueDef_tie<T>::lookup  (
 {
   return this->ptr_->lookup (
 search_name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -915,7 +915,7 @@ template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -924,7 +924,7 @@ CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::contents  (
   return this->ptr_->contents (
 limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -934,7 +934,7 @@ CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::lookup_name  (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -945,7 +945,7 @@ search_name,
     levels_to_search,
     limit_type,
     exclude_inherited
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -954,7 +954,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ValueDef_tie<T>::describe_contents
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -964,7 +964,7 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ValueDef_tie<T>::describe_contents
 limit_type,
     exclude_inherited,
     max_returned_objs
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -973,7 +973,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ValueDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -983,7 +983,7 @@ CORBA_ModuleDef_ptr POA_CORBA_ValueDef_tie<T>::create_module  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -994,7 +994,7 @@ CORBA_ConstantDef_ptr POA_CORBA_ValueDef_tie<T>::create_constant  (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1006,7 +1006,7 @@ id,
     version,
     type,
     value
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1016,7 +1016,7 @@ CORBA_StructDef_ptr POA_CORBA_ValueDef_tie<T>::create_struct  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1027,7 +1027,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1038,7 +1038,7 @@ CORBA_UnionDef_ptr POA_CORBA_ValueDef_tie<T>::create_union  (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1050,7 +1050,7 @@ id,
     version,
     discriminator_type,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1060,7 +1060,7 @@ CORBA_EnumDef_ptr POA_CORBA_ValueDef_tie<T>::create_enum  (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1071,7 +1071,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1081,7 +1081,7 @@ CORBA_AliasDef_ptr POA_CORBA_ValueDef_tie<T>::create_alias  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1092,7 +1092,7 @@ id,
     name,
     version,
     original_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1102,7 +1102,7 @@ CORBA_InterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1113,7 +1113,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1129,7 +1129,7 @@ CORBA_ValueDef_ptr POA_CORBA_ValueDef_tie<T>::create_value  (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1146,7 +1146,7 @@ id,
     abstract_base_values,
     supported_interfaces,
     initializers
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1156,7 +1156,7 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ValueDef_tie<T>::create_value_box  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1167,7 +1167,7 @@ id,
     name,
     version,
     original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1177,7 +1177,7 @@ CORBA_ExceptionDef_ptr POA_CORBA_ValueDef_tie<T>::create_exception  (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1188,7 +1188,7 @@ id,
     name,
     version,
     members
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1197,7 +1197,7 @@ CORBA_NativeDef_ptr POA_CORBA_ValueDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1207,7 +1207,7 @@ CORBA_NativeDef_ptr POA_CORBA_ValueDef_tie<T>::create_native  (
 id,
     name,
     version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1217,7 +1217,7 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_abstract_interf
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1228,7 +1228,7 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -1238,7 +1238,7 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_local_interface  (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1249,27 +1249,27 @@ id,
     name,
     version,
     base_interfaces
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1277,27 +1277,27 @@ void POA_CORBA_ValueDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1305,27 +1305,27 @@ void POA_CORBA_ValueDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1333,59 +1333,59 @@ void POA_CORBA_ValueDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ValueDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ValueDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ValueDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1394,7 +1394,7 @@ void POA_CORBA_ValueDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1404,46 +1404,46 @@ void POA_CORBA_ValueDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ValueDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ValueDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1516,31 +1516,31 @@ POA_CORBA_ValueBoxDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ValueBoxDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ValueBoxDef_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ValueBoxDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_ValueBoxDef::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_ValueBoxDef_tie<T>::original_type_def  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->original_type_def (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::original_type_def  (
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1548,27 +1548,27 @@ void POA_CORBA_ValueBoxDef_tie<T>::original_type_def  (
 {
   this->ptr_->original_type_def (
 original_type_def
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueBoxDef_tie<T>::id  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::id  (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1576,27 +1576,27 @@ void POA_CORBA_ValueBoxDef_tie<T>::id  (
 {
   this->ptr_->id (
 id
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueBoxDef_tie<T>::name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::name  (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1604,27 +1604,27 @@ void POA_CORBA_ValueBoxDef_tie<T>::name  (
 {
   this->ptr_->name (
 name
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueBoxDef_tie<T>::version  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::version  (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1632,59 +1632,59 @@ void POA_CORBA_ValueBoxDef_tie<T>::version  (
 {
   this->ptr_->version (
 version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ValueBoxDef_tie<T>::defined_in  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueBoxDef_tie<T>::absolute_name  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ValueBoxDef_tie<T>::containing_repository  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ValueBoxDef_tie<T>::describe  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1693,7 +1693,7 @@ void POA_CORBA_ValueBoxDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1703,46 +1703,46 @@ void POA_CORBA_ValueBoxDef_tie<T>::move  (
 new_container,
     new_name,
     new_version
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ValueBoxDef_tie<T>::type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ValueBoxDef_tie<T>::def_kind  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-    TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index 51fbfd395fa..f9a463f4f71 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -12,10 +12,10 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "TAO Interface Repository\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int status = server.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int status = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == -1)
@@ -24,10 +24,10 @@ main (int argc, char *argv[])
         }
       else
         {
-          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          status = server.fini (TAO_ENV_SINGLE_ARG_PARAMETER);
+          status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (status == -1)
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index 045cad101bd..059b2abbd46 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -45,24 +45,24 @@ IFR_Service::~IFR_Service (void)
 int
 IFR_Service::init (int argc,
                    char *argv[]
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     0
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
         this->orb_->resolve_initial_references ("RootPOA"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->root_poa_ =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int retval = OPTIONS::instance()->parse_args (argc,
@@ -71,31 +71,31 @@ IFR_Service::init (int argc,
       if (retval != 0)
         return retval;
 
-      retval = this->create_poas (TAO_ENV_SINGLE_ARG_PARAMETER);
+      retval = this->create_poas (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
         return retval;
 
-      retval = this->open_config (TAO_ENV_SINGLE_ARG_PARAMETER);
+      retval = this->open_config (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
         return retval;
 
-      retval = this->create_repository (TAO_ENV_SINGLE_ARG_PARAMETER);
+      retval = this->create_repository (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
         return retval;
 
-      retval = this->create_locator (TAO_ENV_SINGLE_ARG_PARAMETER);
+      retval = this->create_locator (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
         return retval;
 
-      retval = this->init_multicast_server (TAO_ENV_SINGLE_ARG_PARAMETER);
+      retval = this->init_multicast_server (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
@@ -118,22 +118,22 @@ IFR_Service::init (int argc,
 }
 
 int
-IFR_Service::run (TAO_ENV_SINGLE_ARG_DECL)
+IFR_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->orb_->run (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->run (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-IFR_Service::fini (TAO_ENV_SINGLE_ARG_DECL)
+IFR_Service::fini (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       this->root_poa_->destroy (1,
                                 1
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -148,13 +148,13 @@ IFR_Service::fini (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL)
+IFR_Service::create_poas (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::PolicyList policies (4);
@@ -163,7 +163,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL)
   // So the Repository's POA can survive a crash.
   policies[0] =
     this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_TString repo_name = "repoPOA";
@@ -172,7 +172,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL)
     this->root_poa_->create_POA (repo_name.c_str (),
                                  poa_manager.in (),
                                  policies
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   policies.length (4);
@@ -181,7 +181,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL)
   policies[1] =
     this->root_poa_->create_id_assignment_policy (
                          PortableServer::USER_ID
-                         TAO_ENV_ARG_PARAMETER
+                         ACE_ENV_ARG_PARAMETER
                        );
   ACE_CHECK_RETURN (-1);
 
@@ -189,7 +189,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL)
   policies[2] =
     this->root_poa_->create_request_processing_policy (
                          PortableServer::USE_SERVANT_MANAGER
-                         TAO_ENV_ARG_PARAMETER
+                         ACE_ENV_ARG_PARAMETER
                        );
   ACE_CHECK_RETURN (-1);
 
@@ -197,7 +197,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL)
   policies[3] =
     this->root_poa_->create_servant_retention_policy (
                          PortableServer::NON_RETAIN
-                         TAO_ENV_ARG_PARAMETER
+                         ACE_ENV_ARG_PARAMETER
                        );
   ACE_CHECK_RETURN (-1);
 
@@ -207,7 +207,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL)
     this->root_poa_->create_POA (name.c_str (),
                                  poa_manager.in (),
                                  policies
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Destroy the policy objects as they have been passed to
@@ -217,7 +217,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -225,7 +225,7 @@ IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-IFR_Service::create_locator (TAO_ENV_SINGLE_ARG_DECL)
+IFR_Service::create_locator (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->servant_locator_impl_,
                     IFR_ServantLocator (this->repo_impl_),
@@ -233,14 +233,14 @@ IFR_Service::create_locator (TAO_ENV_SINGLE_ARG_DECL)
   ACE_CHECK_RETURN (-1);
 
   this->ir_object_poa_->set_servant_manager (this->servant_locator_impl_
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-IFR_Service::open_config (TAO_ENV_SINGLE_ARG_DECL)
+IFR_Service::open_config (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (OPTIONS::instance ()->using_registry ())
     {
@@ -294,7 +294,7 @@ IFR_Service::open_config (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL)
+IFR_Service::create_repository (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_ComponentRepository_i *impl = 0;
   ACE_NEW_THROW_EX (
@@ -329,10 +329,10 @@ IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL)
 
   PortableServer::ObjectId_var repo_oid =
     this->repo_poa_->activate_object (impl_tie
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->repository_ = impl_tie->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->repository_ = impl_tie->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
@@ -341,16 +341,16 @@ IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL)
   // Save and output the IOR string.
   this->ifr_ior_ =
     this->orb_->object_to_string (this->repository_
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var table_object =
-    this->orb_->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   IORTable::Table_var adapter =
-    IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
+    IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (CORBA::is_nil (adapter.in ()))
     {
@@ -360,7 +360,7 @@ IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL)
     {
       adapter->bind ("InterfaceRepository",
                      this->ifr_ior_.in ()
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -379,7 +379,7 @@ IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL)
 
 // Install ior multicast handler.
 int
-IFR_Service::init_multicast_server (TAO_ENV_SINGLE_ARG_DECL)
+IFR_Service::init_multicast_server (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get reactor instance from TAO.
   ACE_Reactor *reactor = this->orb_->orb_core ()->reactor ();
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h
index c73abc1c595..2df674784d1 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h
@@ -46,29 +46,29 @@ public:
 
   int init (int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the IFR service.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the IFR service.
 
-  int fini (TAO_ENV_SINGLE_ARG_DECL);
+  int fini (ACE_ENV_SINGLE_ARG_DECL);
   // Shut down the IFR service.
 
 protected:
-  int create_poas (TAO_ENV_SINGLE_ARG_DECL);
+  int create_poas (ACE_ENV_SINGLE_ARG_DECL);
   // Two persistent POAs, one using a servant locator.
 
-  int create_locator (TAO_ENV_SINGLE_ARG_DECL);
+  int create_locator (ACE_ENV_SINGLE_ARG_DECL);
   // Create a servant locator and register it with its POA.
 
-  int open_config (TAO_ENV_SINGLE_ARG_DECL);
+  int open_config (ACE_ENV_SINGLE_ARG_DECL);
   // Open an ACE_Configuration of the appropriate type.
 
-  int create_repository (TAO_ENV_SINGLE_ARG_DECL);
+  int create_repository (ACE_ENV_SINGLE_ARG_DECL);
   // Create and initialize the repository.
 
-  int init_multicast_server (TAO_ENV_SINGLE_ARG_DECL);
+  int init_multicast_server (ACE_ENV_SINGLE_ARG_DECL);
   // Enable the Interface Repository to answer multicast requests
   // for its IOR.
 
diff --git a/TAO/orbsvcs/IFR_Service/IRObject_i.h b/TAO/orbsvcs/IFR_Service/IRObject_i.h
index 315b1a508e6..45ade535476 100644
--- a/TAO/orbsvcs/IFR_Service/IRObject_i.h
+++ b/TAO/orbsvcs/IFR_Service/IRObject_i.h
@@ -53,19 +53,19 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual- the unlocked version called by destroy() wrapper.
diff --git a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp
index 0bab296d146..af7eceb62cc 100644
--- a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp
@@ -25,53 +25,53 @@ TAO_InterfaceDef_i::~TAO_InterfaceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_InterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_InterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Interface;
 }
 
 void
-TAO_InterfaceDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_InterfaceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // This will get rid of the repo ids, which Contained_i::destroy()'s
   // call to remove_section (recursive = 1) will not get, and also
   // destroy the attribute's anonymous type, if any.
-  this->destroy_special ("attrs" TAO_ENV_ARG_PARAMETER);
+  this->destroy_special ("attrs" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->destroy_special ("ops" TAO_ENV_ARG_PARAMETER);
+  this->destroy_special ("ops" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA_Contained::Description *
-TAO_InterfaceDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -82,15 +82,15 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_InterfaceDescription ifd;
 
-  ifd.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ifd.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  ifd.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ifd.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -101,11 +101,11 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 
   ifd.defined_in = container_id.c_str ();
 
-  ifd.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ifd.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong i = 0;
-  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = bases->length ();
@@ -122,7 +122,7 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
     {
       oid =
         this->repo_->ir_poa ()->reference_to_id (bases[i]
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       base_path =
@@ -136,7 +136,7 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
       TAO_InterfaceDef_i impl (this->repo_,
                                base_key);
 
-      repo_ids[i] = impl.id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      repo_ids[i] = impl.id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -148,16 +148,16 @@ TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_InterfaceDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_InterfaceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -174,20 +174,20 @@ TAO_InterfaceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
 
   return this->repo_->tc_factory ()->create_interface_tc (id.c_str (),
                                                           name.c_str ()
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDefSeq *
-TAO_InterfaceDef_i::base_interfaces (TAO_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::base_interfaces (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDefSeq *
-TAO_InterfaceDef_i::base_interfaces_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::base_interfaces_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -219,12 +219,12 @@ TAO_InterfaceDef_i::base_interfaces_i (TAO_ENV_SINGLE_ARG_DECL)
         this->repo_->servant_factory ()->create_objref (
                                              def_kind,
                                              path.c_str ()
-                                             TAO_ENV_ARG_PARAMETER
+                                             ACE_ENV_ARG_PARAMETER
                                            );
       ACE_CHECK_RETURN (0);
 
       retval[i] = CORBA_InterfaceDef::_narrow (obj.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -233,23 +233,23 @@ TAO_InterfaceDef_i::base_interfaces_i (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_InterfaceDef_i::base_interfaces (const CORBA_InterfaceDefSeq &base_interfaces
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->base_interfaces_i (base_interfaces
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfaces
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If we are an abstract interface, all our base interfaces must be
   // abstract as well.
-  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind def_kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (def_kind == CORBA::dk_AbstractInterface)
@@ -258,7 +258,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa
 
       for (CORBA::ULong i = 0; i < length; ++i)
         {
-          def_kind = base_interfaces[i]->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+          def_kind = base_interfaces[i]->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           if (def_kind != CORBA::dk_AbstractInterface)
@@ -291,7 +291,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa
     {
       oid =
         this->repo_->ir_poa ()->reference_to_id (base_interfaces[i]
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       inherited_path =
@@ -305,7 +305,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa
       TAO_InterfaceDef_i impl (this->repo_,
                                base_key);
 
-      name = impl.name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      name = impl.name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // None of these names can clash with any we may already have.
@@ -322,18 +322,18 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa
 
 CORBA::Boolean
 TAO_InterfaceDef_i::is_a (const char *interface_id
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   return this->is_a_i (interface_id
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_InterfaceDef_i::is_a_i (const char *interface_id
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
@@ -341,7 +341,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
       return 1;
     }
 
-  CORBA::String_var id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Is it our type?
@@ -349,7 +349,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
     return 1;
 
   // Is it one of our ancestors' types?
-  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = bases->length ();
@@ -362,7 +362,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
     {
       oid =
         this->repo_->ir_poa ()->reference_to_id (bases[i]
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       base_path =
@@ -377,7 +377,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
                                base_key);
 
       CORBA::Boolean success = impl.is_a_i (interface_id
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (success == 1)
@@ -388,16 +388,16 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
 }
 
 CORBA_InterfaceDef::FullInterfaceDescription *
-TAO_InterfaceDef_i::describe_interface (TAO_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::describe_interface (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_interface_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_interface_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef::FullInterfaceDescription *
-TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_InterfaceDef::FullInterfaceDescription *fifd = 0;
@@ -407,10 +407,10 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA_InterfaceDef::FullInterfaceDescription_var retval = fifd;
 
-  fifd->name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  fifd->name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  fifd->id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  fifd->id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -421,7 +421,7 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL)
 
   fifd->defined_in = container_id.c_str ();
 
-  fifd->version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  fifd->version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong i = 0;
@@ -472,7 +472,7 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL)
       TAO_OperationDef_i op (this->repo_,
                              key);
 
-      fifd->operations[i] = op.make_description (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fifd->operations[i] = op.make_description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -520,11 +520,11 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL)
       TAO_AttributeDef_i attr (this->repo_,
                                key);
 
-      fifd->attributes[i] = attr.make_description (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fifd->attributes[i] = attr.make_description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
-  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = bases->length ();
@@ -541,7 +541,7 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL)
     {
       oid =
         this->repo_->ir_poa ()->reference_to_id (bases[i]
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       base_path =
@@ -555,13 +555,13 @@ TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL)
       TAO_InterfaceDef_i impl (this->repo_,
                                base_key);
 
-      repo_ids[i] = impl.id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      repo_ids[i] = impl.id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   fifd->base_interfaces = repo_ids;
 
-  fifd->type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  fifd->type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return retval._retn ();
@@ -574,7 +574,7 @@ TAO_InterfaceDef_i::create_attribute (
     const char *version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -585,7 +585,7 @@ TAO_InterfaceDef_i::create_attribute (
                                    version,
                                    type,
                                    mode
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_AttributeDef_ptr
@@ -595,20 +595,20 @@ TAO_InterfaceDef_i::create_attribute_i (
     const char *version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
   if (bad_params)
     return CORBA_AttributeDef::_nil ();
 
   bad_params = this->check_inherited_attrs (name
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
   if (bad_params)
@@ -636,7 +636,7 @@ TAO_InterfaceDef_i::create_attribute_i (
   // Store the path to the attribute's type definition.
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (type
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
   CORBA::String_var type_path =
@@ -657,7 +657,7 @@ TAO_InterfaceDef_i::create_attribute_i (
                          version,
                          type,
                          mode
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
 
 #if 0 // CCM specific.
@@ -681,7 +681,7 @@ TAO_InterfaceDef_i::create_attribute_i (
         {
           PortableServer::ObjectId_var oid =
             this->repo_->ir_poa ()->reference_to_id (get_exceptions[i]
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
@@ -713,7 +713,7 @@ TAO_InterfaceDef_i::create_attribute_i (
         {
           PortableServer::ObjectId_var oid =
             this->repo_->ir_poa ()->reference_to_id (put_exceptions[i]
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
@@ -734,12 +734,12 @@ TAO_InterfaceDef_i::create_attribute_i (
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Attribute,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
   CORBA_AttributeDef_var retval =
     CORBA_AttributeDef::_narrow (obj.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
   return retval._retn ();
@@ -754,7 +754,7 @@ TAO_InterfaceDef_i::create_operation (const char *id,
                                       const CORBA_ParDescriptionSeq &params,
                                       const CORBA_ExceptionDefSeq &exceptions,
                                       const CORBA_ContextIdSeq &contexts
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_OperationDef::_nil ());
@@ -767,7 +767,7 @@ TAO_InterfaceDef_i::create_operation (const char *id,
                                    params,
                                    exceptions,
                                    contexts
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_OperationDef_ptr
@@ -779,12 +779,12 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
                                         const CORBA_ParDescriptionSeq &params,
                                         const CORBA_ExceptionDefSeq &exceptions,
                                         const CORBA_ContextIdSeq &contexts
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean bad_params = this->pre_exist (id,
                                                name
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
   if (bad_params)
@@ -811,9 +811,9 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
                                           "ops\\",
                                           CORBA::dk_Operation);
 
-  CORBA::TypeCode_var rettype = result->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var rettype = result->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
-  CORBA::TCKind kind = rettype->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = rettype->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
   // Oneway operations cannot have a non-void return type.
@@ -827,7 +827,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
   // Get the path to our return type and store it.
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (result
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
   CORBA::String_var result_path =
@@ -883,7 +883,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
                                                     params[i].name.in ());
           PortableServer::ObjectId_var oid =
             this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
@@ -924,7 +924,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
         {
           PortableServer::ObjectId_var oid =
             this->repo_->ir_poa ()->reference_to_id (exceptions[i]
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
@@ -965,12 +965,12 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Operation,
                                                     path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
   CORBA_OperationDef_var retval =
     CORBA_OperationDef::_narrow (obj.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
   return retval._retn ();
@@ -982,7 +982,7 @@ TAO_InterfaceDef_i::interface_contents (
     ACE_Unbounded_Queue<ACE_TString> &path_queue,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1083,7 +1083,7 @@ TAO_InterfaceDef_i::interface_contents (
                                          path_queue,
                                          limit_type,
                                          exclude_inherited
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -1091,7 +1091,7 @@ TAO_InterfaceDef_i::interface_contents (
 
 void
 TAO_InterfaceDef_i::destroy_special (const char *sub_section
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key sub_key;
@@ -1118,7 +1118,7 @@ TAO_InterfaceDef_i::destroy_special (const char *sub_section
           TAO_AttributeDef_i attr (this->repo_,
                                    member_key);
 
-          attr.destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          attr.destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -1126,7 +1126,7 @@ TAO_InterfaceDef_i::destroy_special (const char *sub_section
           TAO_OperationDef_i op (this->repo_,
                                  member_key);
 
-          op.destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          op.destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -1139,7 +1139,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id,
                                      const char *version,
                                      CORBA_IDLType_ptr type,
                                      CORBA::AttributeMode mode
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_CString the_get_name ("_get_");
@@ -1167,7 +1167,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id,
                               params,
                               excepts,
                               contexts
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (mode == CORBA::ATTR_NORMAL)
@@ -1180,7 +1180,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id,
 
       CORBA_PrimitiveDef_var rettype =
         this->repo_->get_primitive (CORBA::pk_void
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       params.length (1);
@@ -1199,7 +1199,7 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id,
                                   params,
                                   excepts,
                                   contexts
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -1365,7 +1365,7 @@ TAO_InterfaceDef_i::inherited_operations (
 
 CORBA::Boolean
 TAO_InterfaceDef_i::check_inherited_attrs (const char *name
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
diff --git a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h
index 88a237df5ad..28b0e3fd3cc 100644
--- a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h
@@ -54,87 +54,87 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_InterfaceDefSeq *base_interfaces (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDefSeq *base_interfaces_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_interfaces (
       const CORBA_InterfaceDefSeq &base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_interfaces_i (
       const CORBA_InterfaceDefSeq &base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_a (
       const char *interface_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *interface_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_InterfaceDef::FullInterfaceDescription *describe_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDef::FullInterfaceDescription *describe_interface_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -144,7 +144,7 @@ public:
       const char *version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -154,7 +154,7 @@ public:
       const char *version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -167,7 +167,7 @@ public:
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions,
       const CORBA_ContextIdSeq &contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -180,7 +180,7 @@ public:
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions,
       const CORBA_ContextIdSeq &contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -189,7 +189,7 @@ public:
       ACE_Unbounded_Queue<ACE_TString> &path_queue,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Gathers the attributes and operations of all the ancestors.
@@ -197,7 +197,7 @@ public:
 private:
   void destroy_special (
       const char *sub_section
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Removed the repo ids of our attributes and operations from
@@ -208,7 +208,7 @@ private:
                         const char *version,
                         CORBA_IDLType_ptr type,
                         CORBA::AttributeMode mode
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Create set and/or get operations for an attribute.
 
@@ -232,7 +232,7 @@ private:
   // operations.
 
   CORBA::Boolean check_inherited_attrs (const char *name
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // When creating a new attribute, check for a clash with an inherited
   // attribute name.
diff --git a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp
index 06c9d510374..8443fc29d69 100644
--- a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp
@@ -23,7 +23,7 @@ TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_LocalInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LocalInterfaceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_LocalInterface;
@@ -31,18 +31,18 @@ TAO_LocalInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Boolean
 TAO_LocalInterfaceDef_i::is_a (const char *interface_id
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   return this->is_a_i (interface_id
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/LocalBase:1.0") == 0)
@@ -51,5 +51,5 @@ TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id
     }
 
   return this->TAO_InterfaceDef_i::is_a_i (interface_id
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h
index 9c99c164af3..c4a9e3851b2 100644
--- a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h
@@ -50,20 +50,20 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Boolean is_a (
       const char *interface_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *interface_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp
index 81063de075e..9b3097ec619 100644
--- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp
@@ -19,45 +19,45 @@ TAO_ModuleDef_i::~TAO_ModuleDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ModuleDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ModuleDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Module;
 }
 
-void 
-TAO_ModuleDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+void
+TAO_ModuleDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_ModuleDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
+void
+TAO_ModuleDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-    
+
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA_Contained::Description *
-TAO_ModuleDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ModuleDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ModuleDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ModuleDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -68,15 +68,15 @@ TAO_ModuleDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_ModuleDescription md;
 
-  md.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  md.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  md.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  md.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -87,7 +87,7 @@ TAO_ModuleDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 
   md.defined_in = container_id.c_str ();
 
-  md.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  md.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   retval->value <<= md;
diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h
index d6f1c902c12..5b233dd642d 100644
--- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h
@@ -34,7 +34,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_ModuleDef_i : public virtual TAO_Container_i, 
+class TAO_ModuleDef_i : public virtual TAO_Container_i,
                         public virtual TAO_Contained_i
 {
   // = TITLE
@@ -52,31 +52,31 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
diff --git a/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp b/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp
index 458f8b216c1..366530bfa56 100644
--- a/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp
@@ -20,23 +20,23 @@ TAO_NativeDef_i::~TAO_NativeDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_NativeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_NativeDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Native;
 }
 
 CORBA::TypeCode_ptr
-TAO_NativeDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_NativeDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_NativeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_NativeDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -51,6 +51,6 @@ TAO_NativeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
 
   return this->repo_->tc_factory ()->create_native_tc (id.c_str (),
                                                        name.c_str ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/NativeDef_i.h b/TAO/orbsvcs/IFR_Service/NativeDef_i.h
index b3e758f97ac..1f5000782ac 100644
--- a/TAO/orbsvcs/IFR_Service/NativeDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/NativeDef_i.h
@@ -51,19 +51,19 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
diff --git a/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp b/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp
index 93a972df3bb..f5cc22de14a 100644
--- a/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp
@@ -24,23 +24,23 @@ TAO_OperationDef_i::~TAO_OperationDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_OperationDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Operation;
 }
 
 CORBA_Contained::Description *
-TAO_OperationDef_i::describe (TAO_ENV_SINGLE_ARG_DECL )
+TAO_OperationDef_i::describe (ACE_ENV_SINGLE_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_OperationDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL )
+TAO_OperationDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -51,26 +51,26 @@ TAO_OperationDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL )
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  retval->value <<= this->make_description (TAO_ENV_SINGLE_ARG_PARAMETER);
+  retval->value <<= this->make_description (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return retval._retn ();
 }
 
 CORBA::TypeCode_ptr
-TAO_OperationDef_i::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::result (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->result_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_OperationDef_i::result_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::result_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString result_path;
@@ -86,25 +86,25 @@ TAO_OperationDef_i::result_i (TAO_ENV_SINGLE_ARG_DECL)
 
   TAO_IDLType_i *impl =
     this->repo_->servant_factory ()->create_idltype (result_key
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_OperationDef_i::result_def (TAO_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::result_def (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->result_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->result_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_OperationDef_i::result_def_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::result_def_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString result_path;
@@ -129,32 +129,32 @@ TAO_OperationDef_i::result_def_i (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
                                                     result_path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
   return CORBA_IDLType::_narrow (obj.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_OperationDef_i::result_def (CORBA_IDLType_ptr result_def
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->result_def_i (result_def
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (result_def
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var result_path =
@@ -166,16 +166,16 @@ TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def
 }
 
 CORBA_ParDescriptionSeq *
-TAO_OperationDef_i::params (TAO_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::params (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->params_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ParDescriptionSeq *
-TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong i = 0;
@@ -258,12 +258,12 @@ TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL)
 
       TAO_IDLType_i *impl =
         this->repo_->servant_factory ()->create_idltype (type_key
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_IDLType_i> safety (impl);
 
-      retval[i].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      retval[i].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       u_int kind = 0;
@@ -277,11 +277,11 @@ TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL)
       CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (def_kind,
                                                         type_path.c_str ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[i].type_def = CORBA_IDLType::_narrow (obj.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -290,18 +290,18 @@ TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_OperationDef_i::params (const CORBA_ParDescriptionSeq &params
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->params_i (params
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq &params
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -338,7 +338,7 @@ TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq &params
                                                 params[i].name.in ());
       PortableServer::ObjectId_var oid =
         this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var type_path =
@@ -355,16 +355,16 @@ TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq &params
 }
 
 CORBA::OperationMode
-TAO_OperationDef_i::mode (TAO_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::mode (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::OP_NORMAL);
 
-  return this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::OperationMode
-TAO_OperationDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_OperationDef_i::mode_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int mode;
@@ -377,18 +377,18 @@ TAO_OperationDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_OperationDef_i::mode (CORBA::OperationMode mode
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->mode_i (mode
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_OperationDef_i::mode_i (CORBA::OperationMode mode
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -397,16 +397,16 @@ TAO_OperationDef_i::mode_i (CORBA::OperationMode mode
 }
 
 CORBA_ContextIdSeq *
-TAO_OperationDef_i::contexts (TAO_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::contexts (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ContextIdSeq *
-TAO_OperationDef_i::contexts_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key contexts_key;
@@ -462,18 +462,18 @@ TAO_OperationDef_i::contexts_i (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_OperationDef_i::contexts (const CORBA_ContextIdSeq &contexts
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->contexts_i (contexts
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -502,16 +502,16 @@ TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts
 }
 
 CORBA_ExceptionDefSeq *
-TAO_OperationDef_i::exceptions (TAO_ENV_SINGLE_ARG_DECL )
+TAO_OperationDef_i::exceptions (ACE_ENV_SINGLE_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->exceptions_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->exceptions_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ExceptionDefSeq *
-TAO_OperationDef_i::exceptions_i (TAO_ENV_SINGLE_ARG_DECL )
+TAO_OperationDef_i::exceptions_i (ACE_ENV_SINGLE_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key excepts_key;
@@ -592,11 +592,11 @@ TAO_OperationDef_i::exceptions_i (TAO_ENV_SINGLE_ARG_DECL )
       CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (def_kind,
                                                         path.c_str ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[i] = CORBA_ExceptionDef::_narrow (obj.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -605,18 +605,18 @@ TAO_OperationDef_i::exceptions_i (TAO_ENV_SINGLE_ARG_DECL )
 
 void
 TAO_OperationDef_i::exceptions (const CORBA_ExceptionDefSeq &exceptions
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->exceptions_i (exceptions
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -638,7 +638,7 @@ TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions
     {
       PortableServer::ObjectId_var oid =
         this->repo_->ir_poa ()->reference_to_id (exceptions[i]
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var type_path =
@@ -655,15 +655,15 @@ TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions
 
 CORBA_OperationDescription
 TAO_OperationDef_i::make_description (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_OperationDescription od;
 
-  od.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  od.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
-  od.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  od.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
   ACE_TString container_id;
@@ -673,21 +673,21 @@ TAO_OperationDef_i::make_description (
 
   od.defined_in = container_id.c_str ();
 
-  od.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  od.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
-  od.result = this->result_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  od.result = this->result_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
-  od.mode = this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  od.mode = this->mode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
-  CORBA_ContextIdSeq_var cid_seq = this->contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_ContextIdSeq_var cid_seq = this->contexts_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
   od.contexts = cid_seq.in ();
 
-  CORBA_ParDescriptionSeq_var pd_seq = this->params_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_ParDescriptionSeq_var pd_seq = this->params_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
   od.parameters = pd_seq.in ();
@@ -771,7 +771,7 @@ TAO_OperationDef_i::make_description (
           TAO_ExceptionDef_i impl (this->repo_,
                                    type_key);
 
-          od.exceptions[i].type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          od.exceptions[i].type = impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (od);
         }
     }
diff --git a/TAO/orbsvcs/IFR_Service/OperationDef_i.h b/TAO/orbsvcs/IFR_Service/OperationDef_i.h
index 165d3a23d39..e01332200fa 100644
--- a/TAO/orbsvcs/IFR_Service/OperationDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/OperationDef_i.h
@@ -51,145 +51,145 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr result_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr result_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr result_def_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void result_def (
       CORBA_IDLType_ptr result_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result_def_i (
       CORBA_IDLType_ptr result_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ParDescriptionSeq *params (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ParDescriptionSeq *params_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void params (
       const CORBA_ParDescriptionSeq &params
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void params_i (
       const CORBA_ParDescriptionSeq &params
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::OperationMode mode (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::OperationMode mode_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void mode (
       CORBA::OperationMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void mode_i (
       CORBA::OperationMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ContextIdSeq *contexts (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ContextIdSeq *contexts_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void contexts (
       const CORBA_ContextIdSeq &contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void contexts_i (
       const CORBA_ContextIdSeq &contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ExceptionDefSeq *exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ExceptionDefSeq *exceptions_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void exceptions (
       const CORBA_ExceptionDefSeq &exceptions
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void exceptions_i (
       const CORBA_ExceptionDefSeq &exceptions
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_OperationDescription make_description (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Common code for InterfaceDef to call in
diff --git a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp
index f293fdee802..e52de82784f 100644
--- a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp
@@ -20,39 +20,39 @@ TAO_PrimaryKeyDef_i::~TAO_PrimaryKeyDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_PrimaryKeyDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrimaryKeyDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_PrimaryKey;
 }
 
 void
-TAO_PrimaryKeyDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PrimaryKeyDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_PrimaryKeyDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_PrimaryKeyDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_PrimaryKeyDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PrimaryKeyDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_PrimaryKeyDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_PrimaryKeyDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -61,18 +61,18 @@ TAO_PrimaryKeyDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SIN
 
 CORBA::Boolean
 TAO_PrimaryKeyDef_i::is_a (const char *primary_key_id
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   return this->is_a_i (primary_key_id
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_PrimaryKeyDef_i::is_a_i (const char * /* primary_key_id */
-                             TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
+                             ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -80,16 +80,16 @@ TAO_PrimaryKeyDef_i::is_a_i (const char * /* primary_key_id */
 }
 
 CORBA_ValueDef_ptr
-TAO_PrimaryKeyDef_i::primary_key (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PrimaryKeyDef_i::primary_key (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ());
 
-  return this->primary_key_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->primary_key_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ValueDef_ptr
-TAO_PrimaryKeyDef_i::primary_key_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_PrimaryKeyDef_i::primary_key_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h
index 4c937962cf7..4e5dcaab2bc 100644
--- a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h
@@ -52,53 +52,53 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Boolean is_a (
       const char *primary_key_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *primary_key_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef_ptr primary_key (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef_ptr primary_key_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp
index f6343693d55..6e200e14027 100644
--- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp
@@ -20,37 +20,37 @@ TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_PrimitiveDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrimitiveDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Primitive;
 }
 
-void 
-TAO_PrimitiveDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+void
+TAO_PrimitiveDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_PrimitiveDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
+void
+TAO_PrimitiveDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO));
 }
 
-CORBA::TypeCode_ptr 
-TAO_PrimitiveDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+CORBA::TypeCode_ptr
+TAO_PrimitiveDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_PrimitiveDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::TypeCode_ptr
+TAO_PrimitiveDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;
@@ -109,17 +109,17 @@ TAO_PrimitiveDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   }
 }
 
-CORBA::PrimitiveKind 
-TAO_PrimitiveDef_i::kind (TAO_ENV_SINGLE_ARG_DECL)
+CORBA::PrimitiveKind
+TAO_PrimitiveDef_i::kind (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null);
 
-  return this->kind_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->kind_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::PrimitiveKind 
-TAO_PrimitiveDef_i::kind_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::PrimitiveKind
+TAO_PrimitiveDef_i::kind_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;
diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h
index 93bd5663df3..d4cbe2f096c 100644
--- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h
@@ -50,42 +50,42 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // May not be called on a primitive kind - raises BAD_INV_ORDER.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Must implement this here because it's pure virtual in the
   // base class.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PrimitiveKind kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::PrimitiveKind kind_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp
index 67d87d93f3a..80e73290122 100644
--- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp
@@ -20,56 +20,56 @@ TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ProvidesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ProvidesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Provides;
 }
 
-void 
-TAO_ProvidesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+void
+TAO_ProvidesDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_ProvidesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+void
+TAO_ProvidesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ProvidesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ProvidesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ProvidesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ProvidesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA_InterfaceDef_ptr 
-TAO_ProvidesDef_i::interface_type (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_InterfaceDef_ptr
+TAO_ProvidesDef_i::interface_type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ());
 
-  return this->interface_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->interface_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_InterfaceDef_ptr 
-TAO_ProvidesDef_i::interface_type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+CORBA_InterfaceDef_ptr
+TAO_ProvidesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h
index 519bb360a63..5cd1e50fcbc 100644
--- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h
@@ -50,41 +50,41 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_InterfaceDef_ptr interface_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDef_ptr interface_type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp
index 3010f401007..044d7b67bf3 100644
--- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp
@@ -21,39 +21,39 @@ TAO_PublishesDef_i::~TAO_PublishesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_PublishesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PublishesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Publishes;
 }
 
-void 
-TAO_PublishesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+void
+TAO_PublishesDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_PublishesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+void
+TAO_PublishesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_PublishesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PublishesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_PublishesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_PublishesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h
index 6e68f4b1f91..b33c970c958 100644
--- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h
@@ -51,30 +51,30 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.cpp b/TAO/orbsvcs/IFR_Service/Repository_i.cpp
index f0bddca277e..ffc9f68dac3 100644
--- a/TAO/orbsvcs/IFR_Service/Repository_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/Repository_i.cpp
@@ -48,14 +48,14 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb,
       // Resolve and narrow the TypeCodeFactory.
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("TypeCodeFactory"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (object.in ()))
         {
           this->tc_factory_ =
             CORBA::TypeCodeFactory::_narrow (object.in ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (this->tc_factory_.in ()))
@@ -215,14 +215,14 @@ TAO_Repository_i::~TAO_Repository_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_Repository_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Repository_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Repository;
 }
 
 void
-TAO_Repository_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Repository_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO));
@@ -230,18 +230,18 @@ TAO_Repository_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA_Contained_ptr
 TAO_Repository_i::lookup_id (const char *search_id
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_Contained::_nil ());
 
   return this->lookup_id_i (search_id
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_Contained_ptr
 TAO_Repository_i::lookup_id_i (const char *search_id
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (search_id, "IDL:omg.org/CORBA/Object:1.0") == 0
@@ -275,30 +275,30 @@ TAO_Repository_i::lookup_id_i (const char *search_id
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (def_kind,
                                            path.c_str ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_Contained::_nil ());
 
   return CORBA_Contained::_narrow (obj.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
   return this->get_canonical_typecode_i (tc
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   switch (kind)
@@ -310,37 +310,37 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
       ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
     case CORBA::tk_array:
     {
-      CORBA::ULong length = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-      CORBA::TypeCode_var ctype = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var ctype = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       CORBA::TypeCode_var canon_ctype =
         this->get_canonical_typecode_i (ctype.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       return this->tc_factory ()->create_array_tc (length,
                                                    canon_ctype.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
     }
     case CORBA::tk_sequence:
     {
-      CORBA::ULong length = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-      CORBA::TypeCode_var ctype = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var ctype = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       CORBA::TypeCode_var canon_ctype =
         this->get_canonical_typecode_i (ctype.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       return this->tc_factory ()->create_sequence_tc (length,
                                                       canon_ctype.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
     }
     case CORBA::tk_alias:
     case CORBA::tk_objref:
@@ -355,7 +355,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
     case CORBA::tk_component:
     case CORBA::tk_home:
     {
-      CORBA::String_var id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::String_var id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       ACE_TString path;
@@ -381,18 +381,18 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
           TAO_ExceptionDef_i impl (this,
                                    key);
 
-          return impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          return impl.type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
         }
       else
         {
           TAO_IDLType_i *impl =
             this->servant_factory ()->create_idltype (key
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
           auto_ptr<TAO_IDLType_i> safety (impl);
 
-          return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
         }
     }
   }
@@ -400,7 +400,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
 
 CORBA_PrimitiveDef_ptr
 TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString obj_id ("pkinds\\");
@@ -410,27 +410,27 @@ TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_Primitive,
                                            obj_id.c_str ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_PrimitiveDef::_nil ());
 
   return CORBA_PrimitiveDef::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_StringDef_ptr
 TAO_Repository_i::create_string (CORBA::ULong bound
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_StringDef::_nil ());
 
   return this->create_string_i (bound
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_StringDef_ptr
 TAO_Repository_i::create_string_i (CORBA::ULong bound
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -469,27 +469,27 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_String,
                                            obj_id.c_str ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StringDef::_nil ());
 
   return CORBA_StringDef::_narrow (obj.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_WstringDef_ptr
 TAO_Repository_i::create_wstring (CORBA::ULong bound
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_WstringDef::_nil ());
 
   return this->create_wstring_i (bound
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_WstringDef_ptr
 TAO_Repository_i::create_wstring_i (CORBA::ULong bound
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -528,35 +528,35 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_Wstring,
                                            obj_id.c_str ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_WstringDef::_nil ());
 
   return CORBA_WstringDef::_narrow (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_SequenceDef_ptr
 TAO_Repository_i::create_sequence (CORBA::ULong bound,
                                    CORBA_IDLType_ptr element_type
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_SequenceDef::_nil ());
 
   return this->create_sequence_i (bound,
                                   element_type
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_SequenceDef_ptr
 TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
                                      CORBA_IDLType_ptr element_type
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
     this->ir_poa_->reference_to_id (element_type
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ());
 
   CORBA::String_var element_path =
@@ -606,35 +606,35 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_Sequence,
                                            obj_id.c_str ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ());
 
   return CORBA_SequenceDef::_narrow (obj.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ArrayDef_ptr
 TAO_Repository_i::create_array (CORBA::ULong length,
                                 CORBA_IDLType_ptr element_type
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ArrayDef::_nil ());
 
   return this->create_array_i (length,
                                element_type
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ArrayDef_ptr
 TAO_Repository_i::create_array_i (CORBA::ULong length,
                                   CORBA_IDLType_ptr element_type
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
     this->ir_poa_->reference_to_id (element_type
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ());
 
   CORBA::String_var element_path =
@@ -684,30 +684,30 @@ TAO_Repository_i::create_array_i (CORBA::ULong length,
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_Array,
                                            obj_id.c_str ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ());
 
   return CORBA_ArrayDef::_narrow (obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_FixedDef_ptr
 TAO_Repository_i::create_fixed (CORBA::UShort digits,
                                 CORBA::Short scale
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_FixedDef::_nil ());
 
   return this->create_fixed_i (digits,
                                scale
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_FixedDef_ptr
 TAO_Repository_i::create_fixed_i (CORBA::UShort /* digits */,
                                   CORBA::Short /* scale */
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA_FixedDef::_nil ());
diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.h b/TAO/orbsvcs/IFR_Service/Repository_i.h
index 57afd79f4fc..647a0572d24 100644
--- a/TAO/orbsvcs/IFR_Service/Repository_i.h
+++ b/TAO/orbsvcs/IFR_Service/Repository_i.h
@@ -58,44 +58,44 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Accessor for the readonly attribute.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // May not be called on a repository - raises BAD_INV_ORDER.
 
   virtual CORBA_Contained_ptr lookup_id (
       const char *search_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Contained_ptr lookup_id_i (
       const char *search_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA::TypeCode_ptr tc
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr get_canonical_typecode_i (
       CORBA::TypeCode_ptr tc
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PrimitiveDef_ptr get_primitive (
       CORBA::PrimitiveKind kind
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC (( CORBA::SystemException));
   // No locking necessary because the database is not
@@ -103,67 +103,67 @@ public:
 
   virtual CORBA_StringDef_ptr create_string (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_StringDef_ptr create_string_i (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_WstringDef_ptr create_wstring (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_WstringDef_ptr create_wstring_i (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC (( CORBA::SystemException));
 
   CORBA_SequenceDef_ptr create_sequence_i (
       CORBA::ULong bound,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC (( CORBA::SystemException));
 
   virtual CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ArrayDef_ptr create_array_i (
       CORBA::ULong length,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
       CORBA::Short scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_FixedDef_ptr create_fixed_i (
       CORBA::UShort digits,
       CORBA::Short scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp
index b60466363bc..e84948ad205 100644
--- a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp
@@ -22,27 +22,27 @@ TAO_SequenceDef_i::~TAO_SequenceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_SequenceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SequenceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Sequence;
 }
 
 void
-TAO_SequenceDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_SequenceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only if it is (w)string, fixed, array or sequence.
-  this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TString name;
@@ -56,43 +56,43 @@ TAO_SequenceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_SequenceDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_SequenceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var element_typecode =
-    this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_sequence_tc (
                                          bound,
                                          element_typecode.in ()
-                                         TAO_ENV_ARG_PARAMETER
+                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
 CORBA::ULong
-TAO_SequenceDef_i::bound (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::bound (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::ULong
-TAO_SequenceDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SequenceDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int bound = 0;
@@ -105,18 +105,18 @@ TAO_SequenceDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_SequenceDef_i::bound (CORBA::ULong bound
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->bound_i (bound
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_SequenceDef_i::bound_i (CORBA::ULong bound
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -125,16 +125,16 @@ TAO_SequenceDef_i::bound_i (CORBA::ULong bound
 }
 
 CORBA::TypeCode_ptr
-TAO_SequenceDef_i::element_type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_SequenceDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -150,25 +150,25 @@ TAO_SequenceDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL)
 
   TAO_IDLType_i *impl =
     this->repo_->servant_factory ()->create_idltype (element_key
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_SequenceDef_i::element_type_def (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type_def (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->element_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->element_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_SequenceDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -193,35 +193,35 @@ TAO_SequenceDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
                                                     element_path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
   return CORBA_IDLType::_narrow (obj.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_SequenceDef_i::element_type_def (CORBA_IDLType_ptr element_type_def
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->element_type_def_i (element_type_def
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (element_type_def
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var element_path =
@@ -234,7 +234,7 @@ TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def
 
 void
 TAO_SequenceDef_i::destroy_element_type (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -269,12 +269,12 @@ TAO_SequenceDef_i::destroy_element_type (
     {
       TAO_IDLType_i *impl =
         this->repo_->servant_factory ()->create_idltype (element_key
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       auto_ptr<TAO_IDLType_i> safety (impl);
 
-      impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       break;
diff --git a/TAO/orbsvcs/IFR_Service/SequenceDef_i.h b/TAO/orbsvcs/IFR_Service/SequenceDef_i.h
index 061e91adc6e..7ec49a80cad 100644
--- a/TAO/orbsvcs/IFR_Service/SequenceDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/SequenceDef_i.h
@@ -50,91 +50,91 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::ULong bound (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong bound_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr element_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr element_type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr element_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr element_type_def_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void element_type_def (
       CORBA_IDLType_ptr element_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void element_type_def_i (
       CORBA_IDLType_ptr element_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   void destroy_element_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys an anonymous non-primitive element type.
diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
index 7b168fb9cb0..64cd9fb8ff7 100644
--- a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
+++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
@@ -15,7 +15,7 @@ IFR_Servant_Factory::IFR_Servant_Factory (TAO_Repository_i *repo)
 TAO_IDLType_i *
 IFR_Servant_Factory::create_idltype (
     ACE_Configuration_Section_Key servant_key
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   u_int def_kind = 0;
@@ -231,7 +231,7 @@ IFR_Servant_Factory::create_idltype (
 TAO_Contained_i *
 IFR_Servant_Factory::create_contained (
     ACE_Configuration_Section_Key servant_key
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   u_int def_kind = 0;
@@ -513,7 +513,7 @@ IFR_Servant_Factory::create_contained (
 TAO_Container_i *
 IFR_Servant_Factory::create_container (
     ACE_Configuration_Section_Key servant_key
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   u_int def_kind = 0;
@@ -642,7 +642,7 @@ PortableServer::Servant
 IFR_Servant_Factory::create_tie (
     ACE_Configuration_Section_Key servant_key,
     PortableServer::POA_ptr poa
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   u_int def_kind = 0;
@@ -1370,7 +1370,7 @@ IFR_Servant_Factory::create_tie (
 CORBA::Object_ptr
 IFR_Servant_Factory::create_objref (CORBA::DefinitionKind def_kind,
                                     const char *obj_id
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   PortableServer::ObjectId_var oid =
     PortableServer::string_to_ObjectId (obj_id);
@@ -1488,5 +1488,5 @@ IFR_Servant_Factory::create_objref (CORBA::DefinitionKind def_kind,
 
   return this->repo_->ir_poa ()->create_reference_with_id (oid.in (),
                                                            repo_id.c_str ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.h b/TAO/orbsvcs/IFR_Service/Servant_Factory.h
index 8c2657f65d3..dd9b29d1934 100644
--- a/TAO/orbsvcs/IFR_Service/Servant_Factory.h
+++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.h
@@ -47,28 +47,28 @@ public:
   // constructor
 
   TAO_IDLType_i *create_idltype (ACE_Configuration_Section_Key key
-                                 TAO_ENV_ARG_DECL);
+                                 ACE_ENV_ARG_DECL);
   // For internal use - faster than creating an object reference and
   // sending a request, and can call utility functions not in IDL.
 
   TAO_Contained_i *create_contained (ACE_Configuration_Section_Key key
-                                     TAO_ENV_ARG_DECL);
+                                     ACE_ENV_ARG_DECL);
   // For internal use - faster than creating an object reference and
   // sending a request, and can call utility functions not in IDL.
 
   TAO_Container_i *create_container (ACE_Configuration_Section_Key key
-                                     TAO_ENV_ARG_DECL);
+                                     ACE_ENV_ARG_DECL);
   // For internal use - faster than creating an object reference and
   // sending a request, and can call utility functions not in IDL.
 
   PortableServer::Servant create_tie (ACE_Configuration_Section_Key key,
                                       PortableServer::POA_ptr poa
-                                      TAO_ENV_ARG_DECL);
+                                      ACE_ENV_ARG_DECL);
   // Used by the servant locator to create a servant.
 
   CORBA::Object_ptr create_objref (CORBA::DefinitionKind def_kind,
                                    const char *obj_id
-                                   TAO_ENV_ARG_DECL);
+                                   ACE_ENV_ARG_DECL);
   // Used to create return values.
 private:
   TAO_Repository_i *repo_;
diff --git a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp
index effbe438f55..4065aead98c 100644
--- a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp
+++ b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp
@@ -17,7 +17,7 @@ IFR_ServantLocator::preinvoke (
     PortableServer::POA_ptr poa,
     const char * /* operation */,
     PortableServer::ServantLocator::Cookie &cookie
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
@@ -41,7 +41,7 @@ IFR_ServantLocator::preinvoke (
   PortableServer::Servant servant =
     this->repo_->servant_factory ()->create_tie (servant_key,
                                                  poa
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   cookie = servant;
@@ -56,7 +56,7 @@ IFR_ServantLocator::postinvoke (
     const char * /* operation */,
     PortableServer::ServantLocator::Cookie /* cookie */,
     PortableServer::Servant servant
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/IFR_Service/Servant_Locator.h b/TAO/orbsvcs/IFR_Service/Servant_Locator.h
index 51c681a1501..9a2293854b9 100644
--- a/TAO/orbsvcs/IFR_Service/Servant_Locator.h
+++ b/TAO/orbsvcs/IFR_Service/Servant_Locator.h
@@ -45,7 +45,7 @@ public:
       PortableServer::POA_ptr adapter,
       const char *operation,
       PortableServer::ServantLocator::Cookie &the_cookie
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
@@ -58,7 +58,7 @@ public:
       const char *operation,
       PortableServer::ServantLocator::Cookie the_cookie,
       PortableServer::Servant the_servant
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever an IR object servant completes a
diff --git a/TAO/orbsvcs/IFR_Service/StringDef_i.cpp b/TAO/orbsvcs/IFR_Service/StringDef_i.cpp
index c84ee3c3fa5..b536f8981f5 100644
--- a/TAO/orbsvcs/IFR_Service/StringDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/StringDef_i.cpp
@@ -18,23 +18,23 @@ TAO_StringDef_i::~TAO_StringDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_StringDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StringDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_String;
 }
 
 void
-TAO_StringDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_StringDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_StringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -48,38 +48,38 @@ TAO_StringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::TypeCode_ptr
-TAO_StringDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_StringDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_StringDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_StringDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_string_tc (
                                          bound
-                                         TAO_ENV_ARG_PARAMETER
+                                         ACE_ENV_ARG_PARAMETER
                                        );
 }
 
 CORBA::ULong
-TAO_StringDef_i::bound (TAO_ENV_SINGLE_ARG_DECL)
+TAO_StringDef_i::bound (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::ULong
-TAO_StringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int retval = 0;
@@ -92,18 +92,18 @@ TAO_StringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_StringDef_i::bound (CORBA::ULong bound
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->bound_i (bound
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_StringDef_i::bound_i (CORBA::ULong bound
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/IFR_Service/StringDef_i.h b/TAO/orbsvcs/IFR_Service/StringDef_i.h
index 4ed4bb83f14..6bc502446e3 100644
--- a/TAO/orbsvcs/IFR_Service/StringDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/StringDef_i.h
@@ -51,53 +51,53 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::ULong bound (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong bound_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/StructDef_i.cpp b/TAO/orbsvcs/IFR_Service/StructDef_i.cpp
index acb2883004c..08dfaa51490 100644
--- a/TAO/orbsvcs/IFR_Service/StructDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/StructDef_i.cpp
@@ -23,45 +23,45 @@ TAO_StructDef_i::~TAO_StructDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_StructDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_StructDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Struct;
 }
 
 void
-TAO_StructDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_StructDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::TypeCode_ptr
-TAO_StructDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_StructDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -74,26 +74,26 @@ TAO_StructDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
                                             "name",
                                             name);
 
-  CORBA_StructMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_StructMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_struct_tc (id.c_str (),
                                                        name.c_str (),
                                                        members.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructMemberSeq *
-TAO_StructDef_i::members (TAO_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::members (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_StructMemberSeq *
-TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -187,11 +187,11 @@ TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
       obj =
         this->repo_->servant_factory ()->create_objref (kind,
                                                         path.c_str ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[k].type_def = CORBA_IDLType::_narrow (obj.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
@@ -201,12 +201,12 @@ TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
 
       impl =
         this->repo_->servant_factory ()->create_idltype (member_key
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_IDLType_i> safety (impl);
 
-      retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -215,22 +215,22 @@ TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_StructDef_i::members (const CORBA_StructMemberSeq &members
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->members_i (members
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
-  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count = members.length ();
@@ -260,7 +260,7 @@ TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members
 
       PortableServer::ObjectId_var oid =
         this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var path =
diff --git a/TAO/orbsvcs/IFR_Service/StructDef_i.h b/TAO/orbsvcs/IFR_Service/StructDef_i.h
index 0249cafeadc..cf3836abc29 100644
--- a/TAO/orbsvcs/IFR_Service/StructDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/StructDef_i.h
@@ -52,53 +52,53 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry and its contents.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_StructMemberSeq *members (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_StructMemberSeq *members_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
       const CORBA_StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
       const CORBA_StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp
index 859c5fa8359..8884a883e9f 100644
--- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp
@@ -21,16 +21,16 @@ TAO_TypedefDef_i::~TAO_TypedefDef_i (void)
 }
 
 CORBA_Contained::Description *
-TAO_TypedefDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_TypedefDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_TypedefDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_TypedefDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -41,15 +41,15 @@ TAO_TypedefDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  retval->kind = this->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_TypeDescription td;
 
   ACE_CHECK_RETURN (0);
-  td.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  td.name = this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-  td.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  td.id = this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -60,10 +60,10 @@ TAO_TypedefDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
 
   td.defined_in = container_id.c_str ();
 
-  td.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  td.version = this->version_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  td.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  td.type = this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   retval->value <<= td;
diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h
index 40e966cded2..cf1a24a8eec 100644
--- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h
@@ -34,7 +34,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_TypedefDef_i : public virtual TAO_Contained_i, 
+class TAO_TypedefDef_i : public virtual TAO_Contained_i,
                          public virtual TAO_IDLType_i
 {
   // = TITLE
@@ -53,13 +53,13 @@ public:
   // Destructor
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
diff --git a/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp b/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp
index 4ca5f622103..097f7fc1cbb 100644
--- a/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp
@@ -23,45 +23,45 @@ TAO_UnionDef_i::~TAO_UnionDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_UnionDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UnionDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Union;
 }
 
 void
-TAO_UnionDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_UnionDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Contained_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::TypeCode_ptr
-TAO_UnionDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_UnionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -74,30 +74,30 @@ TAO_UnionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
                                             "name",
                                             name);
 
-  CORBA::TypeCode_var tc = this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  CORBA_UnionMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_UnionMemberSeq_var members = this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_union_tc (id.c_str (),
                                                       name.c_str (),
                                                       tc.in (),
                                                       members.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_UnionDef_i::discriminator_type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::discriminator_type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_UnionDef_i::discriminator_type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::discriminator_type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString disc_path;
@@ -113,24 +113,24 @@ TAO_UnionDef_i::discriminator_type_i (TAO_ENV_SINGLE_ARG_DECL)
 
   TAO_IDLType_i *impl =
     this->repo_->servant_factory ()->create_idltype (disc_key
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_UnionDef_i::discriminator_type_def (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::discriminator_type_def (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->discriminator_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->discriminator_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_UnionDef_i::discriminator_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::discriminator_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString disc_path;
@@ -155,36 +155,36 @@ TAO_UnionDef_i::discriminator_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
                                                     disc_path.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
   return CORBA_IDLType::_narrow (obj.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_UnionDef_i::discriminator_type_def (
     CORBA_IDLType_ptr discriminator_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->discriminator_type_def_i (discriminator_type_def
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_UnionDef_i::discriminator_type_def_i (
     CORBA_IDLType_ptr discriminator_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (discriminator_type_def
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var disc_path =
@@ -196,16 +196,16 @@ TAO_UnionDef_i::discriminator_type_def_i (
 }
 
 CORBA_UnionMemberSeq *
-TAO_UnionDef_i::members (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::members (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->members_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_UnionMemberSeq *
-TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
@@ -281,7 +281,7 @@ TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
 
       this->fetch_label (next_key,
                          retval[k]
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       this->repo_->config ()->get_string_value (next_key,
@@ -303,21 +303,21 @@ TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
       obj =
         this->repo_->servant_factory ()->create_objref (def_kind,
                                                         path.c_str ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[k].type_def = CORBA_IDLType::_narrow (obj.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       impl =
         this->repo_->servant_factory ()->create_idltype (entry_key
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_IDLType_i> safety (impl);
 
-      retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      retval[k].type = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -326,22 +326,22 @@ TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_UnionDef_i::members (const CORBA_UnionMemberSeq &members
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->members_i (members
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
-  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Container_i::destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TString section_name;
@@ -375,7 +375,7 @@ TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members
 
       PortableServer::ObjectId_var oid =
         this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var member_path =
@@ -387,14 +387,14 @@ TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members
 
       this->store_label (member_key,
                          members[i].label
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
     }
 }
 
 void
 TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
                              CORBA_UnionMember &member
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration::VALUETYPE vt;
@@ -414,10 +414,10 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
                                              "label",
                                              value);
 
-  CORBA::TypeCode_var tc = this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   switch (kind)
diff --git a/TAO/orbsvcs/IFR_Service/UnionDef_i.h b/TAO/orbsvcs/IFR_Service/UnionDef_i.h
index ea97eaae096..d9377b0c8ed 100644
--- a/TAO/orbsvcs/IFR_Service/UnionDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/UnionDef_i.h
@@ -52,85 +52,85 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry and its contents.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr discriminator_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr discriminator_type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr discriminator_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr discriminator_type_def_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void discriminator_type_def (
       CORBA_IDLType_ptr discriminator_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void discriminator_type_def_i (
       CORBA_IDLType_ptr discriminator_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_UnionMemberSeq *members (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_UnionMemberSeq *members_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
       const CORBA_UnionMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
       const CORBA_UnionMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -138,7 +138,7 @@ private:
   void fetch_label (
       const ACE_Configuration_Section_Key member_key,
       CORBA_UnionMember &member
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Used by members() to get each member's label value.
diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp
index e36bdaa2ee9..65e7d8ca51f 100644
--- a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp
@@ -18,73 +18,73 @@ TAO_UsesDef_i::~TAO_UsesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_UsesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UsesDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Uses;
 }
 
-void 
-TAO_UsesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+void
+TAO_UsesDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_UsesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+void
+TAO_UsesDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_UsesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UsesDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_UsesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_UsesDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA_InterfaceDef_ptr 
-TAO_UsesDef_i::interface_type (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_InterfaceDef_ptr
+TAO_UsesDef_i::interface_type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ());
 
-  return this->interface_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->interface_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_InterfaceDef_ptr 
-TAO_UsesDef_i::interface_type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+CORBA_InterfaceDef_ptr
+TAO_UsesDef_i::interface_type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::Boolean 
-TAO_UsesDef_i::is_multiple (TAO_ENV_SINGLE_ARG_DECL)
+CORBA::Boolean
+TAO_UsesDef_i::is_multiple (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_multiple_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->is_multiple_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_UsesDef_i::is_multiple_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+CORBA::Boolean
+TAO_UsesDef_i::is_multiple_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.h b/TAO/orbsvcs/IFR_Service/UsesDef_i.h
index fae4dae86f8..e032dbf7bc9 100644
--- a/TAO/orbsvcs/IFR_Service/UsesDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.h
@@ -50,51 +50,51 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_InterfaceDef_ptr interface_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDef_ptr interface_type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_multiple (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_multiple_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp
index 802bef26eca..97b29fd2fe3 100644
--- a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp
@@ -24,23 +24,23 @@ TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ValueBoxDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueBoxDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_ValueBox;
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueBoxDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueBoxDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueBoxDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueBoxDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -66,31 +66,31 @@ TAO_ValueBoxDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
 
   TAO_IDLType_i *impl =
     this->repo_->servant_factory ()->create_idltype (boxed_key
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  CORBA::TypeCode_var tc = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_value_box_tc (id.c_str (),
                                                           name.c_str (),
                                                           tc.in ()
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_ValueBoxDef_i::original_type_def (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueBoxDef_i::original_type_def (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->original_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_ValueBoxDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueBoxDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString boxed_type;
@@ -115,32 +115,32 @@ TAO_ValueBoxDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
                                                     boxed_type.c_str ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
   return CORBA_IDLType::_narrow (obj.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ValueBoxDef_i::original_type_def (CORBA_IDLType_ptr original_type_def
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->original_type_def_i (original_type_def
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ValueBoxDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
     this->repo_->ir_poa ()->reference_to_id (original_type_def
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var boxed_type =
diff --git a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h
index f477053a276..c7b649671fb 100644
--- a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h
@@ -51,42 +51,42 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_IDLType_ptr original_type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr original_type_def_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void original_type_def (
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void original_type_def_i (
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp
index 1c41ea260f4..147d7cac989 100644
--- a/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp
@@ -20,39 +20,39 @@ TAO_ValueDef_i::~TAO_ValueDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ValueDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Value;
 }
 
 void
-TAO_ValueDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_ValueDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ValueDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ValueDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -60,16 +60,16 @@ TAO_ValueDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_A
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -77,16 +77,16 @@ TAO_ValueDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_P
 }
 
 CORBA_InterfaceDefSeq *
-TAO_ValueDef_i::supported_interfaces (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::supported_interfaces (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->supported_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->supported_interfaces_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDefSeq *
-TAO_ValueDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueDef_i::supported_interfaces_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -96,20 +96,20 @@ TAO_ValueDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_
 void
 TAO_ValueDef_i::supported_interfaces (
     const CORBA_InterfaceDefSeq &supported_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->supported_interfaces_i (supported_interfaces
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ValueDef_i::supported_interfaces_i (
     const CORBA_InterfaceDefSeq & /* supported_interfaces */
-    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
+    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -117,16 +117,16 @@ TAO_ValueDef_i::supported_interfaces_i (
 }
 
 CORBA_InitializerSeq *
-TAO_ValueDef_i::initializers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::initializers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->initializers_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->initializers_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InitializerSeq *
-TAO_ValueDef_i::initializers_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -135,34 +135,34 @@ TAO_ValueDef_i::initializers_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SING
 
 void
 TAO_ValueDef_i::initializers (const CORBA_InitializerSeq &initializers
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->initializers_i (initializers
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ValueDef_i::initializers_i (const CORBA_InitializerSeq & /* initializers */
-                                TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                                ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_ValueDef_ptr
-TAO_ValueDef_i::base_value (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::base_value (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ());
 
-  return this->base_value_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->base_value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ValueDef_ptr
-TAO_ValueDef_i::base_value_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueDef_i::base_value_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -171,34 +171,34 @@ TAO_ValueDef_i::base_value_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE
 
 void
 TAO_ValueDef_i::base_value (CORBA_ValueDef_ptr base_value
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->base_value_i (base_value
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ValueDef_i::base_value_i (CORBA_ValueDef_ptr /* base_value */
-                              TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                              ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_ValueDefSeq *
-TAO_ValueDef_i::abstract_base_values (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::abstract_base_values (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->abstract_base_values_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->abstract_base_values_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ValueDefSeq *
-TAO_ValueDef_i::abstract_base_values_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueDef_i::abstract_base_values_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -208,20 +208,20 @@ TAO_ValueDef_i::abstract_base_values_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_
 void
 TAO_ValueDef_i::abstract_base_values (
     const CORBA_ValueDefSeq &abstract_base_values
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->abstract_base_values_i (abstract_base_values
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ValueDef_i::abstract_base_values_i (
     const CORBA_ValueDefSeq & /* abstract_base_values */
-    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
+    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -229,16 +229,16 @@ TAO_ValueDef_i::abstract_base_values_i (
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_abstract (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::is_abstract (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_abstract_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->is_abstract_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_abstract_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueDef_i::is_abstract_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -247,34 +247,34 @@ TAO_ValueDef_i::is_abstract_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGL
 
 void
 TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->is_abstract (is_abstract
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ValueDef_i::is_abstract_i (CORBA::Boolean /* is_abstract */
-                             TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                             ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_custom (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::is_custom (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_custom_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->is_custom_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_custom_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueDef_i::is_custom_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -283,34 +283,34 @@ TAO_ValueDef_i::is_custom_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_
 
 void
 TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->is_custom_i (is_custom
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ValueDef_i::is_custom_i (CORBA::Boolean /* is_custom */
-                             TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                             ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_truncatable (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::is_truncatable (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_truncatable_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->is_truncatable_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_ValueDef_i::is_truncatable_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueDef_i::is_truncatable_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -319,18 +319,18 @@ TAO_ValueDef_i::is_truncatable_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SI
 
 void
 TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->is_truncatable_i (is_truncatable
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean /* is_truncatable */
-                                  TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                                  ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -338,18 +338,18 @@ TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean /* is_truncatable */
 
 CORBA::Boolean
 TAO_ValueDef_i::is_a (const char *id
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   return this->is_a_i (id
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_ValueDef_i::is_a_i (const char *id
-                        TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                        ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (id, "IDL:omg.org/CORBA/ValueBase:1.0") == 0)
@@ -362,16 +362,16 @@ TAO_ValueDef_i::is_a_i (const char *id
 }
 
 CORBA_ValueDef::FullValueDescription *
-TAO_ValueDef_i::describe_value (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueDef_i::describe_value (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_value_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_value_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ValueDef::FullValueDescription *
-TAO_ValueDef_i::describe_value_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -384,7 +384,7 @@ TAO_ValueDef_i::create_value_member (const char *id,
                                      const char *version,
                                      CORBA_IDLType_ptr type,
                                      CORBA::Visibility access
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueMemberDef::_nil ());
@@ -394,7 +394,7 @@ TAO_ValueDef_i::create_value_member (const char *id,
                                       version,
                                       type,
                                       access
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueMemberDef_ptr
@@ -403,7 +403,7 @@ TAO_ValueDef_i::create_value_member_i (const char * /* id */,
                                        const char * /* version */,
                                        CORBA_IDLType_ptr /* type */,
                                        CORBA::Visibility /* access */
-                                       TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                                       ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -417,7 +417,7 @@ TAO_ValueDef_i::create_attribute (
     const char *version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -428,7 +428,7 @@ TAO_ValueDef_i::create_attribute (
                                    version,
                                    type,
                                    mode
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_AttributeDef_ptr
@@ -438,7 +438,7 @@ TAO_ValueDef_i::create_attribute_i (
     const char * /* version */,
     CORBA_IDLType_ptr /* type */,
     CORBA::AttributeMode /* mode */
-    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
+    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -456,7 +456,7 @@ TAO_ValueDef_i::create_operation (
     const CORBA_ParDescriptionSeq &params,
     const CORBA_ExceptionDefSeq &exceptions,
     const CORBA_ContextIdSeq &contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -470,7 +470,7 @@ TAO_ValueDef_i::create_operation (
                                    params,
                                    exceptions,
                                    contexts
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_OperationDef_ptr
@@ -483,7 +483,7 @@ TAO_ValueDef_i::create_operation_i (
     const CORBA_ParDescriptionSeq & /* params */,
     const CORBA_ExceptionDefSeq & /* exceptions */,
     const CORBA_ContextIdSeq & /* contexts */
-    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
+    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/IFR_Service/ValueDef_i.h b/TAO/orbsvcs/IFR_Service/ValueDef_i.h
index 4bd20588fd8..4675e1b9908 100644
--- a/TAO/orbsvcs/IFR_Service/ValueDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ValueDef_i.h
@@ -53,219 +53,219 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_InterfaceDefSeq *supported_interfaces (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDefSeq *supported_interfaces_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void supported_interfaces (
       const CORBA_InterfaceDefSeq & supported_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void supported_interfaces_i (
       const CORBA_InterfaceDefSeq & supported_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_InitializerSeq *initializers (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InitializerSeq *initializers_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void initializers (
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void initializers_i (
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef_ptr base_value (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef_ptr base_value_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_value (
       CORBA_ValueDef_ptr base_value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_value_i (
       CORBA_ValueDef_ptr base_value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDefSeq *abstract_base_values (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDefSeq *abstract_base_values_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void abstract_base_values (
       const CORBA_ValueDefSeq & abstract_base_values
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void abstract_base_values_i (
       const CORBA_ValueDefSeq & abstract_base_values
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_abstract (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_abstract_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_abstract (
       CORBA::Boolean is_abstract
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_abstract_i (
       CORBA::Boolean is_abstract
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_custom (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_custom_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_custom (
       CORBA::Boolean is_custom
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_custom_i (
       CORBA::Boolean is_custom
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_truncatable (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_truncatable_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_truncatable (
       CORBA::Boolean is_truncatable
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_truncatable_i (
       CORBA::Boolean is_truncatable
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_a (
       const char *id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
       const char *id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef::FullValueDescription *describe_value (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef::FullValueDescription *describe_value_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -275,7 +275,7 @@ public:
       const char *version,
       CORBA_IDLType_ptr type,
       CORBA::Visibility access
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -285,7 +285,7 @@ public:
       const char *version,
       CORBA_IDLType_ptr type,
       CORBA::Visibility access
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -295,7 +295,7 @@ public:
       const char *version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -305,7 +305,7 @@ public:
       const char *version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -318,7 +318,7 @@ public:
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions,
       const CORBA_ContextIdSeq &contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -331,7 +331,7 @@ public:
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions,
       const CORBA_ContextIdSeq &contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp
index e99f4fcd66e..8e6b0912a21 100644
--- a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp
@@ -20,39 +20,39 @@ TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ValueMemberDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ValueMemberDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_ValueMember;
 }
 
 void
-TAO_ValueMemberDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_ValueMemberDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueMemberDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ValueMemberDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::describe (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ValueMemberDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueMemberDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -60,16 +60,16 @@ TAO_ValueMemberDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SI
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueMemberDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_ValueMemberDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueMemberDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -77,16 +77,16 @@ TAO_ValueMemberDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE
 }
 
 CORBA_IDLType_ptr
-TAO_ValueMemberDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::type_def (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr
-TAO_ValueMemberDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+TAO_ValueMemberDef_i::type_def_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -95,34 +95,34 @@ TAO_ValueMemberDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SI
 
 void
 TAO_ValueMemberDef_i::type_def (CORBA_IDLType_ptr type_def
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->type_def_i (type_def
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ValueMemberDef_i::type_def_i (CORBA_IDLType_ptr /* type_def */
-                                  TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                                  ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA::Visibility
-TAO_ValueMemberDef_i::access (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ValueMemberDef_i::access (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->access_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->access_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Visibility
-TAO_ValueMemberDef_i::access_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
+TAO_ValueMemberDef_i::access_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -131,18 +131,18 @@ TAO_ValueMemberDef_i::access_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SING
 
 void
 TAO_ValueMemberDef_i::access (CORBA::Visibility access
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->access (access
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ValueMemberDef_i::access_i (CORBA::Visibility /* access */
-                                TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
+                                ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h
index 3fdd11ea192..796ef9110cc 100644
--- a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h
@@ -50,85 +50,85 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr type_def (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr type_def_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void type_def (
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void type_def_i (
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Visibility access (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Visibility access_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void access (
       CORBA::Visibility access
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void access_i (
       CORBA::Visibility access
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp
index 96e5401bc90..2b0ad879c71 100644
--- a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp
@@ -20,23 +20,23 @@ TAO_WstringDef_i::~TAO_WstringDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_WstringDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_WstringDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Wstring;
 }
 
 void
-TAO_WstringDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_WstringDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_WstringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_WstringDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -50,36 +50,36 @@ TAO_WstringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::TypeCode_ptr
-TAO_WstringDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_WstringDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_WstringDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_WstringDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_wstring_tc (bound
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
 }
 CORBA::ULong
-TAO_WstringDef_i::bound (TAO_ENV_SINGLE_ARG_DECL)
+TAO_WstringDef_i::bound (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
 CORBA::ULong
-TAO_WstringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_WstringDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int retval = 0;
@@ -92,18 +92,18 @@ TAO_WstringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_WstringDef_i::bound (CORBA::ULong bound
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
   this->bound_i (bound
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_WstringDef_i::bound_i (CORBA::ULong bound
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/IFR_Service/WstringDef_i.h b/TAO/orbsvcs/IFR_Service/WstringDef_i.h
index 80c3387cfb0..6e9eeae7bc1 100644
--- a/TAO/orbsvcs/IFR_Service/WstringDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/WstringDef_i.h
@@ -51,53 +51,53 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's virtual function.
 
   virtual CORBA::ULong bound (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong bound_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 4733035164f..db50274b7e9 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -93,22 +93,22 @@ BE_cleanup (void)
   idl_global = 0;
 
   // Remove the holding scope entry from the repository.
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA_Contained_var result =
         be_global->repository ()->lookup_id (be_global->holding_scope_name ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (result.in ()))
         {
           CORBA_ModuleDef_var scope =
             CORBA_ModuleDef::_narrow (result.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          scope->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          scope->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -140,18 +140,18 @@ TAO_IFR_BE_Export int
 BE_ifr_init (int &ac,
              char *av[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       be_global->orb (CORBA::ORB_init (ac,
                                        av,
                                        0
-                                       TAO_ENV_ARG_PARAMETER));
+                                       ACE_ENV_ARG_PARAMETER));
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
         be_global->orb ()->resolve_initial_references ("InterfaceRepository"
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -165,7 +165,7 @@ BE_ifr_init (int &ac,
         }
 
       CORBA_Repository_var repo = CORBA_Repository::_narrow (object.in ()
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (repo.in ()))
@@ -193,14 +193,14 @@ BE_ifr_init (int &ac,
 }
 
 void
-BE_create_holding_scope (TAO_ENV_SINGLE_ARG_DECL)
+BE_create_holding_scope (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA_ModuleDef_ptr scope = CORBA_ModuleDef::_nil ();
 
   // If we are multi-threaded, it may already be created.
   CORBA_Contained_var result =
     be_global->repository ()->lookup_id (be_global->holding_scope_name ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (result.in ()))
@@ -210,14 +210,14 @@ BE_create_holding_scope (TAO_ENV_SINGLE_ARG_DECL)
                                       be_global->holding_scope_name (),
                                       be_global->holding_scope_name (),
                                       "1.0"
-                                      TAO_ENV_ARG_PARAMETER
+                                      ACE_ENV_ARG_PARAMETER
                                     );
       ACE_CHECK;
     }
   else
     {
       scope = CORBA_ModuleDef::_narrow (result.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -228,10 +228,10 @@ BE_create_holding_scope (TAO_ENV_SINGLE_ARG_DECL)
 TAO_IFR_BE_Export void
 BE_produce (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      BE_create_holding_scope (TAO_ENV_SINGLE_ARG_PARAMETER);
+      BE_create_holding_scope (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the root node.
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 55409c8385a..fa2892b2395 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -75,13 +75,13 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->ir_current_ =
       be_global->repository ()->get_primitive (
                                     this->predefined_type_to_pkind (node)
-                                    TAO_ENV_ARG_PARAMETER
+                                    ACE_ENV_ARG_PARAMETER
                                   );
       ACE_TRY_CHECK;
     }
@@ -107,14 +107,14 @@ ifr_adding_visitor::visit_module (AST_Module *node)
 
   CORBA_Container_var new_def;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // If this module been opened before, it will already be in
       // the repository.
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -128,7 +128,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
                                        node->repoID (),
                                        node->local_name ()->get_string (),
                                        node->version ()
-                                       TAO_ENV_ARG_PARAMETER
+                                       ACE_ENV_ARG_PARAMETER
                                      );
               ACE_TRY_CHECK;
             }
@@ -145,7 +145,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
         }
       else
         {
-          CORBA::DefinitionKind kind = prev_def->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::DefinitionKind kind = prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // If the line below is true, we are clobbering a previous
@@ -154,7 +154,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
           // original entry, create the new one, and let the user beware.
           if (kind != CORBA::dk_Module)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the brach where prev_def.in() is 0.
@@ -164,7 +164,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
             {
               new_def =
                 CORBA_Container::_narrow (prev_def.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -230,20 +230,20 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
       return this->visit_valuetype (node);
     }
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Is this interface already in the respository?
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
           int status = this->create_interface_def (node
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           return status;
@@ -273,38 +273,38 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // previous entry, forward declared or not.
               if (node->ifr_fwd_added () == 0)
                 {
-                  CORBA::DefinitionKind kind = 
-                    prev_def->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+                  CORBA::DefinitionKind kind =
+                    prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   if (kind == CORBA::dk_Interface)
                     {
                       CORBA::InterfaceDef_var iface =
                         CORBA::InterfaceDef::_narrow (prev_def.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
 
-                      CORBA::ContainedSeq_var contents = 
+                      CORBA::ContainedSeq_var contents =
                         iface->contents (CORBA::dk_all,
                                          1
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
 
                       CORBA::ULong length = contents->length ();
 
                       for (CORBA::ULong i = 0; i < length; ++i)
                         {
-                          contents[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+                          contents[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
                           ACE_TRY_CHECK;
                         }
                     }
                   else
                     {
-                      prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+                      prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
                       ACE_TRY_CHECK;
 
                       int status = this->create_interface_def (node
-                                                               TAO_ENV_ARG_PARAMETER);
+                                                               ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
 
                       return status;
@@ -325,7 +325,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                 {
                   result =
                     be_global->repository ()->lookup_id (parents[i]->repoID ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   // If one of our interface's parents is not in the repository,
@@ -337,14 +337,14 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                     {
                       this->ir_current_ =
                         CORBA_IDLType::_narrow (prev_def.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK
 
                       return 0;
                     }
 
                   bases[i] = CORBA_InterfaceDef::_narrow (result.in ()
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   if (CORBA::is_nil (bases[i].in ()))
@@ -362,11 +362,11 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
 
               CORBA_InterfaceDef_var extant_def =
                 CORBA_InterfaceDef::_narrow (prev_def. in ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               extant_def->base_interfaces (bases
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK
 
               node->ifr_added (1);
@@ -429,7 +429,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // defined/not added - takes the other branch.
               // defined/added - we're ok.
               this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in ()
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -456,13 +456,13 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 
   AST_Interface *i = node->full_definition ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Is this interface already in the respository?
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (i->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -487,7 +487,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
                                        i->local_name ()->get_string (),
                                        i->version (),
                                        bases
-                                       TAO_ENV_ARG_PARAMETER
+                                       ACE_ENV_ARG_PARAMETER
                                      );
                 }
               else
@@ -498,7 +498,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
                                        i->local_name ()->get_string (),
                                        i->version (),
                                        bases
-                                       TAO_ENV_ARG_PARAMETER
+                                       ACE_ENV_ARG_PARAMETER
                                      );
                 }
 
@@ -553,12 +553,12 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
       return 0;
     }
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -584,7 +584,7 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               return this->visit_structure (node);
@@ -592,7 +592,7 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
 
           this->ir_current_ =
             CORBA_IDLType::_narrow (prev_def.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -632,13 +632,13 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
       return 0;
     }
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Is this enum already in the respository?
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -674,7 +674,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
                     node->local_name ()->get_string (),
                     node->version (),
                     members
-                    TAO_ENV_ARG_PARAMETER
+                    ACE_ENV_ARG_PARAMETER
                   );
               ACE_TRY_CHECK;
             }
@@ -699,7 +699,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               return this->visit_enum (node);
@@ -709,7 +709,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
           // the current IR object holder.
           this->ir_current_ =
             CORBA_EnumDef::_narrow (prev_def.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -768,14 +768,14 @@ ifr_adding_visitor::visit_field (AST_Field *node)
 int
 ifr_adding_visitor::visit_attribute (AST_Attribute *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       AST_Type *type = node->field_type ();
 
       // Updates ir_current_.
       this->get_referenced_type (type
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::AttributeMode mode =
@@ -787,7 +787,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
         {
           CORBA_InterfaceDef_var iface =
             CORBA_InterfaceDef::_narrow (current_scope
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_AttributeDef_var new_def =
@@ -796,7 +796,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
                                      node->version (),
                                      this->ir_current_.in (),
                                      mode
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -830,12 +830,12 @@ ifr_adding_visitor::visit_union (AST_Union *node)
       return 0;
     }
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -861,7 +861,7 @@ ifr_adding_visitor::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               return this->visit_union (node);
@@ -869,7 +869,7 @@ ifr_adding_visitor::visit_union (AST_Union *node)
 
           this->ir_current_ =
             CORBA_UnionDef::_narrow (prev_def.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -895,12 +895,12 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
 
   const char *id = node->repoID ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (id
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Nothing prevents this constant's repo id from already being
@@ -916,7 +916,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
@@ -933,7 +933,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
 
       CORBA_IDLType_var idl_type =
         be_global->repository ()->get_primitive (pkind
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any any;
@@ -952,7 +952,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
                 node->version (),
                 idl_type.in (),
                 any
-                TAO_ENV_ARG_PARAMETER
+                ACE_ENV_ARG_PARAMETER
               );
           ACE_TRY_CHECK;
         }
@@ -982,11 +982,11 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
 int
 ifr_adding_visitor::visit_array (AST_Array *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->element_type (node->base_type ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       AST_Expression **dims = node->dims ();
@@ -997,7 +997,7 @@ ifr_adding_visitor::visit_array (AST_Array *node)
             be_global->repository ()->create_array (
                 dims[i - 1]->ev ()->u.ulval,
                 this->ir_current_.in ()
-                TAO_ENV_ARG_PARAMETER
+                ACE_ENV_ARG_PARAMETER
               );
           ACE_TRY_CHECK;
         }
@@ -1017,18 +1017,18 @@ ifr_adding_visitor::visit_array (AST_Array *node)
 int
 ifr_adding_visitor::visit_sequence (AST_Sequence *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->element_type (node->base_type ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->ir_current_ =
         be_global->repository ()->create_sequence (
                                       node->max_size ()->ev ()->u.ulval,
                                       this->ir_current_.in ()
-                                      TAO_ENV_ARG_PARAMETER
+                                      ACE_ENV_ARG_PARAMETER
                                     );
       ACE_TRY_CHECK;
     }
@@ -1053,20 +1053,20 @@ ifr_adding_visitor::visit_string (AST_String *node)
 
   CORBA::ULong bound = ACE_static_cast (CORBA::ULong, ev->u.ulval);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       if (node->node_type () == AST_Decl::NT_string)
         {
           this->ir_current_ =
             be_global->repository ()->create_string (bound
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
         }
       else
         {
           this->ir_current_ =
             be_global->repository ()->create_wstring (bound
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
         }
 
       ACE_TRY_CHECK;
@@ -1091,20 +1091,20 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
       return 0;
     }
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Is this typedef already in the respository?
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
           this->element_type (node->base_type ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_Container_ptr current_scope = CORBA_Container::_nil ();
@@ -1117,7 +1117,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
                    node->local_name ()->get_string (),
                    node->version (),
                    this->ir_current_.in ()
-                   TAO_ENV_ARG_PARAMETER
+                   ACE_ENV_ARG_PARAMETER
                  );
               ACE_TRY_CHECK;
             }
@@ -1142,7 +1142,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -1151,7 +1151,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
 
           this->ir_current_ =
             CORBA_TypedefDef::_narrow (prev_def.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -1170,12 +1170,12 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
 int
 ifr_adding_visitor::visit_root (AST_Root *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA_Container_var new_scope =
         CORBA_Container::_narrow (be_global->repository ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
@@ -1233,12 +1233,12 @@ ifr_adding_visitor::visit_native (AST_Native *node)
       return 0;
     }
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -1252,7 +1252,7 @@ ifr_adding_visitor::visit_native (AST_Native *node)
                     node->repoID (),
                     node->local_name ()->get_string (),
                     node->version ()
-                    TAO_ENV_ARG_PARAMETER
+                    ACE_ENV_ARG_PARAMETER
                   );
               ACE_TRY_CHECK;
             }
@@ -1277,7 +1277,7 @@ ifr_adding_visitor::visit_native (AST_Native *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -1286,7 +1286,7 @@ ifr_adding_visitor::visit_native (AST_Native *node)
 
           this->ir_current_ =
             CORBA_NativeDef::_narrow (prev_def.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -1481,7 +1481,7 @@ ifr_adding_visitor::load_any (AST_Expression::AST_ExprValue *ev,
 
 void
 ifr_adding_visitor::element_type (AST_Type *base_type
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   if (base_type->anonymous ())
     {
@@ -1498,7 +1498,7 @@ ifr_adding_visitor::element_type (AST_Type *base_type
     {
       CORBA_Contained_var contained =
         be_global->repository ()->lookup_id (base_type->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (CORBA::is_nil (contained.in ()))
@@ -1511,14 +1511,14 @@ ifr_adding_visitor::element_type (AST_Type *base_type
         }
 
       this->ir_current_ = CORBA_IDLType::_narrow (contained.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 int
 ifr_adding_visitor::create_interface_def (AST_Interface *node
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   CORBA::ULong n_parents = ACE_static_cast (CORBA::ULong,
                                             node->n_inherits ());
@@ -1548,11 +1548,11 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
 
       result =
         be_global->repository ()->lookup_id (parents[i]->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       bases[i] = CORBA_InterfaceDef::_narrow (result.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (CORBA::is_nil (bases[i].in ()))
@@ -1582,7 +1582,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
                                node->local_name ()->get_string (),
                                node->version (),
                                bases
-                               TAO_ENV_ARG_PARAMETER
+                               ACE_ENV_ARG_PARAMETER
                              );
         }
       else
@@ -1593,7 +1593,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
                                node->local_name ()->get_string (),
                                node->version (),
                                bases
-                               TAO_ENV_ARG_PARAMETER
+                               ACE_ENV_ARG_PARAMETER
                              );
         }
 
@@ -1604,7 +1604,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
       // Push the new IR object onto the scope stack.
       CORBA_Container_var new_scope =
         CORBA_Container::_narrow (new_def.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
@@ -1672,7 +1672,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node
 
 void
 ifr_adding_visitor::get_referenced_type (AST_Type *node
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
 {
   switch (node->node_type ())
   {
@@ -1701,12 +1701,12 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node
       {
         CORBA_Contained_var prev_def =
           be_global->repository ()->lookup_id (node->repoID ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         this->ir_current_ =
           CORBA_IDLType::_narrow (prev_def.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
         break;
       }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
index 8aad716a169..e007e6fc60a 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
@@ -117,16 +117,16 @@ protected:
   // Determine the primitive type and insert into the Any.
 
   void element_type (AST_Type *base_type
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   // Creates or looks up the element type of an array or sequence,
   // and stores the result in ir_current_.
 
   int create_interface_def (AST_Interface *node
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   // Common code factored out of visit_interface().
 
   void get_referenced_type (AST_Type *node
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   // Utility method to update ir_current_ for struct members, union
   // members, operation parameters and operation return types.
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index 935b4629b9b..8cf19deac77 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -36,7 +36,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
 
   AST_Field **f = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Visit each field.
@@ -77,7 +77,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
           else
             {
               // Updates ir_current_.
-              this->get_referenced_type (ft TAO_ENV_ARG_PARAMETER);
+              this->get_referenced_type (ft ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -110,13 +110,13 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Is this union already in the respository?
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -135,7 +135,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
 
               CORBA_Contained_ptr tmp =
                 CORBA_Contained::_narrow (visitor.ir_current ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Since the enclosing ExceptionDef hasn't been created
@@ -155,7 +155,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -164,7 +164,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
 
           this->ir_current_ =
             CORBA_IDLType::_narrow (prev_def.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -185,12 +185,12 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (prev_def.in ()))
@@ -201,7 +201,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will create a new EnumDef entry.
@@ -245,7 +245,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
                                          node->local_name ()->get_string (),
                                          node->version (),
                                          this->members_
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -257,23 +257,23 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 
           CORBA_Container_var new_container =
             CORBA_Container::_narrow (new_def.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           for (size_t i = 0; i < size; ++i)
             {
               this->move_queue_.dequeue_head (traveller);
 
-              CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+              CORBA::String_var name = traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              CORBA::String_var version = traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER);
+              CORBA::String_var version = traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               traveller->move (new_container.in (),
                                name.in (),
                                version.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -297,13 +297,13 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 int
 ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Is this enum already in the respository?
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -334,13 +334,13 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
                                           node->local_name ()->get_string (),
                                           node->version (),
                                           members
-                                          TAO_ENV_ARG_PARAMETER
+                                          ACE_ENV_ARG_PARAMETER
                                         );
           ACE_TRY_CHECK;
 
           CORBA_Contained_ptr tmp =
             CORBA_Contained::_narrow (this->ir_current_.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->move_queue_.enqueue_tail (tmp);
@@ -355,7 +355,7 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -364,7 +364,7 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
 
           this->ir_current_ =
             CORBA_IDLType::_narrow (prev_def.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -385,13 +385,13 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_exception::visit_union (AST_Union *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Is this union already in the respository?
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -410,7 +410,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
 
               CORBA_Contained_ptr tmp =
                 CORBA_Contained::_narrow (visitor.ir_current ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Since the enclosing ExceptionDef hasn't been created
@@ -430,7 +430,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -439,7 +439,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
 
           this->ir_current_ =
             CORBA_IDLType::_narrow (prev_def.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
index d2da1df4f3a..cef132718d0 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
@@ -20,7 +20,7 @@ ifr_adding_visitor_operation::~ifr_adding_visitor_operation (void)
 int
 ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // If this operation is already in the repository (for example, if
@@ -30,7 +30,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
 
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (prev_def.in ()))
@@ -88,11 +88,11 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
 
           prev_def =
             be_global->repository ()->lookup_id (ex->repoID ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           exceptions[i++] = CORBA_ExceptionDef::_narrow (prev_def.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ex_iter.next ();
@@ -134,7 +134,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
 
       // Updates ir_current_.
       this->get_referenced_type (return_type
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Is the operation oneway?
@@ -150,7 +150,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
         {
           CORBA_InterfaceDef_var iface =
             CORBA_InterfaceDef::_narrow (current_scope
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_OperationDef_var new_def =
@@ -162,7 +162,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
                                      this->params_,
                                      exceptions,
                                      contexts
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -199,12 +199,12 @@ ifr_adding_visitor_operation::visit_argument (AST_Argument *node)
 
   AST_Type *arg_type = node->field_type ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Updates ir_current_.
       this->get_referenced_type (arg_type
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->params_[this->index_].type_def =
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index 33ac960b3ee..af1db91e347 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -39,7 +39,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
 
   AST_Field **f = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Visit each field.
@@ -90,7 +90,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
 
                   CORBA_Contained_ptr tmp =
                     CORBA_Contained::_narrow (visitor.ir_current ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   this->move_queue_.enqueue_tail (tmp);
@@ -114,7 +114,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
             {
               // Updates ir_current_.
               this->get_referenced_type (ft
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -147,12 +147,12 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -177,7 +177,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
                     node->local_name ()->get_string (),
                     node->version (),
                     this->members_
-                    TAO_ENV_ARG_PARAMETER
+                    ACE_ENV_ARG_PARAMETER
                   );
             }
           else
@@ -202,7 +202,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
                                    node->local_name ()->get_string (),
                                    node->version (),
                                    this->members_
-                                   TAO_ENV_ARG_PARAMETER
+                                   ACE_ENV_ARG_PARAMETER
                                 );
             }
 
@@ -216,24 +216,24 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 
               CORBA_Container_var new_container =
                 CORBA_Container::_narrow (this->ir_current_.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               for (size_t i = 0; i < size; ++i)
                 {
                   this->move_queue_.dequeue_head (traveller);
 
-                  CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+                  CORBA::String_var name = traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   CORBA::String_var version =
-                    traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER);
+                    traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   traveller->move (new_container.in (),
                                    name.in (),
                                    version.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -248,7 +248,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -257,7 +257,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 
           this->ir_current_ =
             CORBA_IDLType::_narrow (prev_def.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -278,13 +278,13 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Is this enum already in the respository?
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -315,13 +315,13 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
                                           node->local_name ()->get_string (),
                                           node->version (),
                                           members
-                                          TAO_ENV_ARG_PARAMETER
+                                          ACE_ENV_ARG_PARAMETER
                                         );
           ACE_TRY_CHECK;
 
           CORBA_Contained_ptr tmp =
             CORBA_Contained::_narrow (this->ir_current_.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Since the enclosing StructDef hasn't been created
@@ -340,7 +340,7 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -349,7 +349,7 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
 
           this->ir_current_ =
             CORBA_IDLType::_narrow (prev_def.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -370,13 +370,13 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_structure::visit_union (AST_Union *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Is this union already in the respository?
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -395,7 +395,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
 
               CORBA_Contained_ptr tmp =
                 CORBA_Contained::_narrow (visitor.ir_current ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Since the enclosing StructDef hasn't been created
@@ -415,7 +415,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -424,7 +424,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
 
           this->ir_current_ =
             CORBA_IDLType::_narrow (prev_def.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index 3a312f7b533..7646cc4d171 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -42,7 +42,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
   // Index into members_.
   CORBA::ULong index = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Visit each field.
@@ -93,7 +93,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
 
                   CORBA_Contained_ptr tmp =
                     CORBA_Contained::_narrow (visitor.ir_current ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   this->move_queue_.enqueue_tail (tmp);
@@ -117,7 +117,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
             {
               // Updates ir_current_.
               this->get_referenced_type (ft
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -202,13 +202,13 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_union::visit_structure (AST_Structure *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Is this struct already in the respository?
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -227,7 +227,7 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
 
               CORBA_Contained_ptr tmp =
                 CORBA_Contained::_narrow (visitor.ir_current ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Since the enclosing UnionDef hasn't been created
@@ -247,7 +247,7 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -256,7 +256,7 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
 
           this->ir_current_ =
             CORBA_IDLType::_narrow (prev_def.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -277,13 +277,13 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_union::visit_enum (AST_Enum *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Is this enum already in the respository?
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -312,13 +312,13 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
                                           node->local_name ()->get_string (),
                                           node->version (),
                                           members
-                                          TAO_ENV_ARG_PARAMETER
+                                          ACE_ENV_ARG_PARAMETER
                                         );
           ACE_TRY_CHECK;
 
           CORBA_Contained_ptr tmp =
             CORBA_Contained::_narrow (this->ir_current_.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Since the enclosing UnionDef hasn't been created
@@ -337,7 +337,7 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -346,7 +346,7 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
 
           this->ir_current_ =
             CORBA_IDLType::_narrow (prev_def.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -367,12 +367,12 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_union::visit_union (AST_Union *node)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -387,7 +387,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
             {
               CORBA_Contained_var disc_def =
                 be_global->repository ()->lookup_id (disc_type->repoID ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (CORBA::is_nil (disc_def.in ()))
@@ -404,10 +404,10 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
 
               CORBA_IDLType_var idl_def =
                 CORBA_IDLType::_narrow (disc_def.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              this->disc_tc_ = idl_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->disc_tc_ = idl_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -443,7 +443,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                     node->version (),
                     this->ir_current_.in (),
                     this->members_
-                    TAO_ENV_ARG_PARAMETER
+                    ACE_ENV_ARG_PARAMETER
                   );
             }
           else
@@ -469,7 +469,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                                    node->version (),
                                    this->ir_current_.in (),
                                    this->members_
-                                   TAO_ENV_ARG_PARAMETER
+                                   ACE_ENV_ARG_PARAMETER
                                 );
             }
 
@@ -483,24 +483,24 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
 
               CORBA_Container_var new_container =
                 CORBA_Container::_narrow (this->ir_current_.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               for (size_t i = 0; i < size; ++i)
                 {
                   this->move_queue_.dequeue_head (traveller);
 
-                  CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+                  CORBA::String_var name = traveller->name (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   CORBA::String_var version =
-                    traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER);
+                    traveller->version (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   traveller->move (new_container.in (),
                                    name.in (),
                                    version.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -515,7 +515,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              prev_def->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -524,7 +524,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
 
           this->ir_current_ =
             CORBA_IDLType::_narrow (prev_def.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
index 8baa46d085f..e4dd26f498d 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
@@ -26,7 +26,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
 
       AST_Decl *d = 0;
 
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
           // Continue until each element is visited.
@@ -54,7 +54,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
 
               CORBA_Contained_var top_level =
                 be_global->repository ()->lookup_id (d->repoID ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (!CORBA::is_nil (top_level.in ()))
@@ -62,7 +62,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
                   // All we have to do is call destroy() on each IR object
                   // in the global scope, because destroy() works on all
                   // the contents recursively.
-                  top_level->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+                  top_level->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
index d09725910c3..fd33d0a8f7e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
@@ -23,7 +23,7 @@ CORBA::Boolean
 ImR_Adapter_Activator::unknown_adapter (
   PortableServer::POA_ptr parent,
   const char *name
-  TAO_ENV_ARG_DECL
+  ACE_ENV_ARG_DECL
 )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -38,41 +38,41 @@ ImR_Adapter_Activator::unknown_adapter (
       exception_message = "While PortableServer::POA::create_servant_retention_policy";
       policies[0] =
         parent->create_servant_retention_policy
-                  (PortableServer::NON_RETAIN TAO_ENV_ARG_PARAMETER);
+                  (PortableServer::NON_RETAIN ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy
       exception_message = "While PortableServer::POA::create_request_processing_policy";
       policies[1] =
         parent->create_request_processing_policy
-                  (PortableServer::USE_SERVANT_MANAGER TAO_ENV_ARG_PARAMETER);
+                  (PortableServer::USE_SERVANT_MANAGER ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        parent->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        parent->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While create_POA";
       PortableServer::POA_var child = parent->create_POA (name,
                                                           poa_manager.in (),
                                                           policies
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While unknown_adapter::policy->destroy";
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       exception_message = "While child->the_activator";
-      child->the_activator (this TAO_ENV_ARG_PARAMETER);
+      child->the_activator (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       exception_message = "While unknown_adapter, set_servant_manager";
-      child->set_servant_manager(this->servant_locator_ TAO_ENV_ARG_PARAMETER);
+      child->set_servant_manager(this->servant_locator_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
index 5d04049f033..62757907e07 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
@@ -36,7 +36,7 @@ public:
   virtual CORBA::Boolean unknown_adapter (
     PortableServer::POA_ptr parent,
     const char *name
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 58513682945..ad8be8e9524 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -31,11 +31,11 @@ ImR_Forwarder::ImR_Forwarder (ImplRepo_i *imr_impl)
   ACE_TRY_NEW_ENV
     {
       CORBA::Object_var tmp =
-        orb->resolve_initial_references ("POACurrent" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("POACurrent" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->poa_current_var_ =
-        PortableServer::Current::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::Current::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -65,7 +65,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
                           PortableServer::POA_ptr poa,
                           const char *,
                           PortableServer::ServantLocator::Cookie &
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest))
 {
   CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
@@ -79,7 +79,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
 
       ior = this->imr_impl_->activate_server_i (poa->the_name (),
                                                 1
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Add the key
@@ -99,7 +99,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
       if (OPTIONS::instance()->debug () >= 2)
         ACE_DEBUG ((LM_DEBUG, "Forwarding to %s\n", ior.c_str ()));
 
-      forward_obj = orb->string_to_object (ior.c_str () TAO_ENV_ARG_PARAMETER);
+      forward_obj = orb->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -136,7 +136,7 @@ ImR_Forwarder::postinvoke (const PortableServer::ObjectId &,
                            const char * ,
                            PortableServer::ServantLocator::Cookie ,
                            PortableServer::Servant servant
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   delete servant;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
index a95348523b6..0bab6ef87d5 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
@@ -39,7 +39,7 @@ public:
     PortableServer::POA_ptr poa,
     const char * operation,
     PortableServer::ServantLocator::Cookie &cookie
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest));
 
   /// Called after the invocation finishes.
@@ -48,7 +48,7 @@ public:
                            const char * operation,
                            PortableServer::ServantLocator::Cookie cookie,
                            PortableServer::Servant servant
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp
index 6edb2e11821..b5a26810c3d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp
@@ -13,7 +13,7 @@ run_standalone (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int status = server.init (TAO_ENV_SINGLE_ARG_PARAMETER);
+      int status = server.init (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == -1)
@@ -22,10 +22,10 @@ run_standalone (void)
         }
       else
         {
-          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          status = server.fini (TAO_ENV_SINGLE_ARG_PARAMETER);
+          status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (status == -1)
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 98bedf49b8e..9f21638073d 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -46,7 +46,7 @@ ImplRepo_i::ImplRepo_i (void)
 
 char *
 ImplRepo_i::find_ior (const ACE_CString &object_name
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
   ACE_TString endpoint;
@@ -68,7 +68,7 @@ ImplRepo_i::find_ior (const ACE_CString &object_name
   ACE_TRY
     {
       endpoint = this->activate_server_i (poa_name.c_str (), 1
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -97,21 +97,21 @@ ImplRepo_i::find_ior (const ACE_CString &object_name
 
 void
 ImplRepo_i::activate_server (const char *server
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound,
                      ImplementationRepository::Administration::CannotActivate))
 {
   // Since this is called through the Admin interface, we should ignore some
   // of the activation modes.  Also ignore the return value.
-  this->activate_server_i (server, 0 TAO_ENV_ARG_PARAMETER);
+  this->activate_server_i (server, 0 ACE_ENV_ARG_PARAMETER);
 }
 
 
 ACE_TString
 ImplRepo_i::activate_server_i (const char *server,
                                const int check_startup
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound,
                      ImplementationRepository::Administration::CannotActivate))
@@ -158,11 +158,11 @@ ImplRepo_i::activate_server_i (const char *server,
       ACE_TRY
         {
           CORBA::Object_var object =
-            orb->string_to_object (server_object_ior.c_str () TAO_ENV_ARG_PARAMETER);
+            orb->string_to_object (server_object_ior.c_str () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ImplementationRepository::ServerObject_var server_object =
-            ImplementationRepository::ServerObject::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+            ImplementationRepository::ServerObject::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (server_object.in ()))
@@ -174,7 +174,7 @@ ImplRepo_i::activate_server_i (const char *server,
             }
 
           // Check to see if we can ping it
-          server_object->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server_object->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -229,7 +229,7 @@ ImplRepo_i::activate_server_i (const char *server,
 
 void
 ImplRepo_i::start_server_i (const char *server
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound,
                      ImplementationRepository::Administration::CannotActivate))
@@ -399,7 +399,7 @@ ImplRepo_i::ready_check (const char *server)
   ACE_TString ping_object_ior, location;
   ImplementationRepository::ServerObject_var ping_object;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   // <end> is the end of the window where we can get a response before
   // timing out
@@ -428,12 +428,12 @@ ImplRepo_i::ready_check (const char *server)
   ACE_TRY_EX (ping1)
     {
       CORBA::Object_var object =
-        orb->string_to_object (ping_object_ior.c_str () TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ping_object_ior.c_str () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (ping1);
 
       ping_object =
         ImplementationRepository::ServerObject::_narrow (object.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (ping1);
 
       if (CORBA::is_nil (ping_object.in ()))
@@ -471,7 +471,7 @@ ImplRepo_i::ready_check (const char *server)
           if (OPTIONS::instance()->debug () >= 2)
             ACE_DEBUG ((LM_DEBUG, "Pinging Server...\n"));
 
-          ping_object->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ping_object->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (ping2);
 
           if (OPTIONS::instance()->debug () >= 2)
@@ -504,7 +504,7 @@ ImplRepo_i::ready_check (const char *server)
 void
 ImplRepo_i::register_server (const char *server,
                              const ImplementationRepository::StartupOptions &options
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::AlreadyRegistered))
 {
@@ -576,7 +576,7 @@ ImplRepo_i::register_server (const char *server,
 void
 ImplRepo_i::reregister_server (const char *server,
                                const ImplementationRepository::StartupOptions &options
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (OPTIONS::instance ()->readonly ())
@@ -628,7 +628,7 @@ ImplRepo_i::reregister_server (const char *server,
 
 void
 ImplRepo_i::remove_server (const char *server
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound))
 {
@@ -658,7 +658,7 @@ char *
 ImplRepo_i::server_is_running (const char *server,
                                const char *location,
                                ImplementationRepository::ServerObject_ptr server_object
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound))
 {
@@ -673,7 +673,7 @@ ImplRepo_i::server_is_running (const char *server,
 
   // Get the stringified server_object_ior
   ACE_TCHAR *server_object_ior = orb->object_to_string (server_object
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (this->repository_.update (server, location, server_object_ior) == 0)
@@ -720,7 +720,7 @@ ImplRepo_i::server_is_running (const char *server,
 
   if (profile)
     {
-      new_location = profile->to_string (TAO_ENV_SINGLE_ARG_PARAMETER);
+      new_location = profile->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   else
@@ -751,7 +751,7 @@ ImplRepo_i::server_is_running (const char *server,
 
 void
 ImplRepo_i::server_is_shutting_down (const char *server
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      ImplementationRepository::Administration::NotFound))
 {
@@ -774,18 +774,18 @@ ImplRepo_i::server_is_shutting_down (const char *server
 
 
 int
-ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL)
+ImplRepo_i::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
 
   ACE_TRY
     {
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -793,12 +793,12 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL)
         }
       else
         {
-          adapter->set_locator (this->locator_.in () TAO_ENV_ARG_PARAMETER);
+          adapter->set_locator (this->locator_.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       CORBA::Object_var root_poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa_object.in ()))
@@ -808,11 +808,11 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL)
 
       // Get the POA object.
       this->root_poa_ = PortableServer::POA::_narrow (root_poa_object.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList policies (2);
@@ -821,20 +821,20 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL)
       // Id Assignment policy
       policies[0] =
         this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan policy
       policies[1] =
         this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->imr_poa_ =
         this->root_poa_->create_POA ("ImplRepoService",
                                      poa_manager.in (),
                                      policies
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 
       // Warning!  If create_POA fails, then the policies won't be
       // destroyed and there will be hell to pay in memory leaks!
@@ -844,7 +844,7 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL)
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -857,23 +857,23 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL)
 
       this->imr_poa_->activate_object_with_id (imr_id.in (),
                                                this
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the IMR object
       CORBA::Object_var imr_obj =
-        this->imr_poa_->id_to_reference (imr_id.in () TAO_ENV_ARG_PARAMETER);
+        this->imr_poa_->id_to_reference (imr_id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // And its string
 
       this->imr_ior_ =
-        orb->object_to_string (imr_obj.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (imr_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register with INS.
       adapter->bind ("ImplRepoService", this->imr_ior_.in ()
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (OPTIONS::instance ()->debug () >= 2)
@@ -896,7 +896,7 @@ ImplRepo_i::init (TAO_ENV_SINGLE_ARG_DECL)
       // Register the Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
 
-      this->root_poa_->the_activator (this->activator_ TAO_ENV_ARG_PARAMETER);
+      this->root_poa_->the_activator (this->activator_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get reactor instance from TAO.
@@ -1025,18 +1025,18 @@ ImplRepo_i::setup_multicast (ACE_Reactor *reactor)
 
 
 int
-ImplRepo_i::fini (TAO_ENV_SINGLE_ARG_DECL)
+ImplRepo_i::fini (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
 
   ACE_TRY
     {
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -1045,14 +1045,14 @@ ImplRepo_i::fini (TAO_ENV_SINGLE_ARG_DECL)
       else
         {
           adapter->set_locator (IORTable::Locator::_nil ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      this->imr_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      this->imr_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->root_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1066,13 +1066,13 @@ ImplRepo_i::fini (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-ImplRepo_i::run (TAO_ENV_SINGLE_ARG_DECL)
+ImplRepo_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
 
   PortableServer::POAManager_var poa_manager =
-    this->imr_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->imr_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get a new iterator
@@ -1108,7 +1108,7 @@ ImplRepo_i::run (TAO_ENV_SINGLE_ARG_DECL)
         {
           if (activation == ImplementationRepository::AUTO_START)
             this->activate_server (server_entry->ext_id_.c_str ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -1126,7 +1126,7 @@ ImplRepo_i::run (TAO_ENV_SINGLE_ARG_DECL)
     }
 
 
-  orb->run (0 TAO_ENV_ARG_PARAMETER);
+  orb->run (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -1158,7 +1158,7 @@ ImplRepo_i::~ImplRepo_i (void)
 void
 ImplRepo_i::find (const char *server,
                   ImplementationRepository::ServerInformation_out info
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ImplementationRepository::Administration::NotFound))
 {
@@ -1202,7 +1202,7 @@ void
 ImplRepo_i::list (CORBA::ULong how_many,
                   ImplementationRepository::ServerInformationList_out server_list,
                   ImplementationRepository::ServerInformationIterator_out server_iterator
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Initialize the out variables, so if we return early, they will
@@ -1285,9 +1285,9 @@ ImplRepo_i::list (CORBA::ULong how_many,
       ACE_TRY
         {
           PortableServer::ObjectId_var id =
-            this->root_poa_->activate_object (imr_iter TAO_ENV_ARG_PARAMETER);
+            this->root_poa_->activate_object (imr_iter ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          server_iterator = imr_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server_iterator = imr_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -1306,7 +1306,7 @@ ImplRepo_i::list (CORBA::ULong how_many,
  */
 void
 ImplRepo_i::shutdown_server (const char *server
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    ImplementationRepository::Administration::NotFound))
 {
@@ -1332,12 +1332,12 @@ ImplRepo_i::shutdown_server (const char *server
       ACE_TRY
         {
           CORBA::Object_var object =
-            orb->string_to_object (server_object_ior.c_str () TAO_ENV_ARG_PARAMETER);
+            orb->string_to_object (server_object_ior.c_str () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ImplementationRepository::ServerObject_var server_object =
             ImplementationRepository::ServerObject::_narrow (object.in ()
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (server_object.in ()))
@@ -1349,7 +1349,7 @@ ImplRepo_i::shutdown_server (const char *server
             }
 
           // Call shutdown
-          server_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Remove running info from repository
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
index bbc674f5454..7975ab0fd73 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
@@ -40,7 +40,7 @@ public:
 
   /// IOR_LookupTable_Callback method.  Will return an IOR
   char *find_ior (const ACE_CString &object_name
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound));
 
   // = Interface methods
@@ -48,7 +48,7 @@ public:
   /// Starts up the server <server> if not already running.
   virtual void activate_server (
       const char *server
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((
           CORBA::SystemException,
           ImplementationRepository::Administration::NotFound,
@@ -60,7 +60,7 @@ public:
   virtual void register_server (
       const char *server,
       const ImplementationRepository::StartupOptions &options
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((
           CORBA::SystemException,
           ImplementationRepository::Administration::AlreadyRegistered
@@ -70,20 +70,20 @@ public:
   virtual void reregister_server (
       const char *server,
       const ImplementationRepository::StartupOptions &options
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Removes the server <server> from the repository.
   virtual void remove_server (
       const char *server
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException,
                        ImplementationRepository::Administration::NotFound));
 
   /// Attempts to gracefully shut down the server,
   virtual void shutdown_server (
       const char *server
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException,
                        ImplementationRepository::Administration::NotFound));
 
@@ -93,14 +93,14 @@ public:
       const char *server,
       const char *location,
       ImplementationRepository::ServerObject_ptr server_object
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException,
                        ImplementationRepository::Administration::NotFound));
 
   /// What the server should call before it shuts down.
   virtual void server_is_shutting_down (
       const char *server
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException,
                        ImplementationRepository::Administration::NotFound));
 
@@ -108,7 +108,7 @@ public:
   virtual void find (
       const char *server,
       ImplementationRepository::ServerInformation_out info
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException,
                        ImplementationRepository::Administration::NotFound));
 
@@ -118,17 +118,17 @@ public:
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
       ImplementationRepository::ServerInformationIterator_out server_iterator
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Initialize the Server state - parsing arguments and waiting.
-  int init (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Cleans up any state created by init ().
-  int fini (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int fini (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Runs the orb.
-  int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 private:
   /// Implementation of activate_server.  <check_startup> is a flag to check
@@ -136,7 +136,7 @@ private:
   ACE_TString activate_server_i (
       const char *server,
       const int check_startup
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((
           CORBA::SystemException,
           ImplementationRepository::Administration::NotFound,
@@ -146,7 +146,7 @@ private:
   /// This method starts the server process.
   void start_server_i (
       const char *server
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) ACE_THROW_SPEC ((
           CORBA::SystemException,
           ImplementationRepository::Administration::NotFound,
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
index 3792e57cdca..7f89237359f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.cpp
@@ -37,7 +37,7 @@ ImR_Iterator::~ImR_Iterator ()
 CORBA::Boolean
 ImR_Iterator::next_n (CORBA::ULong how_many,
                       ImplementationRepository::ServerInformationList_out server_list
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (server_list,
@@ -95,7 +95,7 @@ ImR_Iterator::next_n (CORBA::ULong how_many,
 // Destroys the iterator.
 
 void
-ImR_Iterator::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ImR_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
index bd71a088a57..295d45020fc 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
@@ -41,12 +41,12 @@ public:
   virtual CORBA::Boolean next_n (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroys the iterator.
-  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));
 
 private:
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator.cpp
index dc20a2d05a5..701a2f0665e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator.cpp
@@ -20,11 +20,11 @@ ImR_Locator::ImR_Locator (ImplRepo_i *repo)
 
 char *
 ImR_Locator::locate (const char *object_key
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound))
 {
   ACE_CString key (object_key);
-  return this->repo_->find_ior (key TAO_ENV_ARG_PARAMETER);
+  return this->repo_->find_ior (key ACE_ENV_ARG_PARAMETER);
 }
 
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator.h b/TAO/orbsvcs/ImplRepo_Service/Locator.h
index 3e022341c1e..b0e724a9b24 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator.h
@@ -43,7 +43,7 @@ public:
 
   /// Locate the appropriate IOR.
   char * locate (const char *object_key
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, IORTable::NotFound));
 
 private:
diff --git a/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp
index 4d8c96055aa..246b02179ed 100644
--- a/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp
@@ -79,7 +79,7 @@ ImR_NT_Service::svc (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      status = server.init (TAO_ENV_SINGLE_ARG_PARAMETER);
+      status = server.init (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == -1)
@@ -89,10 +89,10 @@ ImR_NT_Service::svc (void)
       else
         {
           report_status (SERVICE_RUNNING);
-          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          status = server.fini (TAO_ENV_SINGLE_ARG_PARAMETER);
+          status = server.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (status == -1)
diff --git a/TAO/orbsvcs/ImplRepo_Service/Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Options.cpp
index 3e4b9bfbf9d..969df4d9eac 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Options.cpp
@@ -250,7 +250,7 @@ Options::init (int argc, ACE_TCHAR *argv[])
       this->orb_ = CORBA::ORB_init (orb_argc,
                                     orb_args.argv (),
                                     0
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 95436d37a0d..6ef4001910f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -55,14 +55,14 @@ TAO_IMR_i::init (int argc, char **argv)
 
   const char *exception_message = "Null Message";
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     "internet"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -72,7 +72,7 @@ TAO_IMR_i::init (int argc, char **argv)
       // Get the ImplRepo object
 
       CORBA::Object_var implrepo_object =
-        orb_->resolve_initial_references ("ImplRepoService" TAO_ENV_ARG_PARAMETER);
+        orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (implrepo_object.in ()))
@@ -85,7 +85,7 @@ TAO_IMR_i::init (int argc, char **argv)
       exception_message = "While narrowing ImplRepo";
       this->implrepo_ =
         ImplementationRepository::Administration::_narrow
-                               (implrepo_object.in() TAO_ENV_ARG_PARAMETER);
+                               (implrepo_object.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->op_->set_imr (this->implrepo_.in ());
@@ -615,11 +615,11 @@ TAO_IMR_Op_Update::parse (int argc, ACE_TCHAR **argv)
 int
 TAO_IMR_Op_Activate::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->implrepo_->activate_server
-                        (this->server_name_.c_str () TAO_ENV_ARG_PARAMETER);
+                        (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Successfully Activated server <%s>\n", this->server_name_.c_str ()));
@@ -657,11 +657,11 @@ TAO_IMR_Op_Add::run (void)
   startup_options.working_directory = CORBA::string_dup (this->working_dir_.c_str ());
   startup_options.activation = this->activation_;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->implrepo_->register_server
-          (this->server_name_.c_str (), startup_options TAO_ENV_ARG_PARAMETER);
+          (this->server_name_.c_str (), startup_options ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Successfully registered server <%s>\n", this->server_name_.c_str ()));
@@ -693,10 +693,10 @@ TAO_IMR_Op_Autostart::run (void)
   ImplementationRepository::ServerInformationList_var server_list;
   ImplementationRepository::ServerInformationIterator_var server_iter;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->implrepo_->list (0, server_list, server_iter TAO_ENV_ARG_PARAMETER);
+      this->implrepo_->list (0, server_list, server_iter ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check for more to be displayed
@@ -708,7 +708,7 @@ TAO_IMR_Op_Autostart::run (void)
             {
               flag = server_iter->next_n (IR_LIST_CHUNK,
                                           server_list
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               for (size_t i = 0; i < server_list->length (); i++)
@@ -716,7 +716,7 @@ TAO_IMR_Op_Autostart::run (void)
                   ACE_TRY_EX (inside)
                     {
                       this->implrepo_->activate_server (server_list[i].server.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK_EX (inside);
                     }
                   ACE_CATCHANY
@@ -761,7 +761,7 @@ TAO_IMR_Op_IOR::run (void)
         }
 
       CORBA::String_var imr_str =
-        this->implrepo_->_stubobj ()->profile_in_use ()->to_string (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->implrepo_->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Search for "corbaloc:" alone, without the protocol.  This code
@@ -830,7 +830,7 @@ TAO_IMR_Op_List::run (void)
   ImplementationRepository::ServerInformationList_var server_list;
   ImplementationRepository::ServerInformationIterator_var server_iter;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // If there is a server name, list only that server.  Otherwise, look
@@ -838,7 +838,7 @@ TAO_IMR_Op_List::run (void)
       if (this->server_name_.length () == 0)
         {
           this->implrepo_->list
-               (IR_LIST_CHUNK, server_list, server_iter TAO_ENV_ARG_PARAMETER);
+               (IR_LIST_CHUNK, server_list, server_iter ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           for (size_t i = 0; i < server_list->length (); i++)
@@ -852,7 +852,7 @@ TAO_IMR_Op_List::run (void)
               while (flag)
                 {
                   flag = server_iter->next_n
-                           (IR_LIST_CHUNK, server_list TAO_ENV_ARG_PARAMETER);
+                           (IR_LIST_CHUNK, server_list ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   for (size_t i = 0; i < server_list->length (); i++)
@@ -868,7 +868,7 @@ TAO_IMR_Op_List::run (void)
           ImplementationRepository::ServerInformation_var server_information;
 
           this->implrepo_->find
-             (this->server_name_.c_str (), server_information TAO_ENV_ARG_PARAMETER);
+             (this->server_name_.c_str (), server_information ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Display verbosely
@@ -895,11 +895,11 @@ TAO_IMR_Op_List::run (void)
 int
 TAO_IMR_Op_Remove::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->implrepo_->remove_server
-                         (this->server_name_.c_str () TAO_ENV_ARG_PARAMETER);
+                         (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Successfully removed server <%s>\n", this->server_name_.c_str ()));
@@ -928,11 +928,11 @@ TAO_IMR_Op_Remove::run (void)
 int
 TAO_IMR_Op_Shutdown::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->implrepo_->shutdown_server
-                         (this->server_name_.c_str () TAO_ENV_ARG_PARAMETER);
+                         (this->server_name_.c_str () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Successfully shut down server <%s>\n", this->server_name_.c_str ()));
@@ -958,11 +958,11 @@ TAO_IMR_Op_Update::run (void)
 {
   ImplementationRepository::ServerInformation_var server_information;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->implrepo_->find
-        (this->server_name_.c_str (), server_information TAO_ENV_ARG_PARAMETER);
+        (this->server_name_.c_str (), server_information ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Conditionally update the startup options
@@ -981,7 +981,7 @@ TAO_IMR_Op_Update::run (void)
 
       this->implrepo_->reregister_server (this->server_name_.c_str (),
                                           server_information->startup
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->display_server_information (server_information.in ());
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index ba2e7bf843c..796712d4f5f 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -27,7 +27,7 @@ Criteria_Evaluator::~Criteria_Evaluator ()
 }
 
 LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *
-Criteria_Evaluator::getInitialization (TAO_ENV_SINGLE_ARG_DECL)
+Criteria_Evaluator::getInitialization (ACE_ENV_SINGLE_ARG_DECL)
 {
   LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *sequence_ptr = 0;
 
@@ -45,7 +45,7 @@ Criteria_Evaluator::getInitialization (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-Criteria_Evaluator::getFilter (TAO_ENV_SINGLE_ARG_DECL)
+Criteria_Evaluator::getFilter (ACE_ENV_SINGLE_ARG_DECL)
 {
   const char* string;
   CORBA::Any value;
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
index 13569acd21f..d170b8fdca1 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
@@ -28,16 +28,16 @@ public:
   Criteria_Evaluator (const CosLifeCycle::Criteria &criteria);
   ~Criteria_Evaluator (void);
 
-  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
-  char * getFilter (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  char * getFilter (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
-  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     {
       return 0;
     }
 
-  char * getPreferences (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  char * getPreferences (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     {
       return 0;
     }
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
index c7aaac86248..8d2448ba833 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
@@ -47,7 +47,7 @@ Factory_Trader::Factory_Trader (int debug_level)
 
       // Set the service type repository
       support_Attributes_ptr_->type_repos
-                     (this->repository_._this (TAO_ENV_SINGLE_ARG_PARAMETER));
+                     (this->repository_._this (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_TRY_CHECK;
 
       // Add the "Factory" type to the repository
@@ -102,7 +102,7 @@ Factory_Trader::add_type ()
                                   GENERIC_FACTORY_INTERFACE_REPOSITORY_ID,
                                   propStructSeq,
                                   superTypeSeq
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -147,7 +147,7 @@ Factory_Trader::_cxx_export (const char * name,
       register_ptr->_cxx_export (CORBA::Object::_duplicate (object_ptr),
                                  CORBA::string_dup("GenericFactory"),
                                  propertySeq
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
@@ -192,7 +192,7 @@ Factory_Trader::query (const char* constraint)
                          CosTrading::OfferSeq_out(offerSeq_ptr),               // results
                          CosTrading::OfferIterator_out(offerIterator_ptr),     // more results
                          CosTrading::PolicyNameSeq_out(policyNameSeq_ptr)      // Policies
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
index 61bdbefd797..c2459100086 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
@@ -31,7 +31,7 @@ Life_Cycle_Service_Server::~Life_Cycle_Service_Server (void)
       CosNaming::Name generic_Factory_Name (2);
       generic_Factory_Name.length (2);
       generic_Factory_Name[0].id = CORBA::string_dup ("LifeCycle_Service");
-      this->namingContext_var_->unbind (generic_Factory_Name TAO_ENV_ARG_PARAMETER);
+      this->namingContext_var_->unbind (generic_Factory_Name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -44,13 +44,13 @@ Life_Cycle_Service_Server::~Life_Cycle_Service_Server (void)
 int
 Life_Cycle_Service_Server::init (int argc,
                                      char *argv[]
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   int retval = 0;
 
   retval = this->orb_manager_.init (argc,
                                     argv
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (retval == -1)
@@ -61,7 +61,7 @@ Life_Cycle_Service_Server::init (int argc,
 
 
   // Activate the POA manager
-  retval = this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+  retval = this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (retval == -1)
@@ -82,7 +82,7 @@ Life_Cycle_Service_Server::init (int argc,
   // Activate the object.
   CORBA::String_var str  =
     this->orb_manager_.activate (this->life_Cycle_Service_i_ptr_
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->debug_level_ >= 2)
@@ -97,7 +97,7 @@ Life_Cycle_Service_Server::init (int argc,
 
       // Get the Naming Service object reference.
       CORBA::Object_var namingObj_var =
-        orb_manager_.orb()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb_manager_.orb()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (namingObj_var.in ()))
@@ -106,7 +106,7 @@ Life_Cycle_Service_Server::init (int argc,
 
       // Narrow the object reference to a Naming Context.
       namingContext_var_ = CosNaming::NamingContext::_narrow (namingObj_var.in ()
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -122,12 +122,12 @@ Life_Cycle_Service_Server::init (int argc,
       life_Cycle_Service_Name.length (1);
       life_Cycle_Service_Name[0].id = CORBA::string_dup ("Life_Cycle_Service");
 
-      CORBA::Object_ptr tmp = this->life_Cycle_Service_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Object_ptr tmp = this->life_Cycle_Service_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       namingContext_var_->bind (life_Cycle_Service_Name,
                                 tmp
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->debug_level_ >= 2)
@@ -145,13 +145,13 @@ Life_Cycle_Service_Server::init (int argc,
 
 
 int
-Life_Cycle_Service_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+Life_Cycle_Service_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nLifeCycle Service: Life_Cycle_Service_Server is running\n"));
 
-  orb_manager_.orb()->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  orb_manager_.orb()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -202,14 +202,14 @@ main (int argc, char *argv [])
     {
       int check = life_Cycle_Service_Server.init (argc,
                                                   argv
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (check)
         return 1;
       else
         {
-          life_Cycle_Service_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          life_Cycle_Service_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK
         }
     }
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
index 371e2a98c26..80efaaf5bd3 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
@@ -39,10 +39,10 @@ public:
 
   int init (int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Server state - parsing arguments and ...
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
   u_int parse_args (void);
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
index 854b21687a2..61e19fe726e 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
@@ -35,7 +35,7 @@ Life_Cycle_Service_i::~Life_Cycle_Service_i (void)
 
 CORBA::Boolean
 Life_Cycle_Service_i::supports (const CosLifeCycle::Key &
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -44,7 +44,7 @@ Life_Cycle_Service_i::supports (const CosLifeCycle::Key &
 CORBA::Object_ptr
 Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
                                      const CosLifeCycle::Criteria &the_criteria
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosLifeCycle::NoFactory,
                    CosLifeCycle::InvalidCriteria,
@@ -64,7 +64,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: getFilter will be called.\n"));
 
-      char* filter = criteria_Evaluator.getFilter (TAO_ENV_SINGLE_ARG_PARAMETER);
+      char* filter = criteria_Evaluator.getFilter (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (this->debug_level_ >= 2)
@@ -97,7 +97,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
             {
               genericFactory_var =
                 CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
               // ACE_TRY_CHECK;
             }
           ACE_CATCHANY
@@ -120,7 +120,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
           // Now retrieve the Object obj ref corresponding to the key.
           CORBA::Object_var object_var = genericFactory_var->create_object (factory_key,
                                                                             the_criteria
-                                                                            TAO_ENV_ARG_PARAMETER);
+                                                                            ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (this->debug_level_ >= 2)
@@ -150,7 +150,7 @@ Life_Cycle_Service_i::register_factory (const char * name,
                                         const char * location,
                                         const char * description,
                                         CORBA::Object_ptr object
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (( CORBA::SystemException))
 {
   if (factory_trader_ptr_ == 0)
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
index dc0cbb4c0f6..2997da242a5 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
@@ -30,14 +30,14 @@ public:
   ~Life_Cycle_Service_i (void);
 
   CORBA::Boolean supports (const CosLifeCycle::Key &factory_key
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns true if the Generic Factory is able to forward a request
   // for creating an object described by the <factory_key>.
 
   CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key,
                                    const CosLifeCycle::Criteria &the_criteria
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
                        CosLifeCycle::InvalidCriteria,
@@ -50,7 +50,7 @@ public:
                          const char * location,
                          const char * description,
                          CORBA::Object_ptr object
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC (( CORBA::SystemException));
 
   // Registers a factory with specified properties
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp
index 1ca665677c6..86dd1465a60 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.cpp
@@ -24,7 +24,7 @@ TAO_LoadBalancer::~TAO_LoadBalancer (void)
 void
 TAO_LoadBalancer::parse_args (int argc,
                               char *argv[]
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   ACE_Get_Opt get_opts (argc, argv, "i:o:s:h");
 
@@ -65,31 +65,31 @@ TAO_LoadBalancer::parse_args (int argc,
 void
 TAO_LoadBalancer::init (int argc,
                         char *argv[]
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
-  this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+  this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the POA from the ORB.
   CORBA::Object_var poa =
-    this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the POA object.
   this->root_poa_ = PortableServer::POA::_narrow (poa.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the POA_Manager.
   PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Check the non-ORB arguments.
-  this->parse_args (argc, argv TAO_ENV_ARG_PARAMETER);
+  this->parse_args (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Initialize the LoadBalancer servant.
@@ -104,11 +104,11 @@ TAO_LoadBalancer::init (int argc,
                                 this->root_poa_.in ()));
 
   CORBA::Object_var obj =
-    this->balancer_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->balancer_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   FILE *lb_ior = ACE_OS::fopen (this->load_balancer_file_, "w");
@@ -129,7 +129,7 @@ TAO_LoadBalancer::usage (const char *cmd) const
 }
 
 void
-TAO_LoadBalancer::run (TAO_ENV_SINGLE_ARG_DECL)
+TAO_LoadBalancer::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer.h b/TAO/orbsvcs/LoadBalancer/LoadBalancer.h
index 4c0b97a425c..d64eb3388df 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer.h
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer.h
@@ -39,15 +39,15 @@ public:
   // Destructor.
 
   void init (int argc, char *argv[]
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize the service
 
-  void run (TAO_ENV_SINGLE_ARG_DECL);
+  void run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the TAO_Loadbalancer.
 
 protected:
   void parse_args (int argc, char *argv[]
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
   // parses the arguments.
 
   void usage (const char *msg) const;
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp b/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp
index bc77f0cb4e0..75537c32ca5 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.cpp
@@ -10,15 +10,15 @@ int
 main (int argc, char *argv[])
 {
   // @@ Ossama: i'm not sure what the LoadBalancer class buys you.
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       TAO_LoadBalancer balancer;
 
-      balancer.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      balancer.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      balancer.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      balancer.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Logging_Service.cpp
index 576e9eaef6f..95baa3d07b1 100644
--- a/TAO/orbsvcs/Logging_Service/Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Logging_Service.cpp
@@ -17,58 +17,58 @@ Logging_Service::~Logging_Service (void)
 
 void
 Logging_Service::init_ORB  (int& argc, char *argv []
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
                                 ""
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var poa_object  =
     this->orb_->resolve_initial_references("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->poa_ =
     PortableServer::POA::_narrow (poa_object.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Logging_Service::startup (int argc, char *argv[]
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nStarting up the Telecom Log Service...\n"));
 
   // initalize the ORB.
   this->init_ORB (argc, argv
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Resolve the naming service.
-  this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Activate the basic log factory
   // CORBA::Object_var obj =
   DsLogAdmin::BasicLogFactory_var obj =
     this->basic_log_factory_.activate (this->poa_.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ACE_ASSERT (!CORBA::is_nil (obj.in ()));
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -83,7 +83,7 @@ Logging_Service::startup (int argc, char *argv[]
 
   this->naming_->rebind (name,
                          obj.in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -92,11 +92,11 @@ Logging_Service::startup (int argc, char *argv[]
 }
 
 void
-Logging_Service::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+Logging_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -105,7 +105,7 @@ Logging_Service::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 
   this->naming_ =
     CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -114,10 +114,10 @@ Logging_Service::run (void)
 {
   ACE_DEBUG ((LM_DEBUG, "%s: Running the Telecom Log Service\n", __FILE__));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -130,17 +130,17 @@ Logging_Service::run (void)
 }
 
 void
-Logging_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate.
   PortableServer::ObjectId_var oid =
     this->poa_->servant_to_id (&this->basic_log_factory_
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate from the poa.
   this->poa_->deactivate_object (oid.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Unbind from the naming service.
@@ -149,7 +149,7 @@ Logging_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   name[0].id = CORBA::string_dup (this->basic_log_factory_name_);
 
   this->naming_->unbind (name
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 
   // shutdown the ORB.
   if (!CORBA::is_nil (this->orb_.in ()))
@@ -165,7 +165,7 @@ main (int argc, char *argv[])
     {
       service.startup (argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (service.run () == -1)
diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service.h b/TAO/orbsvcs/Logging_Service/Logging_Service.h
index d81f88a429b..b2cdd7d7b2e 100644
--- a/TAO/orbsvcs/Logging_Service/Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Logging_Service.h
@@ -40,7 +40,7 @@ class Logging_Service
   // Parses the command line arguments.
 
   void startup (int argc, char *argv[]
-               TAO_ENV_ARG_DECL);
+               ACE_ENV_ARG_DECL);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -48,16 +48,16 @@ class Logging_Service
   // run the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Shutdown the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
 protected:
   void init_ORB (int& argc, char *argv []
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
   // initialize the ORB.
 
-  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Resolve the naming service.
 
   // = Data members
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index 0103758770f..cf629267ac2 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -137,7 +137,7 @@ TAO_NT_Naming_Service::svc (void)
   ACE_TRY
     {
       report_status (SERVICE_RUNNING);
-      naming_service.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      naming_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
index 6086e92078e..6883aebbb5d 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -17,7 +17,7 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      naming_service.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      naming_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 65af71103f4..8ecfdfb5cd6 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -28,7 +28,7 @@ TAO_Naming_Service::init (int argc,
 {
   int result;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->argc_ = argc;
@@ -36,7 +36,7 @@ TAO_Naming_Service::init (int argc,
 
       // Initialize the ORB
       this->orb_ =
-        CORBA::ORB_init (this->argc_, this->argv_, 0 TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (this->argc_, this->argv_, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the args for '-t' option. If '-t' option is passed, do
@@ -109,17 +109,17 @@ TAO_Naming_Service::parse_args (int argc,
 
 // Run the ORB event loop.
 int
-TAO_Naming_Service::run (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Naming_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (time_ == 0)
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   else
     {
       ACE_Time_Value tv (time_);
-      this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
+      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index b7d9970a70c..d3f71c2cfee 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -42,7 +42,7 @@ public:
   virtual int init (int argc, char *argv[]);
   // Initialize the Naming Service with the arguments.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Run the TAO_Naming_Service.
 
   virtual ~TAO_Naming_Service (void);
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index abac02b1c31..301728ccddd 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -136,7 +136,7 @@ TAO_NT_Notify_Service::svc (void)
   ACE_TRY
     {
       report_status (SERVICE_RUNNING);
-      notify_service.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      notify_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index 3b413207337..ecf14ca8a25 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -22,7 +22,7 @@ main (int argc, char *argv[])
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
-  if (notify_service.init (argc, argv TAO_ENV_ARG_PARAMETER) == -1)
+  if (notify_service.init (argc, argv ACE_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Failed to start the Notification Service.\n"),
                       1);
@@ -30,12 +30,12 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       notify_service.run ();
-      notify_service.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      notify_service.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
-      notify_service.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      notify_service.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            "Failed to start the Notification Service\n");
       return 1;
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index 07f46e9c588..9c47f82307a 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -31,17 +31,17 @@ TAO_Notify_Service::~TAO_Notify_Service (void)
 
 int
 TAO_Notify_Service::init_ORB (int& argc, char *argv []
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
                                 ""
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var poa_obj  =
     this->orb_->resolve_initial_references("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (poa_obj.in ()))
@@ -51,14 +51,14 @@ TAO_Notify_Service::init_ORB (int& argc, char *argv []
 
   this->poa_ =
     PortableServer::POA::_narrow (poa_obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -66,11 +66,11 @@ TAO_Notify_Service::init_ORB (int& argc, char *argv []
 
 int
 TAO_Notify_Service::init (int argc, char *argv[]
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   // initalize the ORB.
   if (this->init_ORB (argc, argv
-                      TAO_ENV_ARG_PARAMETER) != 0)
+                      ACE_ENV_ARG_PARAMETER) != 0)
   return -1;
 
   ACE_CHECK_RETURN (-1);
@@ -92,7 +92,7 @@ TAO_Notify_Service::init (int argc, char *argv[]
   if (this->use_name_svc_)
     {
       // Resolve the naming service.
-      int ns_ret = this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+      int ns_ret = this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (ns_ret != 0)
@@ -105,14 +105,14 @@ TAO_Notify_Service::init (int argc, char *argv[]
   // Activate the factory
   this->notify_factory_ =
     TAO_Notify_EventChannelFactory_i::create (this->poa_.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ()));
 
   // Write IOR to a file, if asked.
   CORBA::String_var str =
-    this->orb_->object_to_string (this->notify_factory_.in () TAO_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (this->notify_factory_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->ior_output_file_)
@@ -133,11 +133,11 @@ TAO_Notify_Service::init (int argc, char *argv[]
     {
       CORBA::Object_var table_object =
         this->orb_->resolve_initial_references ("IORTable"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -147,10 +147,10 @@ TAO_Notify_Service::init (int argc, char *argv[]
         {
           CORBA::String_var ior =
             this->orb_->object_to_string (this->notify_factory_.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           adapter->bind (this->notify_factory_name_.c_str (), ior.in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
     }
@@ -163,13 +163,13 @@ TAO_Notify_Service::init (int argc, char *argv[]
 
     CosNaming::Name_var name =
       this->naming_->to_name (this->notify_factory_name_.c_str ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
 
 
     this->naming_->rebind (name.in (),
                            this->notify_factory_.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
 
     ACE_DEBUG ((LM_DEBUG,
@@ -188,16 +188,16 @@ TAO_Notify_Service::init (int argc, char *argv[]
           this->notify_factory_->create_channel (initial_qos,
                                                  initial_admin,
                                                  id
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
         name = this->naming_->to_name (
           this->notify_channel_name_.c_str ()
-          TAO_ENV_ARG_PARAMETER);
+          ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (-1);
 
 
         this->naming_->rebind (name.in (),
                                ec.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (-1);
 
         ACE_DEBUG ((LM_DEBUG,
@@ -211,11 +211,11 @@ TAO_Notify_Service::init (int argc, char *argv[]
 }
 
 int
-TAO_Notify_Service::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Service::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Need to check return value for errors.
@@ -226,7 +226,7 @@ TAO_Notify_Service::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 
   this->naming_ =
     CosNaming::NamingContextExt::_narrow (naming_obj.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -245,10 +245,10 @@ TAO_Notify_Service::run ()
       return 0;
     }
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -261,17 +261,17 @@ TAO_Notify_Service::run ()
 }
 
 void
-TAO_Notify_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate.
   PortableServer::ObjectId_var oid =
     this->poa_->reference_to_id (this->notify_factory_.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate from the poa.
   this->poa_->deactivate_object (oid.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->use_name_svc_)
@@ -279,11 +279,11 @@ TAO_Notify_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     // Unbind from the naming service.
     CosNaming::Name_var name =
       this->naming_->to_name (this->notify_factory_name_.c_str ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     this->naming_->unbind (name.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -393,10 +393,10 @@ Worker::orb (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index 21f74537880..e1b92cda4b1 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -65,7 +65,7 @@ class TAO_Notify_Service
   // Destructor.
 
   int init (int argc, char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initializes the Service.
   // Returns 0 on success, -1 on error.
 
@@ -73,7 +73,7 @@ class TAO_Notify_Service
   // run the Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Shutdown the Service.
   // Returns 0 on success, -1 on error.
 
@@ -81,10 +81,10 @@ class TAO_Notify_Service
   //
 protected:
   int init_ORB (int& argc, char *argv []
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
   // initialize the ORB.
 
-  int resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Resolve the naming service.
 
   int parse_args (int argc, char *argv []);
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 6e83f3f5cdd..8ed17ee846f 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -51,7 +51,7 @@ TAO_Scheduling_Service::init (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       // Initialize ORB manager.
-      this->orb_manager_.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      this->orb_manager_.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb = this->orb_manager_.orb ();
@@ -60,7 +60,7 @@ TAO_Scheduling_Service::init (int argc, char *argv[])
       poa_manager = this->orb_manager_.poa_manager ();
       ACE_TRY_CHECK;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check the non-ORB arguments.  this needs to come before we
@@ -104,7 +104,7 @@ TAO_Scheduling_Service::init (int argc, char *argv[])
 
       // Locate the naming service.
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -112,15 +112,15 @@ TAO_Scheduling_Service::init (int argc, char *argv[])
                            " (%P|%t) Unable to locate the Naming Service.\n"),
                           -1);
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecScheduler::Scheduler_var scheduler =
-        this->scheduler_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->scheduler_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var scheduler_ior_string =
-        orb->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "The scheduler IOR is <%s>\n",
@@ -130,7 +130,7 @@ TAO_Scheduling_Service::init (int argc, char *argv[])
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup (this->service_name_);
-      naming_context->rebind (schedule_name, scheduler.in () TAO_ENV_ARG_PARAMETER);
+      naming_context->rebind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->ior_file_name_ != 0)
@@ -171,10 +171,10 @@ TAO_Scheduling_Service::init (int argc, char *argv[])
 // Runs the TAO_Scheduling_Service.
 
 int
-TAO_Scheduling_Service::run (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Scheduling_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Run the ORB manager.
-  return this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
@@ -284,7 +284,7 @@ int main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "%s; running scheduling service\n", __FILE__));
 
-      scheduling_service.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      scheduling_service.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
index f741fb60e6b..0450f6e9c4f 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
@@ -51,7 +51,7 @@ public:
   int init (int argc, char *argv[]);
   // Initialize the Scheduling Service with the arguments.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Run the TAO_Scheduling_Service.
 
   ~TAO_Scheduling_Service (void);
diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
index fab82fed608..0f64c4f7e6e 100644
--- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
+++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp
@@ -32,12 +32,12 @@ extern "C" void handler (int)
 int
 main (int argc, ACE_TCHAR *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP);
@@ -46,7 +46,7 @@ main (int argc, ACE_TCHAR *argv[])
         {
           ACE_Time_Value tv (5, 0);
 
-          orb->perform_work (tv TAO_ENV_ARG_PARAMETER);
+          orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index 90b5568f2b6..49abf595824 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -53,7 +53,7 @@ Clerk_i::read_ior (const char *filename)
 
   int result = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       for (char *str = ACE_OS::strtok (data, "\n");
@@ -66,7 +66,7 @@ Clerk_i::read_ior (const char *filename)
 
           CORBA::Object_var objref =
             this->orb_->string_to_object (str
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Return if the server reference is nil.
@@ -80,7 +80,7 @@ Clerk_i::read_ior (const char *filename)
 
           CosTime::TimeService_ptr server =
             CosTime::TimeService::_narrow (objref.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->insert_server (server);
@@ -170,7 +170,7 @@ Clerk_i::parse_args (void)
 int
 Clerk_i::get_first_IOR (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       char host_name[MAXHOSTNAMELEN];
@@ -188,13 +188,13 @@ Clerk_i::get_first_IOR (void)
       // Resolve name.
       CORBA::Object_var temp_object =
         this->my_name_server_->resolve (server_context_name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var server_context =
         CosNaming::NamingContext::_narrow (temp_object.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server_context.in ()))
@@ -213,12 +213,12 @@ Clerk_i::get_first_IOR (void)
 
       temp_object =
         server_context->resolve (server_name
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosTime::TimeService_var obj =
         CosTime::TimeService::_narrow (temp_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (obj.in ()))
@@ -257,7 +257,7 @@ int
 Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
                       CosNaming::NamingContext_var server_context)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CosNaming::Binding_var binding;
@@ -265,7 +265,7 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
       if (!CORBA::is_nil (iter.in ()))
         {
           while (iter->next_one (binding.out ()
-                                 TAO_ENV_ARG_PARAMETER))
+                                 ACE_ENV_ARG_PARAMETER))
             {
               ACE_TRY_CHECK;
 
@@ -279,12 +279,12 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
 
               CORBA::Object_var temp_object =
                 server_context->resolve (server_name
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CosTime::TimeService_ptr server =
                 CosTime::TimeService::_narrow (temp_object.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               this->insert_server (server);
@@ -311,7 +311,7 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
 int
 Clerk_i::init_naming_service (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -319,7 +319,7 @@ Clerk_i::init_naming_service (void)
       this->orb_manager_.init_child_poa (this->argc_,
                                          this->argv_,
                                          "my_child_poa"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_ptr child_poa
@@ -350,7 +350,7 @@ Clerk_i::init_naming_service (void)
 int
 Clerk_i::create_clerk (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 
@@ -369,7 +369,7 @@ Clerk_i::create_clerk (void)
       // Convert the clerk reference to a string.
       CORBA::String_var objref_clerk =
         this->orb_->object_to_string (this->time_service_clerk_.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print the clerk IOR on the console.
@@ -405,11 +405,11 @@ Clerk_i::create_clerk (void)
 int
 Clerk_i::if_first_clerk (CosNaming::Name clerk_context_name)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->my_name_server_->resolve
-        (clerk_context_name TAO_ENV_ARG_PARAMETER);
+        (clerk_context_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, userex)
@@ -427,7 +427,7 @@ Clerk_i::if_first_clerk (CosNaming::Name clerk_context_name)
 int
 Clerk_i::register_clerk (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Bind the Clerk in its appropriate Context.
@@ -440,12 +440,12 @@ Clerk_i::register_clerk (void)
 
       if (if_first_clerk (clerk_context_name))
         {
-          clerk_context = this->my_name_server_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
+          clerk_context = this->my_name_server_->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->my_name_server_->rebind_context (clerk_context_name,
                                                  clerk_context.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -467,7 +467,7 @@ Clerk_i::register_clerk (void)
 
       this->my_name_server_->rebind (clerk_name,
                                      this->time_service_clerk_.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -486,7 +486,7 @@ Clerk_i::register_clerk (void)
 int
 Clerk_i::init (int argc,
                char *argv[]
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -503,14 +503,14 @@ Clerk_i::init (int argc,
 
       this->orb_manager_.init (argc,
                                argv
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       if (this->orb_manager_.init_child_poa (argc,
                                              argv,
                                              "child_poa"
-                                             TAO_ENV_ARG_PARAMETER) == -1)
+                                             ACE_ENV_ARG_PARAMETER) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
                            "init_child_poa"),
@@ -570,12 +570,12 @@ Clerk_i::init (int argc,
 }
 
 int
-Clerk_i::run (TAO_ENV_SINGLE_ARG_DECL)
+Clerk_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       // Run the main event loop for the ORB.
-      int r = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      int r = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h
index d8ca7098d1a..50a7e0557da 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.h
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.h
@@ -52,10 +52,10 @@ public:
 
   int init (int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Clerk state - parsing arguments and waiting.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
 private:
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index 07976f5ee95..c085b065d48 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -63,7 +63,7 @@ Server_i::parse_args (void)
 // with it.
 
 int
-Server_i::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+Server_i::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -71,7 +71,7 @@ Server_i::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
       this->orb_manager_.init_child_poa (this->argc_,
                                          this->argv_,
                                          "child_poa"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_ptr child_poa
@@ -105,7 +105,7 @@ Server_i::init_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 int
 Server_i::create_server (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 
@@ -118,7 +118,7 @@ Server_i::create_server (void)
       CORBA::String_var server_str =
         this->orb_manager_.activate_under_child_poa ("server",
                                                      this->time_service_server_impl_
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
@@ -126,10 +126,10 @@ Server_i::create_server (void)
 
       CORBA::Object_var server_ref =
         this->orb_manager_.child_poa ()->id_to_reference (id.in ()
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
 
       this->time_service_server_ = CosTime::TimeService::_narrow (server_ref.in ()
-                                                                  TAO_ENV_ARG_PARAMETER);
+                                                                  ACE_ENV_ARG_PARAMETER);
 
 
       ACE_TRY_CHECK;
@@ -141,7 +141,7 @@ Server_i::create_server (void)
 
       CORBA::String_var objref_server =
         this->orb_->object_to_string (server_ref.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 
       // Print the server IOR on the console.
       ACE_DEBUG ((LM_DEBUG,
@@ -178,11 +178,11 @@ Server_i::create_server (void)
 int
 Server_i::if_first_server (CosNaming::Name &server_context_name)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->my_name_server_->resolve
-        (server_context_name TAO_ENV_ARG_PARAMETER);
+        (server_context_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, userex)
@@ -200,7 +200,7 @@ Server_i::if_first_server (CosNaming::Name &server_context_name)
 int
 Server_i::register_server (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CosNaming::Name server_context_name;
@@ -216,13 +216,13 @@ Server_i::register_server (void)
         {
           // Get context.
           server_context =
-            this->my_name_server_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->my_name_server_->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Bind.
           this->my_name_server_->rebind_context (server_context_name,
                                                  server_context.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -242,7 +242,7 @@ Server_i::register_server (void)
 
       this->my_name_server_->rebind (server_name,
                                      this->time_service_server_.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -267,7 +267,7 @@ Server_i::register_server (void)
 int
 Server_i::init (int argc,
                 char *argv[]
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -281,7 +281,7 @@ Server_i::init (int argc,
       if (this->orb_manager_.init_child_poa (argc,
                                              argv,
                                              "time_server"
-                                             TAO_ENV_ARG_PARAMETER) == -1)
+                                             ACE_ENV_ARG_PARAMETER) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                                  "%p\n",
                                  "init_child_poa"),
@@ -289,7 +289,7 @@ Server_i::init (int argc,
       ACE_TRY_CHECK;
 
       // Activate the POA Manager.
-      this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = this->parse_args ();
@@ -301,7 +301,7 @@ Server_i::init (int argc,
       this->orb_ = this->orb_manager_.orb ();
 
       // Use the Naming Service Register the above implementation with the Naming Service.
-      this->init_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->init_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -326,9 +326,9 @@ Server_i::init (int argc,
 // Run the event loop for ORB.
 
 int
-Server_i::run (TAO_ENV_SINGLE_ARG_DECL)
+Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  int retval = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int retval = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (retval == -1)
diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h
index 34c2655d5e8..8241f63960a 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.h
+++ b/TAO/orbsvcs/Time_Service/Server_i.h
@@ -42,13 +42,13 @@ public:
 
   int init (int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Server state.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
-  int init_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  int init_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Initialises the name server.
 
   int create_server (void);
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
index 4e85190ecb0..62d14c1746a 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
@@ -14,16 +14,16 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "[SERVER] Process/Thread Id : (%P/%t) Time Service clerk\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int r = clerk.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int r = clerk.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         return 1;
       else
         {
-          clerk.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          clerk.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
index 852dead7510..f61746d627e 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
@@ -14,17 +14,17 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "[SERVER] Process/Thread Id : (%P/%t) Time Service server\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int r = server.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int r = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
         return 1;
       else
         {
-          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
index 309df532cb9..dba75d7f6f0 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
@@ -12,12 +12,12 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       int check =
-        trader.init (argc, argv TAO_ENV_ARG_PARAMETER);
+        trader.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (check != -1)
         {
-          trader.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          trader.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index 00edb488e47..d1036faef17 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -48,7 +48,7 @@ Trading_Service::~Trading_Service (void)
 int
 Trading_Service::init (int argc,
                        char *argv[]
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
 {
   int result_trader =
     this->trading_loader_.init (argc, argv);
@@ -60,12 +60,12 @@ Trading_Service::init (int argc,
 }
 
 int
-Trading_Service::run (TAO_ENV_SINGLE_ARG_DECL)
+Trading_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   Trading_Shutdown trading_shutdown (*this);
 
   int return_value =
-    this->trading_loader_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->trading_loader_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return return_value;
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h
index 09cacc2af44..375510aa747 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.h
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h
@@ -62,10 +62,10 @@ public:
 
   int init (int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Trading Service with arguments.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the Trading Service.
 
   int shutdown (void);
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
index 4a51dcb8c13..60210ad8515 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
@@ -25,7 +25,7 @@ int
 TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
                                     const char* child_poa_name,
                                     CosNaming::NamingContext_ptr naming
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   // Check if we have a parent poa.
   if (CORBA::is_nil (poa))
@@ -38,12 +38,12 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
   // to detect duplicates for us.
   PortableServer::IdUniquenessPolicy_var idpolicy =
     poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   PortableServer::IdAssignmentPolicy_var assignpolicy =
     poa->create_id_assignment_policy (PortableServer::USER_ID
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create a PolicyList
@@ -55,7 +55,7 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
     PortableServer::IdAssignmentPolicy::_duplicate (assignpolicy.in ());
 
   PortableServer::POAManager_ptr manager =
-    poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   // @@ Pradeep : TODO - find a way to destroy the policy_list if we return here.
 
@@ -63,14 +63,14 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
   this->poa_ = poa->create_POA (child_poa_name,
                                 manager,
                                 policy_list
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
-  idpolicy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  idpolicy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  assignpolicy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  assignpolicy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   //this->poa_ =  PortableServer::POA::_duplicate (poa);
@@ -81,7 +81,7 @@ TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
 CosEventChannelAdmin::EventChannel_ptr
 TAO_CosEventChannelFactory_i::create (const char * channel_id,
                                       CORBA::Boolean store_in_naming_service
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventChannelFactory::DuplicateChannel,
@@ -99,7 +99,7 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
 
       // let all those contained in FactoryEC use the default POA.
       // We only need the FactoryEC's to be unique!
-      PortableServer::POA_ptr defPOA = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::POA_ptr defPOA = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_CEC_EventChannel_Attributes attr (defPOA, defPOA);
@@ -112,18 +112,18 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
 
       auto_ptr <TAO_CEC_EventChannel> ec (impl);
 
-      impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->poa_->activate_object_with_id (oid.in (),
                                            ec.get ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ec.release ();
 
       CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER);
+        this->poa_->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (store_in_naming_service &&
@@ -135,7 +135,7 @@ TAO_CosEventChannelFactory_i::create (const char * channel_id,
 
           this->naming_->rebind (name,
                                  obj.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -192,7 +192,7 @@ TAO_CosEventChannelFactory_i::destroy
 (
  const char * channel_id,
  CORBA::Boolean unbind_from_naming_service
- TAO_ENV_ARG_DECL
+ ACE_ENV_ARG_DECL
  )
  ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -209,15 +209,15 @@ TAO_CosEventChannelFactory_i::destroy
 
       CORBA::Object_var obj =
         this->poa_->id_to_reference (oid.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var fact_ec =
         CosEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      fact_ec->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fact_ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Remove from the naming service.
@@ -229,7 +229,7 @@ TAO_CosEventChannelFactory_i::destroy
           name[0].id = CORBA::string_dup (channel_id);
 
           this->naming_->unbind (name
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -257,7 +257,7 @@ CosEventChannelAdmin::EventChannel_ptr
 TAO_CosEventChannelFactory_i::find
 (
  const char * channel_id
- TAO_ENV_ARG_DECL
+ ACE_ENV_ARG_DECL
  )
   ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -275,7 +275,7 @@ TAO_CosEventChannelFactory_i::find
 
       CORBA::Object_var obj =
         this->poa_->id_to_reference (oid.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ec_return = CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
@@ -295,7 +295,7 @@ char*
 TAO_CosEventChannelFactory_i::find_channel_id
 (
  CosEventChannelAdmin::EventChannel_ptr channel
- TAO_ENV_ARG_DECL
+ ACE_ENV_ARG_DECL
  )
   ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -309,7 +309,7 @@ TAO_CosEventChannelFactory_i::find_channel_id
     {
       PortableServer::ObjectId_var oid =
         this->poa_->reference_to_id (channel
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       str_return = PortableServer::ObjectId_to_string (oid.in ());
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
index c15937667e5..2bb0fcbacf6 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
@@ -51,7 +51,7 @@ class TAO_CosEventChannelFactory_i :
   int init (PortableServer::POA_ptr poa,
             const char* child_poa_name,
             CosNaming::NamingContext_ptr naming = CosNaming::NamingContext::_nil ()
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // This method creates a child poa with <poa> as the
   // parent. It also accepts a Naming_Context which is used to register
   // the event channels if specified.
@@ -66,7 +66,7 @@ class TAO_CosEventChannelFactory_i :
   //    doesn't have to be exposed through the IDL interface. Anyway,
   //    there must be a way to cleanup any resources created by the
   //    factory, and you must avoid CORBA calls in the destructor,
-  //    first because you won't have an TAO_ENV_SINGLE_ARG_PARAMETER and second because
+  //    first because you won't have an ACE_ENV_SINGLE_ARG_PARAMETER and second because
   //    exceptions in destructors are evil.
   // @@ Pradeep: anyway you can just use exceptions and not return -1?
 
@@ -75,7 +75,7 @@ class TAO_CosEventChannelFactory_i :
     (
      const char * channel_id,
      CORBA::Boolean store_in_naming_service
-     TAO_ENV_ARG_DECL
+     ACE_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -87,7 +87,7 @@ class TAO_CosEventChannelFactory_i :
     (
      const char * channel_id,
      CORBA::Boolean unbind_from_naming_service
-     TAO_ENV_ARG_DECL
+     ACE_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -97,7 +97,7 @@ class TAO_CosEventChannelFactory_i :
   virtual CosEventChannelAdmin::EventChannel_ptr find
     (
      const char * channel_id
-     TAO_ENV_ARG_DECL
+     ACE_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -107,7 +107,7 @@ class TAO_CosEventChannelFactory_i :
   virtual char * find_channel_id
     (
      CosEventChannelAdmin::EventChannel_ptr channel
-     TAO_ENV_ARG_DECL
+     ACE_ENV_ARG_DECL
      )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index 78916b722b6..08ae963328f 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -20,39 +20,39 @@ public:
   virtual ~FactoryClient (void);
   // destructor.
 
-  void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
-  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Try to get hold of a running naming service.
 
-  void resolve_factory (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_factory (ACE_ENV_SINGLE_ARG_DECL);
   // Try to resolve the factory from the Naming service.
 
   CosEventChannelFactory::ChannelFactory_ptr
-  create_factory (TAO_ENV_SINGLE_ARG_DECL);
+  create_factory (ACE_ENV_SINGLE_ARG_DECL);
   // Create a local Factory and also set the <factory_>.
 
-  virtual void run_test (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void run_test (ACE_ENV_SINGLE_ARG_DECL);
   // Runs a couple of tests to check if the factory behaves correctly.
 
 protected:
   CosEventChannelAdmin::EventChannel_ptr
       create_channel (const char *channel_id,
                      CosEventChannelFactory::ChannelFactory_ptr factory
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   // Create a channel.
 
   void destroy_channel (const char *channel_id
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // Destroy the channel.
 
   void find_channel (const char* channel_id
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // Find a channel.
 
   void find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // Find a channel.
 
   // = Protected Data members.
@@ -87,21 +87,21 @@ FactoryClient::~FactoryClient (void)
 void
 FactoryClient::init_ORB (int argc,
                        char *argv []
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
                                 ""
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FactoryClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+FactoryClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -109,14 +109,14 @@ FactoryClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW (CORBA::UNKNOWN ());
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->use_naming_service = 1;
 }
 
 void
-FactoryClient::resolve_factory (TAO_ENV_SINGLE_ARG_DECL)
+FactoryClient::resolve_factory (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (this->use_naming_service == 1);
 
@@ -126,17 +126,17 @@ FactoryClient::resolve_factory (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     this->naming_context_->resolve (name
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->factory_ =
     CosEventChannelFactory::ChannelFactory::_narrow (obj.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CosEventChannelFactory::ChannelFactory_ptr
-FactoryClient::create_factory (TAO_ENV_SINGLE_ARG_DECL)
+FactoryClient::create_factory (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::UNKNOWN (),
                     CosEventChannelFactory::ChannelFactory::_nil ());
@@ -145,7 +145,7 @@ FactoryClient::create_factory (TAO_ENV_SINGLE_ARG_DECL)
 CosEventChannelAdmin::EventChannel_ptr
 FactoryClient::create_channel (const char *channel_id,
                             CosEventChannelFactory::ChannelFactory_ptr factory
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Trying to create channel %s\n", channel_id));
@@ -157,7 +157,7 @@ FactoryClient::create_channel (const char *channel_id,
     {
       ec = factory->create (channel_id,
                             this->use_naming_service
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ASSERT (!CORBA::is_nil (ec.in ()));
@@ -185,7 +185,7 @@ FactoryClient::create_channel (const char *channel_id,
 
 void
 FactoryClient::destroy_channel (const char *channel_id
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Destroying Cos Event Channel \"%s \"\n",
@@ -193,13 +193,13 @@ FactoryClient::destroy_channel (const char *channel_id
 
   this->factory_->destroy (channel_id,
                            use_naming_service
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 FactoryClient::find_channel (const char* channel_id
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -209,13 +209,13 @@ FactoryClient::find_channel (const char* channel_id
 
       CosEventChannelAdmin::EventChannel_var channel =
         this->factory_->find (channel_id
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       CORBA::String_var str =
         orb_->object_to_string (channel.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -223,7 +223,7 @@ FactoryClient::find_channel (const char* channel_id
                   str.in ()));
 
       this->find_channel_id (channel.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
@@ -241,11 +241,11 @@ FactoryClient::find_channel (const char* channel_id
 
 void
 FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   CORBA::String_var str =
     orb_->object_to_string (channel
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -254,7 +254,7 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
 
   char *channel_id =
     this->factory_->find_channel_id (channel
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -266,7 +266,7 @@ FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel
  */
 
 void
-FactoryClient::run_test (TAO_ENV_SINGLE_ARG_DECL)
+FactoryClient::run_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->factory_.in ()));
 
@@ -276,85 +276,85 @@ FactoryClient::run_test (TAO_ENV_SINGLE_ARG_DECL)
   // create the first cosec
   cosec[0] = this->create_channel (channel_id[0],
                                    this->factory_.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
  // create the second cosec
   cosec[1] = this->create_channel (channel_id[1],
                                    this->factory_.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // create the third cosec
   cosec[2] = this->create_channel (channel_id[2],
                                    this->factory_.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // see it we can destroy this one..
   this->destroy_channel (channel_id[2]
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // see if we can find it?
   this->find_channel_id (cosec[2].in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // see if we can create it again?
   cosec[2] = this->create_channel (channel_id[2],
                                    this->factory_.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // try and find a channel that does not exist.
   this->find_channel ("areyouthere?"
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // see if it can detect duplicates.
   this->create_channel (channel_id[2],
                         this->factory_.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // see if it can give us the id?
   this->find_channel_id (cosec[0].in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->find_channel_id (cosec[1].in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->find_channel_id (cosec[2].in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // check if we can get the channels from the id.
   this->find_channel (channel_id[0]
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->find_channel (channel_id[1]
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->find_channel (channel_id[2]
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   //destroy them all.
   this->destroy_channel (channel_id[0]
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->destroy_channel (channel_id[1]
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->destroy_channel (channel_id[2]
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // end of testing.
@@ -373,15 +373,15 @@ main (int argc, char *argv [])
 
       ft.init_ORB (argc,
                    argv
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_TRY_EX (naming)
         {
-          ft.resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ft.resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (naming);
 
-          ft.resolve_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ft.resolve_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (naming);
         }
       ACE_CATCHANY
@@ -391,12 +391,12 @@ main (int argc, char *argv [])
           ACE_DEBUG ((LM_DEBUG,
                       "Creating a local Factory\n"));
           // TBD:
-          ft.create_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ft.create_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_ENDTRY;
 
-      ft.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ft.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
index 2c80b3a4807..845ee110d77 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
@@ -52,13 +52,13 @@ FactoryDriver::parse_args (int argc, char *argv [])
 int
 FactoryDriver::start (int argc, char *argv [])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       orb_ = CORBA::ORB_init (argc,
                               argv,
                               ""
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv) == -1)
@@ -71,7 +71,7 @@ FactoryDriver::start (int argc, char *argv [])
 
       CORBA::Object_var poa_object  =
         orb_->resolve_initial_references("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -81,15 +81,15 @@ FactoryDriver::start (int argc, char *argv [])
 
       root_poa_ =
         PortableServer::POA::_narrow (poa_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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -106,23 +106,23 @@ FactoryDriver::start (int argc, char *argv [])
       if (factory_servant_->init (root_poa_.in (),
                                   child_poa_name_,
                                   context.in ()
-                                 TAO_ENV_ARG_PARAMETER) != 0)
+                                 ACE_ENV_ARG_PARAMETER) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Unable to initialize "
                            "the factory. \n"),
                           1);
 
       // activate the factory in the root poa.
-      factory_ = factory_servant_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      factory_ = factory_servant_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Give the ownership to the POA.
-      factory_servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      factory_servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
       CORBA::String_var
         str = orb_->object_to_string (factory_.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -134,7 +134,7 @@ FactoryDriver::start (int argc, char *argv [])
       name[0].id = CORBA::string_dup (factoryName_);
       naming_client_->rebind (name,
                               factory_.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
index 6f7ca5248dd..68f393240e7 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
@@ -19,29 +19,29 @@ RtEC_Based_CosEC::~RtEC_Based_CosEC (void)
 
 void
 RtEC_Based_CosEC::init_ORB  (int& argc, char *argv []
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
                                 ""
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var poa_object  =
     this->orb_->resolve_initial_references("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->poa_ =
     PortableServer::POA::_narrow (poa_object.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -100,20 +100,20 @@ RtEC_Based_CosEC::parse_args (int argc, char *argv [])
 
 void
 RtEC_Based_CosEC::startup (int argc, char *argv[]
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Starting up the CosEvent Service...\n"));
 
   // initalize the ORB.
   this->init_ORB (argc, argv
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->parse_args (argc, argv) == -1)
     ACE_THROW (CORBA::BAD_PARAM ());
 
-  this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->init (this->poa_.in (),
@@ -121,10 +121,10 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
               this->eventTypeIds_,
               this->eventSourceIds_,
               this->source_type_pairs_
-              TAO_ENV_ARG_PARAMETER);
+              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Register ourselves with the naming service.
@@ -132,11 +132,11 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
 
   CORBA::Object_var obj =
     this->poa_->servant_to_reference (this
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var str =
-    this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -148,7 +148,7 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
 
   this->naming_->rebind (name,
                          obj.in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -157,28 +157,28 @@ RtEC_Based_CosEC::startup (int argc, char *argv[]
 }
 
 POA_RtecEventChannelAdmin::EventChannel_ptr
-RtEC_Based_CosEC::create_rtec (TAO_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::create_rtec (ACE_ENV_SINGLE_ARG_DECL)
 {
   // see if the user wants a local RtEC..
   if (this->remote_rtec_ == 0)
-    return CosEC_ServantBase::create_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return CosEC_ServantBase::create_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
   else
     return 0;
 }
 
 void
-RtEC_Based_CosEC::activate_rtec (TAO_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::activate_rtec (ACE_ENV_SINGLE_ARG_DECL)
 {
   // see if the user wants to use a local RtEC..
   if (this->remote_rtec_ == 0)
     {
-      CosEC_ServantBase::activate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CosEC_ServantBase::activate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       // Try to locate a remote rtec.
-      this->locate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->locate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Use the return value to check success.
@@ -189,18 +189,18 @@ RtEC_Based_CosEC::activate_rtec (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-RtEC_Based_CosEC::deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Check if the local rtec is to be deactivated.
   if (this->remote_rtec_ == 0)
     {
-      CosEC_ServantBase::deactivate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CosEC_ServantBase::deactivate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-RtEC_Based_CosEC::locate_rtec (TAO_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::locate_rtec (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name ref_name (1);
   ref_name.length (1);
@@ -209,21 +209,21 @@ RtEC_Based_CosEC::locate_rtec (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     this->naming_->resolve (ref_name
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->rtec_ =
     RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RtEC_Based_CosEC::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references ("NameService"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -232,7 +232,7 @@ RtEC_Based_CosEC::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
 
   this->naming_ =
     CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -243,7 +243,7 @@ RtEC_Based_CosEC::run (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -256,10 +256,10 @@ RtEC_Based_CosEC::run (void)
 }
 
 void
-RtEC_Based_CosEC::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+RtEC_Based_CosEC::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate.
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Unbind from the naming service.
@@ -268,7 +268,7 @@ RtEC_Based_CosEC::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   name[0].id = CORBA::string_dup (this->service_name);
 
   this->naming_->unbind (name
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 
   // shutdown the ORB.
   if (!CORBA::is_nil (this->orb_.in ()))
@@ -286,7 +286,7 @@ main (int argc, char *argv[])
     {
       service.startup (argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (service.run () == -1)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
index e11b80438af..72f1bd8224f 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
@@ -44,7 +44,7 @@ class RtEC_Based_CosEC : public CosEC_ServantBase
   // Parses the command line arguments.
 
   void startup (int argc, char *argv[]
-               TAO_ENV_ARG_DECL);
+               ACE_ENV_ARG_DECL);
   // Initializes the COS Event Service.
   // Returns 0 on success, -1 on error.
 
@@ -52,30 +52,30 @@ class RtEC_Based_CosEC : public CosEC_ServantBase
   // run the COS Event Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Shutdown the COS Event Service.
   // Returns 0 on success, -1 on error.
 
 protected:
   // = Methods from CosEC_ServantBase
   virtual POA_RtecEventChannelAdmin::EventChannel_ptr
-  create_rtec (TAO_ENV_SINGLE_ARG_DECL);
+  create_rtec (ACE_ENV_SINGLE_ARG_DECL);
   // Create a local rtec.
 
-  virtual void activate_rtec (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void activate_rtec (ACE_ENV_SINGLE_ARG_DECL);
   // Activates the rtec.
 
-  virtual void deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL);
   // Deactivates the rtec.
 
   void init_ORB (int& argc, char *argv []
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
   // initialize the ORB.
 
-  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Resolve the naming service.
 
-  void locate_rtec (TAO_ENV_SINGLE_ARG_DECL);
+  void locate_rtec (ACE_ENV_SINGLE_ARG_DECL);
   // Locate a rtec.
 
   // = Data members
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
index 87e69d4fa69..926686ed6dc 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
@@ -26,14 +26,14 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   RtecEventChannelAdmin::ProxyPushSupplier_var rtecproxypushsupplier =
-    this->rtec_consumeradmin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->rtec_consumeradmin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxysupplier_nil);
 
   TAO_CosEC_ProxyPushSupplier_i *proxypushsupplier;
@@ -47,11 +47,11 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
     auto_proxysupplier (proxypushsupplier);
 
   CosEventChannelAdmin::ProxyPushSupplier_ptr proxy_obj =
-    auto_proxysupplier.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    auto_proxysupplier.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxysupplier_nil);
 
    // give the ownership to the POA.
-  auto_proxysupplier.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  auto_proxysupplier.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxysupplier_nil);
 
   auto_proxysupplier.release ();
@@ -59,7 +59,7 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO: implement this.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
index d27a0bc2575..1ddebf4484d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
@@ -55,12 +55,12 @@ public:
             RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin);
 
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_push_supplier(TAO_ENV_SINGLE_ARG_DECL)
+    obtain_push_supplier(ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new ProxyPushSupplier_ptr.
 
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-    obtain_pull_supplier(TAO_ENV_SINGLE_ARG_DECL)
+    obtain_pull_supplier(ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new ProxyPullSupplier_ptr.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
index 5f9be775b2d..69ac811a074 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp
@@ -34,7 +34,7 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
                          char *,
                          char *,
                          char *
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (thispoa));
   ACE_ASSERT (!CORBA::is_nil (poa));
@@ -44,11 +44,11 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
   this->poa_ = PortableServer::POA::_duplicate (poa);
 
   auto_ptr<POA_RtecEventChannelAdmin::EventChannel>
-    auto_rtec_servant_ (this->create_rtec (TAO_ENV_SINGLE_ARG_PARAMETER));
+    auto_rtec_servant_ (this->create_rtec (ACE_ENV_SINGLE_ARG_PARAMETER));
   ACE_CHECK;
 
   auto_ptr<TAO_CosEC_EventChannel_i>
-    auto_cosec_servant_ (this->create_cosec (TAO_ENV_SINGLE_ARG_PARAMETER));
+    auto_cosec_servant_ (this->create_cosec (ACE_ENV_SINGLE_ARG_PARAMETER));
   ACE_CHECK;
 
   // if all the servants were allocated then set the class pointers.
@@ -57,17 +57,17 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
 }
 
 int
-CosEC_ServantBase::activate (TAO_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::activate (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
   ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ()));
 
   // Activate the Rtec
-  this->activate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->activate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Activate the CosEC
-  int retval = this->activate_cosec (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int retval = this->activate_cosec (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (retval != 0)
     return -1;
@@ -77,15 +77,15 @@ CosEC_ServantBase::activate (TAO_ENV_SINGLE_ARG_DECL)
 
    PortableServer::ObjectId_var oid =
      this->thispoa_->activate_object (this
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
    ACE_CHECK_RETURN (-1);
 
-   this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+   this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
    ACE_CHECK_RETURN (-1);
 
    CORBA::Object_var obj =
      this->thispoa_->id_to_reference (oid.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
    ACE_CHECK_RETURN (-1);
 
    return 0; // success.
@@ -93,17 +93,17 @@ CosEC_ServantBase::activate (TAO_ENV_SINGLE_ARG_DECL)
 
 int
 CosEC_ServantBase::activate (const char* servant_id
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
   ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ()));
 
   // Activate the Rtec
-  this->activate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->activate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Activate the CosEC
-  int retval = this->activate_cosec (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int retval = this->activate_cosec (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (retval != 0)
     return -1;
@@ -115,35 +115,35 @@ CosEC_ServantBase::activate (const char* servant_id
   // Note that the POA is <thispoa_>
   this->thispoa_->activate_object_with_id (oid.in (),
                                            this
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var obj =
     this->thispoa_->id_to_reference (oid.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0; // success.
 }
 
 void
-CosEC_ServantBase::activate_rtec (TAO_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::activate_rtec (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Activate the Rtec
   PortableServer::ObjectId_var oid =
     this->poa_->activate_object (this->rtec_servant_
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->rtec_servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->rtec_servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var obj =
     this->poa_->id_to_reference (oid.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->rtec_ =
@@ -151,7 +151,7 @@ CosEC_ServantBase::activate_rtec (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-CosEC_ServantBase::activate_cosec (TAO_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::activate_cosec (ACE_ENV_SINGLE_ARG_DECL)
 {
  // Initialize the CosEC servant.
   RtecBase::handle_t supp_handle = 0;
@@ -176,22 +176,22 @@ CosEC_ServantBase::activate_cosec (TAO_ENV_SINGLE_ARG_DECL)
   if (this->cosec_servant_->init (consumerqos,
                                   supplierqos,
                                   this->rtec_.in ()
-                                  TAO_ENV_ARG_PARAMETER) != 0)
+                                  ACE_ENV_ARG_PARAMETER) != 0)
     return -1;
   ACE_CHECK_RETURN (-1);
 
   // Activate the CosEC
   PortableServer::ObjectId_var oid =
     this->poa_->activate_object (this->cosec_servant_
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->cosec_servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->cosec_servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var obj =
     this->poa_->id_to_reference (oid.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->cosec_ =
@@ -200,84 +200,84 @@ CosEC_ServantBase::activate_cosec (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CosEC_ServantBase::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate all those we control...
-  this->deactivate_rtec (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate_rtec (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->deactivate_cosec (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate_cosec (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Finally we go away..
   PortableServer::ObjectId_var oid =
     this->thispoa_->servant_to_id (this
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate from the poa.
   this->thispoa_->deactivate_object (oid.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CosEC_ServantBase::deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate the rtec.
   PortableServer::ObjectId_var oid =
     this->poa_->servant_to_id (this->rtec_servant_
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate from the poa.
   this->poa_->deactivate_object (oid.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CosEC_ServantBase::deactivate_cosec (TAO_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::deactivate_cosec (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate the cosec.
   PortableServer::ObjectId_var oid =
     this->poa_->servant_to_id (this->cosec_servant_
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate from the poa.
   this->poa_->deactivate_object (oid.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-CosEC_ServantBase::for_consumers (TAO_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->cosec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->cosec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-CosEC_ServantBase::for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->cosec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->cosec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-CosEC_ServantBase::destroy (TAO_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::destroy (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate all the contained servants and ourselves.
   // The poa will "destroy" the ref counted servants.
 
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 POA_RtecEventChannelAdmin::EventChannel_ptr
-CosEC_ServantBase::create_rtec (TAO_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::create_rtec (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Create the RtEC servant.
   TAO_EC_Event_Channel_Attributes attr (this->poa_.in (),
@@ -292,7 +292,7 @@ CosEC_ServantBase::create_rtec (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 TAO_CosEC_EventChannel_i*
-CosEC_ServantBase::create_cosec (TAO_ENV_SINGLE_ARG_DECL)
+CosEC_ServantBase::create_cosec (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Create the CosEC servant.
   TAO_CosEC_EventChannel_i* _cosec_servant;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
index 129acbaee48..2ffedd40fdb 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h
@@ -59,54 +59,54 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase :
                      char *eventTypeIds,
                      char *eventSourceIds,
                      char *source_type_pairs
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   // This method creates a local scheduler, rtec and cosec.
   // The POA <poa> specified here is used when <activate> is called to
   // activate the contained servants.
   // The POA <thispoa> is used to activate this.
 
-  int activate (TAO_ENV_SINGLE_ARG_DECL);
+  int activate (ACE_ENV_SINGLE_ARG_DECL);
   // Activates the CosEC with <thispoa_> and friends with the <poa_>
 
-  int activate (const char* servant_id TAO_ENV_ARG_DECL);
+  int activate (const char* servant_id ACE_ENV_ARG_DECL);
   // If the servant_id is not nil then it is used to supply the object id
   // for <this> servant.
 
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
   // Deactivates the CosEC and friends with the POA.
 
   // =  POA_CosEventChannelAdmin::EventChannel methods.
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys this Event Channel object.
 
  protected:
   // = RtEC creation, activation and deactivation methods.
   virtual POA_RtecEventChannelAdmin::EventChannel_ptr
-  create_rtec (TAO_ENV_SINGLE_ARG_DECL);
+  create_rtec (ACE_ENV_SINGLE_ARG_DECL);
   // Create a local rtec.
 
-  virtual void activate_rtec (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void activate_rtec (ACE_ENV_SINGLE_ARG_DECL);
   // Activates the rtec.
 
-  virtual void deactivate_rtec (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL);
   // Deactivates the rtec.
 
   // = CosEC creation, activation and deactivation methods.
   TAO_CosEC_EventChannel_i*
-  create_cosec (TAO_ENV_SINGLE_ARG_DECL);
+  create_cosec (ACE_ENV_SINGLE_ARG_DECL);
   // Create a local cosec.
 
-  int activate_cosec (TAO_ENV_SINGLE_ARG_DECL);
+  int activate_cosec (ACE_ENV_SINGLE_ARG_DECL);
   // Activates the cosec.
 
-  void deactivate_cosec (TAO_ENV_SINGLE_ARG_DECL);
+  void deactivate_cosec (ACE_ENV_SINGLE_ARG_DECL);
   // Deactivates the cosec.
 
   void init_SupplierQOS (RtecBase::handle_t supp_handle,
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
index 5f5cac0743d..3266ded2608 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp
@@ -20,7 +20,7 @@ int
 TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
                                 const RtecEventChannelAdmin::SupplierQOS &supplierqos,
                                 RtecEventChannelAdmin::EventChannel_ptr rtec
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   // Allocate the admins..
   TAO_CosEC_ConsumerAdmin_i *consumer_;
@@ -38,7 +38,7 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
   auto_ptr <TAO_CosEC_SupplierAdmin_i> auto_supplier_ (supplier_);
 
   RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin =
-    rtec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    rtec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (auto_consumer_.get ()->init (consumerqos,
@@ -46,15 +46,15 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
     return -1;
 
   this->consumeradmin_ =
-    auto_consumer_.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    auto_consumer_.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // give the ownership to the POA.
-  auto_consumer_.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  auto_consumer_.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin =
-    rtec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    rtec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (auto_supplier_.get ()->init (supplierqos,
@@ -62,11 +62,11 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
     return -1;
 
   this->supplieradmin_ =
-    auto_supplier_.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    auto_supplier_.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // give the ownership to the POA.
-  auto_supplier_.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  auto_supplier_.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->consumer_admin_ = auto_consumer_.release ();
@@ -76,7 +76,7 @@ TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consum
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_CosEC_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CosEC_EventChannel_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Pradeep: you must make a copy here, because the caller is
@@ -86,7 +86,7 @@ TAO_CosEC_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_CosEC_EventChannel_i::for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CosEC_EventChannel_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Pradeep: you must make a copy here, because the caller is
@@ -96,20 +96,20 @@ TAO_CosEC_EventChannel_i::for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_CosEC_EventChannel_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_EventChannel_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate the CosEventChannel
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplieradmin_ =  CosEventChannelAdmin::SupplierAdmin::_nil ();
@@ -117,9 +117,9 @@ TAO_CosEC_EventChannel_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_CosEC_EventChannel_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_EventChannel_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
index fb7015ab3bf..8d9855bd4a2 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h
@@ -59,25 +59,25 @@ public:
   int init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
             const RtecEventChannelAdmin::SupplierQOS &supplierqos,
             RtecEventChannelAdmin::EventChannel_ptr rtec
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Activates the ConsumerAdmin and SupplierAdmin servants.  Returns
   // -1 on error, 0 on success.
 
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The for_consumers method will return the same ConsumerAdmin_ptr
   // everytime its called.
 
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The for_suppliers method will return the same SupplierAdmin_ptr
   // everytime its called.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys this Event Channel object.
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // destroys this Event Channel object and <delete>s this object.
 
 private:
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
index c0f97807d8c..73311b2af45 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp
@@ -32,7 +32,7 @@ public:
   ~TAO_CosEC_PushSupplierWrapper (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnects the push supplier.
 
@@ -64,24 +64,24 @@ TAO_CosEC_PushSupplierWrapper::~TAO_CosEC_PushSupplierWrapper (void)
 }
 
 void
-TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->supplier_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Deactivate the supplier proxy
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ If we keep a list remember to remove this object from the
@@ -104,7 +104,7 @@ TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void)
 
 void
 TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::Event buffer[1];
@@ -138,35 +138,35 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data
   e.data.any_value = data;
 
   this->proxypushconsumer_->push (events
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->proxypushconsumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->proxypushconsumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Deactivate the ProxyPushConsumer
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier
-                                                      TAO_ENV_ARG_DECL)
+                                                      ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected))
 {
@@ -184,17 +184,17 @@ TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier
     auto_wrapper (wrapper);
 
   RtecEventComm::PushSupplier_ptr rtecpushsupplier
-    = auto_wrapper.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    = auto_wrapper.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // give the ownership to the POA.
-  auto_wrapper.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  auto_wrapper.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxypushconsumer_->connect_push_supplier
     (rtecpushsupplier,
      this->qos_
-     TAO_ENV_ARG_PARAMETER);
+     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->wrapper_ = auto_wrapper.release ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
index d999ed7ae5f..da757ce5634 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h
@@ -62,16 +62,16 @@ public:
   // Destructor.
 
   virtual void push (const CORBA::Any &data
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Suppliers call this method to pass data to connected consumers.
 
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnects the supplier from the event communication.
 
   virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
   // Connects a push supplier.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
index f1597deac7c..52c99def13d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp
@@ -32,11 +32,11 @@ public:
   // Destructor.
 
   virtual void push (const RtecEventComm::EventSet & data
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is called by the RTEvent Channel to supply data.
 
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnects the consumer from the event channel.
 
@@ -63,7 +63,7 @@ TAO_CosEC_PushConsumerWrapper::~TAO_CosEC_PushConsumerWrapper ()
 
 void
 TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0;
@@ -73,7 +73,7 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set
       ACE_TRY
         {
           this->consumer_->push (set[i].data.any_value
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -85,24 +85,24 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set
 }
 
 void
-TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Deactivate the supplier proxy.
-  this->consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ If we keep a list remember to remove this object from the
@@ -125,24 +125,24 @@ TAO_CosEC_ProxyPushSupplier_i::~TAO_CosEC_ProxyPushSupplier_i (void)
 }
 
 void
-TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->pps_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->pps_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Deactivate the supplier proxy
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ If we keep a list remember to remove this object from the
@@ -151,7 +151,7 @@ TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL
 
 void
 TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer
-                                                      TAO_ENV_ARG_DECL)
+                                                      ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected,
                        CosEventChannelAdmin::TypeError))
@@ -172,16 +172,16 @@ TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer
 
   // @@ This code is not exception safe.
   RtecEventComm::PushConsumer_ptr  rtecpushconsumer =
-    auto_wrapper.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    auto_wrapper.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // give the ownership to the POA.
-  auto_wrapper.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  auto_wrapper.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->pps_->connect_push_consumer (rtecpushconsumer,
                                      this->qos_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->wrapper_ = auto_wrapper.release ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
index bf5a7416264..9fd51f44d7d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h
@@ -54,12 +54,12 @@ public:
   ~TAO_CosEC_ProxyPushSupplier_i (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Ends the event communication and disposes this object.
 
   virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected,
                        CosEventChannelAdmin::TypeError));
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
index 688c8982937..c0970fa8404 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
@@ -26,14 +26,14 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
 
   RtecEventChannelAdmin::ProxyPushConsumer_var rtecproxypushconsumer =
-    this->rtec_supplieradmin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->rtec_supplieradmin_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxyconsumer_nil);
 
   TAO_CosEC_ProxyPushConsumer_i *proxypushconsumer;
@@ -46,11 +46,11 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
     auto_proxyconsumer (proxypushconsumer);
 
   CosEventChannelAdmin::ProxyPushConsumer_ptr proxy_obj =
-    auto_proxyconsumer.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    auto_proxyconsumer.get ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxyconsumer_nil);
 
    // give the ownership to the POA.
-  auto_proxyconsumer.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  auto_proxyconsumer.get ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxyconsumer_nil);
 
   auto_proxyconsumer.release ();
@@ -58,7 +58,7 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO: implement this.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
index 04ea411c3fc..ae1ed870161 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
@@ -57,12 +57,12 @@ public:
   // error.
 
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-    obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+    obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new ProxyPushConsumer_ptr.
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_pull_consumer(TAO_ENV_SINGLE_ARG_DECL)
+    obtain_pull_consumer(ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new ProxyPullConsumer_ptr.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
index 99589e9178e..bd0b2585f86 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
@@ -9,16 +9,16 @@ main (int argc, char *argv [])
 {
   Basic basic;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      basic.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      basic.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      basic.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      basic.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      basic.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      basic.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
@@ -51,28 +51,28 @@ Basic::~Basic (void)
 
 void
 Basic::init (int argc, char *argv[]
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
-  this->init_ORB (argc, argv TAO_ENV_ARG_PARAMETER);
+  this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->init_CosEC (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->init_CosEC (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Basic::init_ORB  (int argc, char *argv []
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
                                 ""
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var poa_object  =
     this->orb_->resolve_initial_references("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (poa_object.in ()))
@@ -81,19 +81,19 @@ Basic::init_ORB  (int argc, char *argv []
 
   root_poa_ =
     PortableServer::POA::_narrow (poa_object.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_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_CHECK;
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Basic::init_CosEC (TAO_ENV_SINGLE_ARG_DECL)
+Basic::init_CosEC (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosEC_ServantBase *ec = 0;
 
@@ -107,10 +107,10 @@ Basic::init_CosEC (TAO_ENV_SINGLE_ARG_DECL)
   ec->init (this->root_poa_.in(),
             this->root_poa_.in(),
             0,0,0
-            TAO_ENV_ARG_PARAMETER);
+            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  int retval = ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int retval = ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (retval == -1)
@@ -118,17 +118,17 @@ Basic::init_CosEC (TAO_ENV_SINGLE_ARG_DECL)
   // @@ look for more descriptive exception to throw here
 
   CORBA::Object_var obj =
-    this->root_poa_->servant_to_reference (ec TAO_ENV_ARG_PARAMETER);
+    this->root_poa_->servant_to_reference (ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->cos_ec_ =
     CosEventChannelAdmin::EventChannel::_narrow (obj._retn ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Basic::run (TAO_ENV_SINGLE_ARG_DECL)
+Basic::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Create an Any type to pass to the Cos EC.
   CORBA::Any any;
@@ -136,21 +136,21 @@ Basic::run (TAO_ENV_SINGLE_ARG_DECL)
 
   this->consumer_.open (this->cos_ec_.in (),
                         this->orb_.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->consumer_.connect (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_.connect (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_.open (this->cos_ec_.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier_.connect (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_.connect (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_.send_event (any
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // this->orb_->run ();
@@ -163,14 +163,14 @@ Basic::run (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Basic::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Basic::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->supplier_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->consumer_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->cos_ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->cos_ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
index d504ea9ddc7..df713f5766f 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.h
@@ -36,23 +36,23 @@ public:
   ~Basic (void);
   // Destructor.
 
-  void init (int argc, char *argv[] TAO_ENV_ARG_DECL);
+  void init (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Starts up an ORB and the CosEC.
   // Returns 0 on success, -1 on error.
 
-  void run (TAO_ENV_SINGLE_ARG_DECL);
+  void run (ACE_ENV_SINGLE_ARG_DECL);
   // Connects a consumer and a supplier to the CosEC and sends 1 event
   // across.
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // Closes down the CosEC.
 
 private:
-  void init_ORB (int argc, char *argv[] TAO_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // initializes the ORB.
   // Returns 0 on success, -1 on error.
 
-  void init_CosEC (TAO_ENV_SINGLE_ARG_DECL);
+  void init_CosEC (ACE_ENV_SINGLE_ARG_DECL);
   // initializes the COS EC.
   // Returns 0 on success, -1 on error.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
index 7b31e7d4f58..03259f3a123 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.cpp
@@ -6,20 +6,20 @@
 void
 Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
                      CORBA::ORB_ptr orb
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   this->orb_ = orb;
 
   // = Connect as a consumer.
   this->consumer_admin_ =
-    event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
+Consumer::close (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_admin_ =
@@ -27,32 +27,32 @@ Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Consumer::connect (TAO_ENV_SINGLE_ARG_DECL)
+Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
   CosEventComm::PushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (objref.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -61,7 +61,7 @@ Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Consumer::push (const CORBA::Any &
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
  ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
@@ -74,7 +74,7 @@ Consumer::push (const CORBA::Any &
 }
 
 void
-Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
  ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -82,15 +82,15 @@ Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
index 9c66fc562eb..c1ced5cbc08 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h
@@ -34,28 +34,28 @@ class Consumer : public POA_CosEventComm::PushConsumer
 public:
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel,
              CORBA::ORB_ptr orb
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // This method connects the consumer to the EC.
 
-  void close (TAO_ENV_SINGLE_ARG_DECL);
+  void close (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  void connect (TAO_ENV_SINGLE_ARG_DECL);
+  void connect (ACE_ENV_SINGLE_ARG_DECL);
   // Connect the Consumer to the EventChannel.
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
   virtual void push (const CORBA::Any &data
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
       ));
   // push the event to the consumer.
 
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
index 3293d16514d..59cfc9cd251 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.cpp
@@ -5,18 +5,18 @@
 
 void
 Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   // = Connect as a consumer.
   this->supplier_admin_ =
-    event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::close (TAO_ENV_SINGLE_ARG_DECL)
+Supplier::close (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_admin_ =
@@ -24,31 +24,31 @@ Supplier::close (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Supplier::connect (TAO_ENV_SINGLE_ARG_DECL)
+Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
   this->consumer_proxy_ =
-    this->supplier_admin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->supplier_admin_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CosEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CosEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_->connect_push_supplier (objref.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -57,14 +57,14 @@ Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Supplier::send_event (const CORBA::Any & data
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
-  this->consumer_proxy_->push (data TAO_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->push (data ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
  ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -72,15 +72,15 @@ Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
index 7e96e452ddb..413244fc4f4 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h
@@ -32,22 +32,22 @@ class Supplier : public POA_CosEventComm::PushSupplier
   //   the CosEC and sends events to it.
 public:
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // This method connects the supplier to the EC.
 
-  void close (TAO_ENV_SINGLE_ARG_DECL);
+  void close (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  void connect (TAO_ENV_SINGLE_ARG_DECL);
+  void connect (ACE_ENV_SINGLE_ARG_DECL);
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC, but do not forget about it or close it.
 
   void send_event (const CORBA::Any &data
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
   // Send one event.
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index 8164013dd8b..9cdb697eff1 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -45,18 +45,18 @@ Consumer::parse_args (int argc, char *argv [])
 
 void
 Consumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   // = Connect as a consumer.
   this->consumer_admin_ =
-    event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
+Consumer::close (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_admin_ =
@@ -64,32 +64,32 @@ Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Consumer::connect (TAO_ENV_SINGLE_ARG_DECL)
+Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
   CosEventComm::PushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (objref.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -98,7 +98,7 @@ Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Consumer::push (const CORBA::Any &
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
@@ -121,7 +121,7 @@ Consumer::push (const CORBA::Any &
                   "(%P):%s\n",
                   "exiting the consumer."));
 
-      this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->shutdown ();
@@ -129,7 +129,7 @@ Consumer::push (const CORBA::Any &
 }
 
 void
-Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
  ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -137,30 +137,30 @@ Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 Consumer::init_Consumer (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
    {
       this->open (this->cos_ec_
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->connect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
index fdfed82b2b6..ce523fed960 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
@@ -41,28 +41,28 @@ public:
   // Initialize the Consumer.
 
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // This method connects the consumer to the EC.
 
-  void close (TAO_ENV_SINGLE_ARG_DECL);
+  void close (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  void connect (TAO_ENV_SINGLE_ARG_DECL);
+  void connect (ACE_ENV_SINGLE_ARG_DECL);
   // Connect the Consumer to the EventChannel.
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
   virtual void push (const CORBA::Any &data
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosEventComm::Disconnected
       ));
   // push the event to the consumer.
 
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
index eb1b5231c54..4af0b93b9aa 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
@@ -39,18 +39,18 @@ Multiple::init (int argc, char *argv[])
 int
 Multiple::init_ORB  (int argc, char *argv [])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     ""
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object  =
         this->orb_->resolve_initial_references("RootPOA"
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -60,14 +60,14 @@ Multiple::init_ORB  (int argc, char *argv [])
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -85,7 +85,7 @@ Multiple::init_ORB  (int argc, char *argv [])
 int
 Multiple::init_CosEC (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialization of the naming service.
@@ -102,7 +102,7 @@ Multiple::init_CosEC (void)
 
       CORBA::Object_var EC_obj =
         this->naming_client_->resolve (ec_ref_name
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The CORBA::Object_var object is downcast to
@@ -110,7 +110,7 @@ Multiple::init_CosEC (void)
       // using the <_narrow> method.
       this->cos_ec_ =
         CosEventChannelAdmin::EventChannel::_narrow (EC_obj.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -128,10 +128,10 @@ Multiple::init_CosEC (void)
 int
 Multiple::runORB (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
index 6d0761894f1..10626cc15d6 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -44,18 +44,18 @@ Supplier::parse_args (int argc, char *argv [])
 
 void
 Supplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   // = Connect as a consumer.
   this->supplier_admin_ =
-    event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::close (TAO_ENV_SINGLE_ARG_DECL)
+Supplier::close (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_admin_ =
@@ -63,31 +63,31 @@ Supplier::close (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Supplier::connect (TAO_ENV_SINGLE_ARG_DECL)
+Supplier::connect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
   this->consumer_proxy_ =
-    this->supplier_admin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->supplier_admin_->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CosEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CosEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_->connect_push_supplier (objref.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -96,14 +96,14 @@ Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Supplier::send_event (const CORBA::Any & data
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
-  this->consumer_proxy_->push (data TAO_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->push (data ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
         CORBA::SystemException
         ))
@@ -111,23 +111,23 @@ Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Supplier::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Create an Any type to pass to the Cos EC.
@@ -137,10 +137,10 @@ Supplier::run (void)
       cany >>= any;
 
       this->open (this->cos_ec_
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->connect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->connect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -152,14 +152,14 @@ Supplier::run (void)
            count--)
         {
           this->send_event (any
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P):Done!. exiting now..\n"));
 
-      this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
index 9de704696bd..29b213cd31f 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
@@ -38,22 +38,22 @@ public:
   // Constructor.
 
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // This method connects the supplier to the EC.
 
-  void close (TAO_ENV_SINGLE_ARG_DECL);
+  void close (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  void connect (TAO_ENV_SINGLE_ARG_DECL);
+  void connect (ACE_ENV_SINGLE_ARG_DECL);
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC, but do not forget about it or close it.
 
   void send_event (const CORBA::Any &data
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
   // Send one event.
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index c425e7c6bdb..53f82d338e2 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -23,12 +23,12 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
@@ -43,43 +43,43 @@ Consumer::run (int argc, char* argv[])
         }
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
         CosEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The canonical protocol to connect to the EC
       CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::ProxyPushSupplier_var supplier =
-        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventComm::PushConsumer_var consumer =
-        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier->connect_push_consumer (consumer.in () TAO_ENV_ARG_PARAMETER);
+      supplier->connect_push_consumer (consumer.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Wait for events, using work_pending()/perform_work() may help
@@ -104,7 +104,7 @@ Consumer::run (int argc, char* argv[])
 
 void
 Consumer::push (const CORBA::Any &
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->event_count_ ++;
@@ -117,13 +117,13 @@ Consumer::push (const CORBA::Any &
 }
 
 void
-Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
index 4ef9e96d7ce..7156353e483 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
@@ -41,9 +41,9 @@ public:
   // = The CosEventComm::PushConsumer methods
 
   virtual void push (const CORBA::Any &event
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
index 5911a5a7697..3681b6f67d5 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
@@ -15,12 +15,12 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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) == -1)
@@ -31,30 +31,30 @@ main (int argc, char* argv[])
         }
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       TAO_CEC_EventChannel_Attributes attributes (poa.in (),
                                                   poa.in ());
 
       TAO_CEC_EventChannel ec_impl (attributes);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index 63476ce6f9e..96e0ea64204 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -22,12 +22,12 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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 (argc <= 1)
@@ -38,43 +38,43 @@ Supplier::run (int argc, char* argv[])
         }
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
         CosEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The canonical protocol to connect to the EC
       CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::ProxyPushConsumer_var consumer =
-        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventComm::PushSupplier_var supplier =
-        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      consumer->connect_push_supplier (supplier.in () TAO_ENV_ARG_PARAMETER);
+      consumer->connect_push_supplier (supplier.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Push the events...
@@ -85,28 +85,28 @@ Supplier::run (int argc, char* argv[])
 
       for (int i = 0; i != 2000; ++i)
         {
-          consumer->push (event TAO_ENV_ARG_PARAMETER);
+          consumer->push (event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_OS::sleep (sleep_time);
         }
 
       // Disconnect from the EC
-      consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the EC....
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Deactivate this object...
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the POA
-      poa->destroy (1, 0 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -119,7 +119,7 @@ Supplier::run (int argc, char* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
index ba082729cc7..4fdc39bfa08 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
@@ -40,7 +40,7 @@ public:
 
   // = The CosEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
index cc5a8a9014e..d0af444ec99 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -28,37 +28,37 @@ FilterClient::~FilterClient ()
 }
 
 void
-FilterClient::init (int argc, char *argv [] TAO_ENV_ARG_DECL)
+FilterClient::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
 {
-  init_ORB (argc, argv TAO_ENV_ARG_PARAMETER);
+  init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+  resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+  resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
+  create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER);
+  create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER);
+  create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::run (TAO_ENV_SINGLE_ARG_DECL)
+FilterClient::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  send_events (TAO_ENV_SINGLE_ARG_PARAMETER);
+  send_events (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (g_result_count != EVENTS_EXPECTED_TO_RECEIVE)
@@ -78,17 +78,17 @@ FilterClient::done (void)
 void
 FilterClient::init_ORB (int argc,
                       char *argv []
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
                                 ""
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_ptr poa_object  =
     this->orb_->resolve_initial_references("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (poa_object))
@@ -99,23 +99,23 @@ FilterClient::init_ORB (int argc,
     }
   this->root_poa_ =
     PortableServer::POA::_narrow (poa_object
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_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_CHECK;
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+FilterClient::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -123,12 +123,12 @@ FilterClient::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW (CORBA::UNKNOWN ());
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL)
+FilterClient::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -136,47 +136,47 @@ FilterClient::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     this->naming_context_->resolve (name
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::create_EC (TAO_ENV_SINGLE_ARG_DECL)
+FilterClient::create_EC (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
                                          id
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-FilterClient::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL)
+FilterClient::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
+    ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   CosNotifyFilter::FilterFactory_var ffact =
-    ec_->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // setup a filter at the consumer admin
   CosNotifyFilter::Filter_var sa_filter =
-    ffact->create_filter (TCL_GRAMMAR TAO_ENV_ARG_PARAMETER);
+    ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (sa_filter.in ()));
@@ -187,31 +187,31 @@ FilterClient::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL)
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup (SA_FILTER);
 
-  sa_filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
+  sa_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_admin_->add_filter (sa_filter.in () TAO_ENV_ARG_PARAMETER);
+  supplier_admin_->add_filter (sa_filter.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL)
+FilterClient:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
+    ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 
   CosNotifyFilter::FilterFactory_var ffact =
-    ec_->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec_->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // setup a filter at the consumer admin
   CosNotifyFilter::Filter_var ca_filter =
-    ffact->create_filter (TCL_GRAMMAR TAO_ENV_ARG_PARAMETER);
+    ffact->create_filter (TCL_GRAMMAR ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ca_filter.in ()));
@@ -227,10 +227,10 @@ FilterClient:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL)
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup (CA_FILTER);
 
-  ca_filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
+  ca_filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  consumer_admin_->add_filter (ca_filter.in () TAO_ENV_ARG_PARAMETER);
+  consumer_admin_->add_filter (ca_filter.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the CA to receive all type of events
@@ -242,19 +242,19 @@ FilterClient:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL)
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::create_consumers (TAO_ENV_SINGLE_ARG_DECL)
+FilterClient::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
 {
   // startup the first consumer.
   ACE_NEW_THROW_EX (consumer_1,
                     Filter_StructuredPushConsumer (this, "consumer1"),
                     CORBA::NO_MEMORY ());
 
-  consumer_1->connect (consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
+  consumer_1->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // startup the second consumer.
@@ -262,19 +262,19 @@ FilterClient::create_consumers (TAO_ENV_SINGLE_ARG_DECL)
                     Filter_StructuredPushConsumer (this, "consumer2"),
                     CORBA::NO_MEMORY ());
 
-  consumer_2->connect (consumer_admin_.in () TAO_ENV_ARG_PARAMETER);
+  consumer_2->connect (consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::create_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+FilterClient::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
                     Filter_StructuredPushSupplier ("supplier1"),
                     CORBA::NO_MEMORY ());
 
-  supplier_1->connect (supplier_admin_.in () TAO_ENV_ARG_PARAMETER);
+  supplier_1->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // startup the second supplier
@@ -282,12 +282,12 @@ FilterClient::create_suppliers (TAO_ENV_SINGLE_ARG_DECL)
                     Filter_StructuredPushSupplier ("supplier2"),
                     CORBA::NO_MEMORY ());
 
-  supplier_2->connect (supplier_admin_.in () TAO_ENV_ARG_PARAMETER);
+  supplier_2->connect (supplier_admin_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-FilterClient::send_events (TAO_ENV_SINGLE_ARG_DECL)
+FilterClient::send_events (ACE_ENV_SINGLE_ARG_DECL)
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -332,10 +332,10 @@ FilterClient::send_events (TAO_ENV_SINGLE_ARG_DECL)
       // any
       event.remainder_of_body <<= (CORBA::Long)i;
 
-      supplier_1->send_event (event TAO_ENV_ARG_PARAMETER);
+      supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      supplier_2->send_event (event TAO_ENV_ARG_PARAMETER);
+      supplier_2->send_event (event ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -352,15 +352,15 @@ Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer (void)
 }
 
 void
-Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL)
+Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER);
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
@@ -368,21 +368,21 @@ Filter_StructuredPushConsumer::connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::
-    _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER);
+    _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
   proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Filter_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Filter_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_supplier_->
-    disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER);
+    disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -390,7 +390,7 @@ void
 Filter_StructuredPushConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -402,7 +402,7 @@ Filter_StructuredPushConsumer::offer_change
 void
 Filter_StructuredPushConsumer::push_structured_event
    (const CosNotification::StructuredEvent & notification
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -428,7 +428,7 @@ Filter_StructuredPushConsumer::push_structured_event
 
 void
 Filter_StructuredPushConsumer::disconnect_structured_push_consumer
-   (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+   (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -449,43 +449,43 @@ Filter_StructuredPushSupplier::~Filter_StructuredPushSupplier ()
 }
 
 void
-Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL)
+Filter_StructuredPushSupplier::connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL)
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER);
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
   proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Filter_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Filter_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 Filter_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -496,20 +496,20 @@ Filter_StructuredPushSupplier::subscription_change
 
 void
 Filter_StructuredPushSupplier::send_event
-   (const CosNotification::StructuredEvent& event TAO_ENV_ARG_DECL)
+   (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
   ACE_DEBUG ((LM_DEBUG,
               "%s is sending an event \n", my_name_.fast_rep ()));
 
-  proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER);
+  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Filter_StructuredPushSupplier::disconnect_structured_push_supplier
-   (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+   (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
index 6054e2bd1ab..c916d858315 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
@@ -46,41 +46,41 @@ class FilterClient
   ~FilterClient ();
   // Destructor
 
-  void init (int argc, char *argv [] TAO_ENV_ARG_DECL);
+  void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
   // Init the Client.
 
-  void run (TAO_ENV_SINGLE_ARG_DECL);
+  void run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the demo.
 
   void done (void);
   // Consumer calls done, We're done.
 
  protected:
-  void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
-  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Try to get hold of a running naming service.
 
-  void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL);
   // Try to resolve the Notify factory from the Naming service.
 
-  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
+  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
   // Create an EC.
 
-  void create_supplieradmin(TAO_ENV_SINGLE_ARG_DECL);
+  void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL);
   // Create the Supplier Admin.
 
-  void create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL);
+  void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL);
   // Create the Consumer Admin.
 
-  void create_consumers (TAO_ENV_SINGLE_ARG_DECL);
+  void create_consumers (ACE_ENV_SINGLE_ARG_DECL);
   // Create and initialize the consumers.
 
-  void create_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+  void create_suppliers (ACE_ENV_SINGLE_ARG_DECL);
   // create and initialize the suppliers.
 
-  void send_events (TAO_ENV_SINGLE_ARG_DECL);
+  void send_events (ACE_ENV_SINGLE_ARG_DECL);
   // send the events.
 
   // = Data Members
@@ -145,11 +145,11 @@ class Filter_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushCo
   Filter_StructuredPushConsumer (FilterClient* filter, const char *my_name);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
   // Connect the Consumer to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
 protected:
@@ -175,7 +175,7 @@ protected:
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -185,7 +185,7 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -193,7 +193,7 @@ protected:
        ));
 
   virtual void disconnect_structured_push_consumer (
-        TAO_ENV_SINGLE_ARG_DECL
+        ACE_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -216,15 +216,15 @@ class Filter_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSu
   // Constructor.
 
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
   virtual void send_event (const CosNotification::StructuredEvent& event
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
   // Send one event.
 
 protected:
@@ -246,7 +246,7 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -255,7 +255,7 @@ protected:
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-        TAO_ENV_SINGLE_ARG_DECL
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
index 3957d8425e5..845f7ab68f7 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
@@ -11,10 +11,10 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       client.init (argc, argv
-                   TAO_ENV_ARG_PARAMETER); //Init the Client
+                   ACE_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
-      client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index 13af016f3b7..495f573cd08 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -30,30 +30,30 @@ Subscribe::~Subscribe ()
 }
 
 void
-Subscribe::init (int argc, char *argv [] TAO_ENV_ARG_DECL)
+Subscribe::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
 {
-  init_ORB (argc, argv TAO_ENV_ARG_PARAMETER);
+  init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+  resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+  resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
+  create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER);
+  create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER);
+  create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe::run (TAO_ENV_SINGLE_ARG_DECL)
+Subscribe::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->send_events (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->send_events (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (g_result_count != EVENT_COUNT) // if we still need to wait for events, run the orb.
@@ -73,17 +73,17 @@ Subscribe::done (void)
 void
 Subscribe::init_ORB (int argc,
                       char *argv []
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
                                 ""
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_ptr poa_object  =
     this->orb_->resolve_initial_references("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (poa_object))
@@ -93,23 +93,23 @@ Subscribe::init_ORB (int argc,
       return;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object TAO_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
   ACE_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_CHECK;
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+Subscribe::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -117,12 +117,12 @@ Subscribe::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW (CORBA::UNKNOWN ());
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL)
+Subscribe::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -130,83 +130,83 @@ Subscribe::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     this->naming_context_->resolve (name
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe::create_EC (TAO_ENV_SINGLE_ARG_DECL)
+Subscribe::create_EC (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
                                          id
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-Subscribe::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL)
+Subscribe::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
+    ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 }
 
 void
-Subscribe:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL)
+Subscribe:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
+    ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 }
 
 void
-Subscribe::create_consumers (TAO_ENV_SINGLE_ARG_DECL)
+Subscribe::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
 {
   consumer_1_ = new Subscribe_StructuredPushConsumer (this);
   consumer_1_->connect (this->consumer_admin_.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   consumer_2_ = new Subscribe_StructuredPushConsumer (this);
   consumer_2_->connect (this->consumer_admin_.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe::create_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+Subscribe::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   supplier_1_ = new Subscribe_StructuredPushSupplier ();
   supplier_1_->connect (this->supplier_admin_.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   supplier_2_ = new Subscribe_StructuredPushSupplier ();
   supplier_2_->connect (this->supplier_admin_.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL)
+Subscribe::send_events (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Setup the CA to receive event_type : "domain_A", "Type_a"
   CosNotification::EventTypeSeq added(1);
@@ -220,7 +220,7 @@ Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL)
   removed[0].domain_name =  CORBA::string_dup ("*");
   removed[0].type_name = CORBA::string_dup ("*");
 
-  this->consumer_admin_->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the Consumer 1 to receive event_type : "domain_B", "Type_b"
@@ -233,7 +233,7 @@ Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL)
   removed_1.length (0);
 
   this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the Consumer 2 to receive event_type : "domain_C", "Type_c"
@@ -246,7 +246,7 @@ Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL)
   removed_2.length (0);
 
   this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the events - one of each type
@@ -286,11 +286,11 @@ Subscribe::send_events (TAO_ENV_SINGLE_ARG_DECL)
  // let supplier 1 send all these events
   for (int i = 0; i < 1; ++i)
     {
-      supplier_1_->send_event (event1 TAO_ENV_ARG_PARAMETER);
+      supplier_1_->send_event (event1 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      supplier_1_->send_event (event2 TAO_ENV_ARG_PARAMETER);
+      supplier_1_->send_event (event2 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      supplier_1_->send_event (event3 TAO_ENV_ARG_PARAMETER);
+      supplier_1_->send_event (event3 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -308,15 +308,15 @@ Subscribe_StructuredPushConsumer::~Subscribe_StructuredPushConsumer ()
 void
 Subscribe_StructuredPushConsumer::connect
    (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   // Activate the consumer with the default_POA_
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
-    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ TAO_ENV_ARG_PARAMETER);
+    consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
@@ -324,21 +324,21 @@ Subscribe_StructuredPushConsumer::connect
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::
-    _narrow (proxysupplier.in () TAO_ENV_ARG_PARAMETER);
+    _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
   proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Subscribe_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_supplier_->
-    disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_PARAMETER);
+    disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -346,7 +346,7 @@ void
 Subscribe_StructuredPushConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CosNotifyComm::InvalidEventType
@@ -358,7 +358,7 @@ Subscribe_StructuredPushConsumer::offer_change
 void
 Subscribe_StructuredPushConsumer::push_structured_event
    (const CosNotification::StructuredEvent & notification
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -379,7 +379,7 @@ Subscribe_StructuredPushConsumer::push_structured_event
 
 void
 Subscribe_StructuredPushConsumer::disconnect_structured_push_consumer
-   (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+   (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -406,43 +406,43 @@ Subscribe_StructuredPushSupplier::~Subscribe_StructuredPushSupplier ()
 void
 Subscribe_StructuredPushSupplier::connect
    (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
-    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ TAO_ENV_ARG_PARAMETER);
+    supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
 
   // narrow
   this->proxy_consumer_ =
-    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () TAO_ENV_ARG_PARAMETER);
+    CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
   proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Subscribe_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Subscribe_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->disconnect_structured_push_consumer(TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_consumer_->disconnect_structured_push_consumer(ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 Subscribe_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -454,17 +454,17 @@ Subscribe_StructuredPushSupplier::subscription_change
 void
 Subscribe_StructuredPushSupplier::send_event
    (const CosNotification::StructuredEvent& event
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER);
+  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Subscribe_StructuredPushSupplier::disconnect_structured_push_supplier
-   (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+   (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index 37124da02eb..578151b170e 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -42,41 +42,41 @@ class Subscribe
   Subscribe (void);
   ~Subscribe ();
 
-  void init (int argc, char *argv [] TAO_ENV_ARG_DECL);
+  void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
   // Init the Client.
 
-  void run (TAO_ENV_SINGLE_ARG_DECL);
+  void run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the demo.
 
   void done (void);
   // Called when all events we are waiting for have occured.
 
  protected:
-  void init_ORB (int argc, char *argv [] TAO_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
-  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Try to get hold of a running naming service.
 
-  void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL);
   // Try to resolve the Notify factory from the Naming service.
 
-  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
+  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
   // Create an EC.
 
-  void create_supplieradmin(TAO_ENV_SINGLE_ARG_DECL);
+  void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL);
   // Create the Supplier Admin.
 
-  void create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL);
+  void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL);
   // Create the Consumer Admin.
 
-  void create_consumers (TAO_ENV_SINGLE_ARG_DECL);
+  void create_consumers (ACE_ENV_SINGLE_ARG_DECL);
   // Create and initialize the consumers.
 
-  void create_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+  void create_suppliers (ACE_ENV_SINGLE_ARG_DECL);
   // create and initialize the suppliers.
 
-  void send_events (TAO_ENV_SINGLE_ARG_DECL);
+  void send_events (ACE_ENV_SINGLE_ARG_DECL);
   // send the events.
 
   // = Data Members
@@ -135,11 +135,11 @@ class Subscribe_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPus
   Subscribe_StructuredPushConsumer (Subscribe* subscribe);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
   // Connect the Consumer to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
@@ -164,7 +164,7 @@ protected:
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -174,7 +174,7 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -182,7 +182,7 @@ protected:
        ));
 
   virtual void disconnect_structured_push_consumer (
-        TAO_ENV_SINGLE_ARG_DECL
+        ACE_ENV_SINGLE_ARG_DECL
         )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -205,15 +205,15 @@ class Subscribe_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPus
   // Constructor.
 
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
   virtual void send_event (const CosNotification::StructuredEvent& event
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
   // Send one event.
 
 protected:
@@ -232,7 +232,7 @@ protected:
   virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -241,7 +241,7 @@ protected:
 
   // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-        TAO_ENV_SINGLE_ARG_DECL
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
index e7e5550a01e..b817728c231 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
@@ -11,10 +11,10 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       client.init (argc, argv
-                   TAO_ENV_ARG_PARAMETER); //Init the Client
+                   ACE_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
-      client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
index 12913369c99..6452c3393ee 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.cpp
@@ -16,18 +16,18 @@ CORBA::Object_ptr
 Gateway_ObjRef_Factory::
 make_object (const char *interface_repository_id,
              const PortableInterceptor::ObjectId & id
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object =
     this->old_factory_->make_object (interface_repository_id,
                                      id
-                                     TAO_ENV_ARG_DECL);
+                                     ACE_ENV_ARG_DECL);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   CORBA::Object_ptr object_ptr =
     this->gateway_object_factory_->create_object (interface_repository_id,
                                                   object.in ()
-                                                  TAO_ENV_ARG_DECL);
+                                                  ACE_ENV_ARG_DECL);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return object_ptr;
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
index cf3cc01c34d..a49fbcde666 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
+++ b/TAO/orbsvcs/examples/ORT/Gateway_ObjRef_Factory.h
@@ -31,7 +31,7 @@ class Gateway_ObjRef_Factory
 
   virtual CORBA::Object_ptr make_object (const char *repository_id,
                                          const PortableInterceptor::ObjectId &id
-                                        TAO_ENV_ARG_DECL);
+                                        ACE_ENV_ARG_DECL);
 
  private:
 
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
index 0fe5ba3bf64..7391e9c9f65 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
@@ -28,7 +28,7 @@ Gateway_i (CORBA::ORB_ptr orb,
 
 void
 Gateway_i::invoke (CORBA::ServerRequest_ptr request
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   PortableServer::ObjectId_var target_id =
     this->poa_current_->get_object_id ();
@@ -38,12 +38,12 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
 
   CORBA::Object_var target_object =
     this->orb_->string_to_object (stringified_object_id.in ()
-                                  TAO_ENV_ARG_DECL);
+                                  ACE_ENV_ARG_DECL);
   ACE_CHECK;
 
   // Use the IfR interfaces to query the NVList for this object...
   CORBA::InterfaceDef_var interface =
-    target_object->_get_interface (TAO_ENV_ARG_DECL);
+    target_object->_get_interface (ACE_ENV_ARG_DECL);
   ACE_CHECK;
 
   if (CORBA::is_nil (interface.in ()))
@@ -63,7 +63,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
 
   // Save the result typecode...
   CORBA::TypeCode_var result_typecode =
-    operation.in ()->result (TAO_ENV_ARG_DECL);
+    operation.in ()->result (ACE_ENV_ARG_DECL);
   ACE_CHECK;
 
   CORBA::ParDescriptionSeq_var parameters =
@@ -73,7 +73,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
   CORBA::NVList_ptr arguments;
   this->orb_->create_list (parameters->length (),
                            arguments
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
   ACE_CHECK;
 
   CORBA::Flags flags;
@@ -105,12 +105,12 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
       arguments->add_value (parameters[i].name,
                             any,
                             flags
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
       ACE_CHECK;
     }
 
   // Extract the values of the arguments from the DSI ServerRequest
-  request->arguments (arguments TAO_ENV_ARG_DECL);
+  request->arguments (arguments ACE_ENV_ARG_DECL);
 
   // Use the NVList (with values) to create a DII Request...
   CORBA::Request_var dii_request;
@@ -118,7 +118,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
   CORBA::NamedValue *named_value;
 
   this->orb_->create_named_value (named_value
-                                  TAO_ENV_ARG_DECL);
+                                  ACE_ENV_ARG_DECL);
   ACE_CHECK;
 
   CORBA::ContextList *context_list = 0;
@@ -132,7 +132,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
                                   context_list, /* Context List */
                                   dii_request.inout (),
                                   CORBA::Flags (0)
-                                  TAO_ENV_ARG_DECL);
+                                  ACE_ENV_ARG_DECL);
   ACE_CHECK;
 
   // Set the return type...
@@ -141,7 +141,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
   ACE_TRY
     {
       // Make the DII request
-      dii_request->invoke (TAO_ENV_ARG_DECL);
+      dii_request->invoke (ACE_ENV_ARG_DECL);
       ACE_TRY_CHECK;
 
       // At this point the NVList contains all the out and inout
@@ -172,7 +172,7 @@ Gateway_i::invoke (CORBA::ServerRequest_ptr request
 CORBA::RepositoryId
 Gateway_i::_primary_interface (const PortableServer::ObjectId &,
                                PortableServer::POA_ptr
-                               TAO_ENV_ARG_DECL_NOT_USED)
+                               ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.h b/TAO/orbsvcs/examples/ORT/Gateway_i.h
index 88c8860829b..ce662e3b46f 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.h
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.h
@@ -30,12 +30,12 @@ public:
              PortableServer::Current_ptr poa_current);
 
   virtual void invoke (CORBA::ServerRequest_ptr request
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
       PortableServer::POA_ptr poa
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
  private:
 
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
index 7967157e6be..7340fb7830a 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
@@ -16,11 +16,11 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb,
 CORBA::Object_ptr
 Object_Factory_i::create_object (const char *interface_repository_id,
                                  CORBA::Object_ptr gatewayed_object
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var stringified_object =
-    this->orb_->object_to_string (gatewayed_object TAO_ENV_ARG_DECL);
+    this->orb_->object_to_string (gatewayed_object ACE_ENV_ARG_DECL);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   const PortableServer::ObjectId_var id =
@@ -44,7 +44,7 @@ Object_Factory_i::create_object (const char *interface_repository_id,
   CORBA::Object_ptr object_ptr =
     ort->make_object (interface_repository_id,
                       *obj_id
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return object_ptr;
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
index 206f8fd5ff7..add32112dbd 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.h
@@ -33,7 +33,7 @@ class Object_Factory_i : public virtual POA_Gateway::Object_Factory
   CORBA::Object_ptr
     create_object (const char *interface_repository_id,
                    CORBA::Object_ptr gatewayed_object
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
index 4764242e5a2..ce7279dd995 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.cpp
@@ -18,14 +18,14 @@ Server_IORInterceptor (Gateway::Object_Factory_ptr
 }
 
 char *
-Server_IORInterceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_IORInterceptor");
 }
 
 void
-Server_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->gateway_object_factory_ = Gateway::Object_Factory::_nil ();
@@ -34,10 +34,10 @@ Server_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Server_IORInterceptor::establish_components (
     PortableInterceptor::IORInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::String_var name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the length of the string plus one for the NULL terminator.
@@ -60,7 +60,7 @@ Server_IORInterceptor::establish_components (
 
   // Add the tagged component to all profiles.
   info->add_ior_component (ORT_Component
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
index 3d1f5947911..0ca90dca802 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor.h
@@ -38,34 +38,34 @@ class Server_IORInterceptor :
    */
   //@{
   /// Return the name of this IORInterceptor.
-  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));
 
   /// Cleanup resources acquired by this IORInterceptor.
-  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));
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
       PortableInterceptor::IORInfo_ptr info
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void components_established (
       PortableInterceptor::IORInfo_ptr info
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
       PortableInterceptor::AdapterManagerId id,
       PortableInterceptor::AdapterState state
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
       PortableInterceptor::AdapterState state
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
index e17ff769ddf..68b32004c1c 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
@@ -15,7 +15,7 @@ ACE_RCSID (ORT,
 void
 Server_IORInterceptor_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -23,17 +23,17 @@ Server_IORInterceptor_ORBInitializer::pre_init (
 void
 Server_IORInterceptor_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_var obj =
     info->resolve_initial_references ("Gateway_Object_Factory"
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   /// Narrow it down correctly.
   Gateway::Object_Factory_var gateway_object_factory =
-    Gateway::Object_Factory::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+    Gateway::Object_Factory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_TRY_CHECK;
 
   /// Check for nil reference
@@ -56,6 +56,6 @@ Server_IORInterceptor_ORBInitializer::post_init (
     gateway;
 
   info->add_ior_interceptor (ior_interceptor.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
index fd588c8cdc8..4eb8ac2d3e7 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.h
@@ -28,12 +28,12 @@ class Server_IORInterceptor_ORBInitializer
   //@{
   /// The pre-initialization hook.
   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));
 
   /// The post-initialization hook.
   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/orbsvcs/examples/ORT/client.cpp b/TAO/orbsvcs/examples/ORT/client.cpp
index e7642915681..70caad06d63 100644
--- a/TAO/orbsvcs/examples/ORT/client.cpp
+++ b/TAO/orbsvcs/examples/ORT/client.cpp
@@ -46,11 +46,11 @@ main (int argc, char *argv[])
         return 1;
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior TAO_ENV_ARG_DECL);
+        orb->string_to_object (ior ACE_ENV_ARG_DECL);
       ACE_TRY_CHECK;
 
       ORT::sum_server_var server =
-        ORT::sum_server::_narrow (obj.in () TAO_ENV_ARG_DECL);
+        ORT::sum_server::_narrow (obj.in () ACE_ENV_ARG_DECL);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -66,7 +66,7 @@ main (int argc, char *argv[])
 
       CORBA::ULong result = server->add_variables (a,
                                                    b
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
       ACE_TRY_CHECK;
 
       cout << "**************************RREESSUULLTT: *****" <<
diff --git a/TAO/orbsvcs/examples/ORT/gateway_server.cpp b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
index 8549bf9a00a..135d9c710d5 100644
--- a/TAO/orbsvcs/examples/ORT/gateway_server.cpp
+++ b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             "gateway_server_orb"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -51,12 +51,12 @@ main (int argc, char *argv[])
       /// Resolve reference to RootPOA
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Narrow it down correctly.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Check for nil references
@@ -67,11 +67,11 @@ main (int argc, char *argv[])
 
       /// Get poa_manager reference
       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;
 
       /// Activate it.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ///@}
@@ -81,25 +81,25 @@ main (int argc, char *argv[])
 
       policies [0] =
         root_poa->create_servant_retention_policy (PortableServer::RETAIN
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policies [1] =
         root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       policies [2] =
         root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var gateway_poa =
         root_poa->create_POA ("Gateway_POA",
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0; i != policies.length (); ++i) {
@@ -109,13 +109,13 @@ main (int argc, char *argv[])
       // Get the POA Current object reference
       obj =
         orb->resolve_initial_references ("POACurrent"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference to a POA Current reference
       PortableServer::Current_var poa_current =
         PortableServer::Current::_narrow (obj.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Gateway_i *gateway;
@@ -126,7 +126,7 @@ main (int argc, char *argv[])
                         CORBA::NO_MEMORY ());
       ACE_TRY_CHECK;
 
-      gateway_poa->set_servant (gateway TAO_ENV_ARG_PARAMETER);
+      gateway_poa->set_servant (gateway ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Get the ObjectID
@@ -145,7 +145,7 @@ main (int argc, char *argv[])
       /// Activate the Object_Factory_i Object
       gateway_poa->activate_object_with_id (oid.in (),
                                             object_factory
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the object reference.
@@ -155,7 +155,7 @@ main (int argc, char *argv[])
       /// Convert the object reference to a string format.
       CORBA::String_var ior =
         orb->object_to_string (gateway_object_factory.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// If the ior_output_file exists, output the IOR to it.
@@ -172,7 +172,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/examples/ORT/server.cpp b/TAO/orbsvcs/examples/ORT/server.cpp
index ddb7512a775..7290ea13a32 100644
--- a/TAO/orbsvcs/examples/ORT/server.cpp
+++ b/TAO/orbsvcs/examples/ORT/server.cpp
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
         orb_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer_var.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             "server_sum_orb"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -74,12 +74,12 @@ main (int argc, char *argv[])
       /// Resolve reference to RootPOA
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Narrow it down correctly.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Check for nil references
@@ -90,11 +90,11 @@ main (int argc, char *argv[])
 
       /// Get poa_manager reference
       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;
 
       /// Activate it.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ///@}
@@ -103,13 +103,13 @@ main (int argc, char *argv[])
       sum_server_i sum_server_impl;
 
       /// Activate
-      obj = sum_server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      obj = sum_server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Narrow it down.
       ORT::sum_server_var sum_server =
         ORT::sum_server::_narrow (obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Check for nil reference
@@ -121,7 +121,7 @@ main (int argc, char *argv[])
 
       /// Convert the object reference to a string format.
       CORBA::String_var ior =
-        orb->object_to_string (sum_server.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (sum_server.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// If the ior_output_file exists, output the IOR to it.
@@ -138,7 +138,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_INFO, "Successful.\n"));
diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
index 205cabf7e1e..8d2014066f4 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/sum_server_i.cpp
@@ -13,7 +13,7 @@ sum_server_i::sum_server_i ()
 CORBA::Long
 sum_server_i::add_variables (CORBA::Long a,
                              CORBA::Long b
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   cout << __FILE__ << __LINE__ << endl;
diff --git a/TAO/orbsvcs/examples/ORT/sum_server_i.h b/TAO/orbsvcs/examples/ORT/sum_server_i.h
index 1501c410327..ea38c4ae7ab 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server_i.h
+++ b/TAO/orbsvcs/examples/ORT/sum_server_i.h
@@ -32,7 +32,7 @@ class sum_server_i : public virtual POA_ORT::sum_server
   /// add variables method
   CORBA::Long add_variables (CORBA::Long a,
                              CORBA::Long b
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
index bfa2b4e8bd8..05fd4d9c983 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.cpp
@@ -12,7 +12,7 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr)
 void
 AddrServer::get_addr (const RtecEventComm::EventHeader&,
                       RtecUDPAdmin::UDP_Addr_out addr
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr = this->addr_;
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
index fc3610771df..72e99b0d205 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h
@@ -41,7 +41,7 @@ public:
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
                          RtecUDPAdmin::UDP_Addr_out addr
-                         TAO_ENV_ARG_DECL_NOT_USED)
+                         ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
index c6e79b3ef6b..ff393428e06 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -13,14 +13,14 @@ Consumer::Consumer (void)
 
 void
 Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   this->proxy_ =
-    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushConsumer_var me =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Simple subscription, but usually the helper classes in
@@ -40,17 +40,17 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
   h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
   this->proxy_->connect_push_consumer (me.in (), qos
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       // Disconnect from the proxy
-      this->proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -62,20 +62,20 @@ Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   // Deactivate this object
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   // Get the Object Id used for the servant..
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   // Deactivate the object
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Consumer::push (const RtecEventComm::EventSet& events
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -95,7 +95,7 @@ Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
index c71328b15d4..536404b824b 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
@@ -38,18 +38,18 @@ public:
   // Constructor
 
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
   // Connect to the Event Channel
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the event channel
 
   // = The RtecEventComm::PushConsumer methods
 
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
index 82df7818a72..6dabe408305 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -44,18 +44,18 @@ main (int argc, char* argv[])
   //
   // If your platform supports native exceptions, and TAO was compiled
   // with native exception support then you can simply use try/catch
-  // and avoid the TAO_ENV_SINGLE_ARG_PARAMETER argument.
+  // and avoid the ACE_ENV_SINGLE_ARG_PARAMETER argument.
   // Unfortunately many embedded systems cannot use exceptions due to
   // the space and time overhead.
   //
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // **************** HERE STARTS THE ORB SETUP
 
       // Create the ORB, pass the argv list for parsing.
       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 the arguments, you usually want to do this after
@@ -73,15 +73,15 @@ main (int argc, char* argv[])
       // The POA starts in the holding state, if it is not activated
       // it will not process any requests.
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // **************** THAT COMPLETS THE ORB SETUP
@@ -104,14 +104,14 @@ main (int argc, char* argv[])
       // that may involve creating some threads.
       // But it should always be invoked because several internal data
       // structures are initialized at that point.
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The event channel is activated as any other CORBA servant.
       // In this case we use the simple implicit activation with the
       // RootPOA
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **************** THAT COMPLETES THE LOCAL EVENT CHANNEL SETUP
@@ -148,7 +148,7 @@ main (int argc, char* argv[])
       // Now we create and activate the servant
       AddrServer as_impl (addr);
       RtecUDPAdmin::AddrServer_var address_server =
-        as_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        as_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We need a local socket to send the data, open it and check
@@ -165,7 +165,7 @@ main (int argc, char* argv[])
       sender.init (event_channel.in (),
                    address_server.in (),
                    &endpoint
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now we connect the sender as a consumer of events, it will
@@ -180,7 +180,7 @@ main (int argc, char* argv[])
       sub.dependencies[0].event.header.source =
         ACE_ES_EVENT_SOURCE_ANY; // Any source is OK
 
-      sender.open (sub TAO_ENV_ARG_PARAMETER);
+      sender.open (sub ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // To receive events we need to setup an event handler:
@@ -198,7 +198,7 @@ main (int argc, char* argv[])
       // Then it register for the multicast groups that carry those
       // events:
       int r = mcast_eh.open (event_channel.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         {
@@ -222,7 +222,7 @@ main (int argc, char* argv[])
                      orb->orb_core ()->reactor (),
                      expire,
                      max_expiration_count
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The Receiver is also a supplier of events.  The exact type of
@@ -242,7 +242,7 @@ main (int argc, char* argv[])
       pub.publications[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY;
       pub.is_gateway = 1;
 
-      receiver.open (pub TAO_ENV_ARG_PARAMETER);
+      receiver.open (pub ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **************** THAT COMPLETES THE FEDERATION SETUP
@@ -253,19 +253,19 @@ main (int argc, char* argv[])
       // channel
       Consumer consumer;
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       consumer.connect (consumer_admin.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // And now create a supplier
       Supplier supplier;
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier.connect (supplier_admin.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **************** THAT COMPLETES THE CLIENT SETUP
@@ -278,7 +278,7 @@ main (int argc, char* argv[])
       for (int i = 0; i != 1000; ++i)
         {
           CORBA::Boolean there_is_work =
-            orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER);
+            orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (there_is_work)
             {
@@ -287,12 +287,12 @@ main (int argc, char* argv[])
               // perform_work() or work_pending(), so just calling
               // them results in a spin loop.
               ACE_Time_Value tv (0, 50000);
-              orb->perform_work (tv TAO_ENV_ARG_PARAMETER);
+              orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_Time_Value tv (0, 100000);
           ACE_OS::sleep (tv);
-          supplier.perform_push (TAO_ENV_SINGLE_ARG_PARAMETER);
+          supplier.perform_push (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -301,16 +301,16 @@ main (int argc, char* argv[])
       // **************** HERE STARTS THE CLEANUP CODE
 
       // First the easy ones
-      supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now let us close the Receiver
-      receiver.close (TAO_ENV_SINGLE_ARG_PARAMETER);
+      receiver.close (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      r = mcast_eh.close (TAO_ENV_SINGLE_ARG_PARAMETER);
+      r = mcast_eh.close (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         {
@@ -319,13 +319,13 @@ main (int argc, char* argv[])
         }
 
       // And also close the sender of events
-      sender.close (TAO_ENV_SINGLE_ARG_PARAMETER);
+      sender.close (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The event channel must be destroyed, so it can release its
       // resources, and inform all the clients that are still
       // connected that it is going away.
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Deactivating the event channel implementation is not strictly
@@ -337,24 +337,24 @@ main (int argc, char* argv[])
         // is the root POA, but the code is more robust if we don't
         // rely on that.
         PortableServer::POA_var poa =
-          ec_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ec_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
         // Get the Object Id used for the servant..
         PortableServer::ObjectId_var oid =
-          poa->servant_to_id (&ec_impl TAO_ENV_ARG_PARAMETER);
+          poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
         // Deactivate the object
-        poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+        poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
       // Now we can destroy the POA, the flags mean that we want to
       // wait until the POA is really destroyed
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Finally destroy the ORB
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **************** THAT COMPLETES THE CLEANUP CODE
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index 1904326e03e..2572716d1e8 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -12,14 +12,14 @@ Supplier::Supplier (void)
 
 void
 Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   this->proxy_ =
-    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushSupplier_var me =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Simple publication, but usually the helper classes in
@@ -34,17 +34,17 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
   h0.source = 1;                      // first free event source
 
   this->proxy_->connect_push_supplier (me.in (), qos
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Disconnect from the EC
   ACE_TRY
     {
-      this->proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -53,17 +53,17 @@ Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
   ACE_ENDTRY;
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Supplier::perform_push (TAO_ENV_SINGLE_ARG_DECL)
+Supplier::perform_push (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -75,7 +75,7 @@ Supplier::perform_push (TAO_ENV_SINGLE_ARG_DECL)
       // Avoid loops throught the event channel federations
       event[0].header.ttl    = 1;
 
-      this->proxy_->push (event TAO_ENV_ARG_PARAMETER);
+      this->proxy_->push (event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -85,7 +85,7 @@ Supplier::perform_push (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
index a8d6c6ff31d..7c591f5fdb7 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
@@ -39,18 +39,18 @@ public:
   // Constructor
 
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
   // Connect to the event channel
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the event channel
 
-  void perform_push (TAO_ENV_SINGLE_ARG_DECL);
+  void perform_push (ACE_ENV_SINGLE_ARG_DECL);
   // Push a single event
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
index 4793a20ab13..e207d997042 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.cpp
@@ -10,7 +10,7 @@ Consumer::Consumer (void)
 
 void
 Consumer::push (const RtecEventComm::EventSet& events
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -25,7 +25,7 @@ Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
index 20c1ffad011..bdbdbaad894 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
@@ -45,9 +45,9 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 };
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index 52485b074cf..41b84c08355 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -30,12 +30,12 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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) == -1)
@@ -46,15 +46,15 @@ main (int argc, char* argv[])
         }
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
@@ -62,11 +62,11 @@ main (int argc, char* argv[])
 #if 0
       // Obtain a reference to the naming service...
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* 0 */
 
@@ -93,7 +93,7 @@ main (int argc, char* argv[])
         }
 
       RtecScheduler::Scheduler_var scheduler =
-        sched_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        sched_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if 0
@@ -106,7 +106,7 @@ main (int argc, char* argv[])
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
       // Register the servant with the Naming Context....
       naming_context->rebind (schedule_name, scheduler.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* 0 */
 
@@ -121,7 +121,7 @@ main (int argc, char* argv[])
                                            &module_factory);
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        event_channel_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
 
@@ -131,12 +131,12 @@ main (int argc, char* argv[])
 
       TAO_EC_Event_Channel ec_impl (attributes);
       ACE_DEBUG ((LM_DEBUG, "activating EC\n"));
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "EC activated\n"));
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* 0 */
 
@@ -148,7 +148,7 @@ main (int argc, char* argv[])
       Consumer consumer_impl;
 
       RtecScheduler::handle_t consumer_rt_info1 =
-        scheduler->create ("consumer_event_1" TAO_ENV_ARG_PARAMETER);
+        scheduler->create ("consumer_event_1" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Let's say that the execution time for event 1 is 2
@@ -164,11 +164,11 @@ main (int argc, char* argv[])
                       time,
                       0,
                       RtecScheduler::OPERATION
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecScheduler::handle_t consumer_rt_info2 =
-        scheduler->create ("consumer_event_2" TAO_ENV_ARG_PARAMETER);
+        scheduler->create ("consumer_event_2" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Let's say that the execution time for event 2 is 1
@@ -183,7 +183,7 @@ main (int argc, char* argv[])
                       time,
                       0,
                       RtecScheduler::OPERATION
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ConsumerQOS_Factory consumer_qos;
@@ -197,21 +197,21 @@ main (int argc, char* argv[])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy =
-        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushConsumer_var consumer =
-        consumer_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        consumer_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connecting consumer\n"));
       supplier_proxy->connect_push_consumer (consumer.in (),
                                              consumer_qos.get_ConsumerQOS ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "consumer connected\n"));
 
@@ -220,7 +220,7 @@ main (int argc, char* argv[])
       Supplier supplier_impl;
 
       RtecScheduler::handle_t supplier_rt_info1 =
-        scheduler->create ("supplier_event_1" TAO_ENV_ARG_PARAMETER);
+        scheduler->create ("supplier_event_1" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The execution times are set to reasonable values, but
@@ -240,11 +240,11 @@ main (int argc, char* argv[])
                       0,
                       1,
                       RtecScheduler::OPERATION
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecScheduler::handle_t supplier_rt_info2 =
-        scheduler->create ("supplier_event_2" TAO_ENV_ARG_PARAMETER);
+        scheduler->create ("supplier_event_2" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The execution times are set to reasonable values, but
@@ -263,7 +263,7 @@ main (int argc, char* argv[])
                       0,
                       1,
                       RtecScheduler::OPERATION
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::EventSourceID supplier_id = 1;
@@ -279,21 +279,21 @@ main (int argc, char* argv[])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy =
-        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushSupplier_var supplier =
-        supplier_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        supplier_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connecting supplier\n"));
       consumer_proxy->connect_push_supplier (supplier.in (),
                                              supplier_qos.get_SupplierQOS ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "supplier connected\n"));
 
@@ -330,7 +330,7 @@ main (int argc, char* argv[])
                                          infos.out (),
                                          configs.out (),
                                          anomalies.out ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Dump the schedule to a file..
@@ -362,12 +362,12 @@ main (int argc, char* argv[])
         {
           if (i % 2 == 0)
             {
-              consumer_proxy->push (event1 TAO_ENV_ARG_PARAMETER);
+              consumer_proxy->push (event1 ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             {
-              consumer_proxy->push (event2 TAO_ENV_ARG_PARAMETER);
+              consumer_proxy->push (event2 ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
index f60d585f1ec..badc65b011d 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
@@ -9,7 +9,7 @@ Supplier::Supplier (void)
 }
 
 void
-Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
index e6139801c49..b0391f7602b 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
@@ -44,7 +44,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index d0d81303d5c..191503bfb3d 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -24,12 +24,12 @@ Consumer::Consumer (void)
 int
 Consumer::run (int argc, char* argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       // Do *NOT* make a copy because we don't want the ORB to outlive
@@ -44,40 +44,40 @@ Consumer::run (int argc, char* argv[])
         }
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
         RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushSupplier_var supplier =
-        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushConsumer_var consumer =
-        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Simple subscription, but usually the helper classes in
@@ -95,7 +95,7 @@ Consumer::run (int argc, char* argv[])
       h1.source = ACE_ES_EVENT_SOURCE_ANY;
 
       supplier->connect_push_consumer (consumer.in (), qos
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Wait for events, using work_pending()/perform_work() may help
@@ -120,7 +120,7 @@ Consumer::run (int argc, char* argv[])
 
 void
 Consumer::push (const RtecEventComm::EventSet& events
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -140,13 +140,13 @@ Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // In this example we shutdown the ORB when we disconnect from the
   // EC (or rather the EC disconnects from us), but this doesn't have
   // to be the case....
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
index e7dfda0c32a..19005b96ec1 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
@@ -42,9 +42,9 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
index ad054096ce4..657aaae2f3b 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -15,12 +15,12 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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) == -1)
@@ -31,30 +31,30 @@ main (int argc, char* argv[])
         }
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       TAO_EC_Event_Channel_Attributes attributes (poa.in (),
                                                   poa.in ());
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 32ea062d450..481850d7a64 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -23,12 +23,12 @@ Supplier::Supplier (void)
 int
 Supplier::run (int argc, char* argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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 (argc <= 1)
@@ -39,40 +39,40 @@ Supplier::run (int argc, char* argv[])
         }
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // Obtain the event channel, we could use a naming service, a
       // command line argument or resolve_initial_references(), but
       // this is simpler...
       object =
-        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
         RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushConsumer_var consumer =
-        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushSupplier_var supplier =
-        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Simple publication, but usually the helper classes in
@@ -85,7 +85,7 @@ Supplier::run (int argc, char* argv[])
       h0.source = 1;                      // first free event source
 
       consumer->connect_push_supplier (supplier.in (), qos
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Push the events...
@@ -99,28 +99,28 @@ Supplier::run (int argc, char* argv[])
 
       for (int i = 0; i != 2000; ++i)
         {
-          consumer->push (event TAO_ENV_ARG_PARAMETER);
+          consumer->push (event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_OS::sleep (sleep_time);
         }
 
       // Disconnect from the EC
-      consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the EC....
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Deactivate this object...
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the POA
-      poa->destroy (1, 0 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -133,7 +133,7 @@ Supplier::run (int argc, char* argv[])
 }
 
 void
-Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
index 72a72f74395..b1fce544ccc 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
@@ -41,7 +41,7 @@ public:
 
   // = The RtecEventComm::PushSupplier methods
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
index bbef4bc291e..2153014c111 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.cpp
@@ -14,13 +14,13 @@ static int authorize_1 = 1;
 static int authorize_2 = 1;
 
 CORBA::Boolean
-SLevel1_Server_i::authorize_level1 (TAO_ENV_SINGLE_ARG_DECL)
+SLevel1_Server_i::authorize_level1 (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   /// Get a reference to the SecurityCurrent object.
   CORBA::Object_var obj =
-    orb->resolve_initial_references ("SecurityCurrent" TAO_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("SecurityCurrent" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
     /// Narrow it down correctly.
@@ -110,7 +110,7 @@ SLevel1_Server_i::authorize_level1 (TAO_ENV_SINGLE_ARG_DECL)
 
 
 CORBA::Boolean
-SLevel1_Server_i::authorize_level2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+SLevel1_Server_i::authorize_level2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// If the owner of this invocation is authorized to invoke this
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
index 7448af5dadc..d284e65c293 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
@@ -25,10 +25,10 @@ class SLevel1_Server_i : public POA_SLevel1_Server
   SLevel1_Server_i ();
 
   ///
-  CORBA::Boolean authorize_level1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Boolean authorize_level1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean authorize_level2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Boolean authorize_level2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   static int authorized_1;
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
index 651169f1c21..b7779c65615 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
@@ -37,18 +37,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->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       SLevel1_Server_var server =
-        SLevel1_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        SLevel1_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -60,7 +60,7 @@ main (int argc, char *argv [])
         }
 
       CORBA::Boolean authorized =
-        server->authorize_level1 (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server->authorize_level1 (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (authorized == 0)
@@ -70,10 +70,10 @@ main (int argc, char *argv [])
         ACE_DEBUG ((LM_DEBUG,
                     "DENIED: You Do NOT have enough privileges\n"));
 
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (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/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
index 7a70989ebf0..2b39bda82e3 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
@@ -15,12 +15,12 @@ main (int argc, char *argv[])
     {
       /// Our regular ORB Initialization.
       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;
 
       /// Get a reference to the RootPOA.
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -30,18 +30,18 @@ main (int argc, char *argv[])
 
       /// Narrow down the reference to the currect interface.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       SLevel1_Server_i level1_server ();
 
       SLevel1_Server_var server =
-        level1_server._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        level1_server._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
       // Start the ORB
       orb->run ();
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/orbsvcs/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
index f82560ff07e..507bdde5847 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
@@ -39,18 +39,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->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -67,15 +67,15 @@ main (int argc, char *argv[])
           char *line = buf.read ('\n');
           if (line == 0)
             break;
-          server->send_line (line TAO_ENV_ARG_PARAMETER);
+          server->send_line (line ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           buf.alloc ()->free (line);
         }
 
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (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/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index 846d129d28e..fd1b150a481 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -38,11 +38,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -86,15 +86,15 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::sleep (5);
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
index c292b05581b..62d1ff2e04a 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
@@ -10,14 +10,14 @@ ACE_RCSID(Send_File, test_i, "$Id$")
 
 void
 Simple_Server_i::send_line (const char *line
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "%s\n", line));
 }
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.h b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
index ccf178af83f..10b18e60116 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
@@ -32,10 +32,10 @@ public:
 
   // = The Simple_Server methods.
   void send_line (const char *line
-                  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:
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index efbedd11025..4b2ef6a487e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -73,7 +73,7 @@ TAO_Basic_StreamCtrl::TAO_Basic_StreamCtrl (void)
 // Empty the_spec means apply operation to all flows
 void
 TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
@@ -92,7 +92,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
                 if (this->flow_connection_map_.find (flow_name_key,
                                                      flow_connection_entry) == 0)
                   {
-                    flow_connection_entry->int_id_->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
+                    flow_connection_entry->int_id_->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
                     ACE_TRY_CHECK;
                   }
               }
@@ -103,7 +103,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
               FlowConnection_Map_Entry *entry = 0;
               for (;iterator.next (entry) !=  0;iterator.advance ())
                 {
-                  entry->int_id_->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
+                  entry->int_id_->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -122,7 +122,7 @@ TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
 // Empty the_spec means apply operation to all flows
 void
 TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
@@ -142,7 +142,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
                 if (this->flow_connection_map_.find (flow_name_key,
                                                      flow_connection_entry) == 0)
                   {
-                    flow_connection_entry->int_id_->start (TAO_ENV_SINGLE_ARG_PARAMETER);
+                    flow_connection_entry->int_id_->start (ACE_ENV_SINGLE_ARG_PARAMETER);
                     ACE_TRY_CHECK;
                   }
               }
@@ -153,7 +153,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
               FlowConnection_Map_Entry *entry = 0;
               for (;iterator.next (entry) !=  0;iterator.advance ())
                 {
-                  entry->int_id_->start (TAO_ENV_SINGLE_ARG_PARAMETER);
+                  entry->int_id_->start (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -174,7 +174,7 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
 
 void
 TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow))
 {
@@ -192,7 +192,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
                 FlowConnection_Map::ENTRY *flow_connection_entry = 0;
                 if (this->flow_connection_map_.find (flow_name_key, flow_connection_entry) == 0)
                   {
-                    flow_connection_entry->int_id_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+                    flow_connection_entry->int_id_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
                     ACE_TRY_CHECK;
                   }
               }
@@ -204,7 +204,7 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
               FlowConnection_Map_Entry *entry = 0;
               for (;iterator.next (entry) !=  0;iterator.advance ())
                 {
-                  entry->int_id_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+                  entry->int_id_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -225,7 +225,7 @@ CORBA::Boolean
 
 TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/,
                                   const AVStreams::flowSpec &/*flowspec*/
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed))
@@ -237,7 +237,7 @@ TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & /*new_qos*/,
 // E.g., loss of flow, reestablishment of flow, etc..
 void
 TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*the_event*/
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -249,7 +249,7 @@ void
 TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
                                     const char  *fp_name,
                                     const CORBA::Any &fp_settings
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::FPError))
@@ -257,7 +257,7 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
 {
   if (!CORBA::is_nil (this->sep_a_.in ()))
     {
-      this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings TAO_ENV_ARG_PARAMETER);
+      this->sep_a_->set_FPStatus (flow_spec, fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -265,7 +265,7 @@ TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &flow_spec,
 // Gets the flow connection.
 CORBA::Object_ptr
 TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::notSupported))
@@ -282,7 +282,7 @@ TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name
 void
 TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
                                            CORBA::Object_ptr flow_connection_obj
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::notSupported))
@@ -290,7 +290,7 @@ TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
   AVStreams::FlowConnection_ptr flow_connection = AVStreams::FlowConnection::_nil ();
   ACE_TRY
     {
-      flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj TAO_ENV_ARG_PARAMETER);
+      flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -323,7 +323,7 @@ TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void)
 CORBA::Boolean
 TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr /* remote_negotiator */,
                            const AVStreams::streamQoS &/* qos_spec */
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -365,11 +365,11 @@ int
 MMDevice_Map_Hash_Key::operator == (const MMDevice_Map_Hash_Key &hash_key) const
 {
   CORBA::Boolean result = 0;
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       result =
-        this->mmdevice_->_is_equivalent (hash_key.mmdevice_ TAO_ENV_ARG_PARAMETER);
+        this->mmdevice_->_is_equivalent (hash_key.mmdevice_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -387,14 +387,14 @@ operator < (const MMDevice_Map_Hash_Key &left,
             const MMDevice_Map_Hash_Key &right)
 {
   int result = 0;
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ULong left_hash = left.mmdevice_->_hash (left.hash_maximum_
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::ULong right_hash = right.mmdevice_->_hash (right.hash_maximum_
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       result = left_hash < right_hash;
     }
@@ -412,11 +412,11 @@ u_long
 MMDevice_Map_Hash_Key::hash (void)  const
 {
   u_long result = 0;
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       result = this->mmdevice_->_hash (this->hash_maximum_
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -436,10 +436,10 @@ MMDevice_Map_Hash_Key::hash (void)  const
 TAO_StreamCtrl::TAO_StreamCtrl (void)
   :mcastconfigif_ (0)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->streamctrl_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->streamctrl_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       char buf [BUFSIZ];
       int result = ACE_OS::hostname (buf, BUFSIZ);
@@ -477,13 +477,13 @@ TAO_StreamCtrl::~TAO_StreamCtrl (void)
 // Empty the_spec means apply operation to all flows
 void
 TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
   ACE_TRY
     {
-      TAO_Basic_StreamCtrl::stop (flow_spec TAO_ENV_ARG_PARAMETER);
+      TAO_Basic_StreamCtrl::stop (flow_spec ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (this->flow_connection_map_.current_size () > 0)
         return;
@@ -491,13 +491,13 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->stop (flow_spec TAO_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->stop (flow_spec ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->stop (flow_spec TAO_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->stop (flow_spec ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -514,13 +514,13 @@ TAO_StreamCtrl::stop (const AVStreams::flowSpec &flow_spec
 // Empty the_spec means apply operation to all flows
 void
 TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
   ACE_TRY
     {
-      TAO_Basic_StreamCtrl::start (flow_spec TAO_ENV_ARG_PARAMETER);
+      TAO_Basic_StreamCtrl::start (flow_spec ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (this->flow_connection_map_.current_size () > 0)
         return;
@@ -529,13 +529,13 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->start (flow_spec TAO_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->start (flow_spec ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->start (flow_spec TAO_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->start (flow_spec ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -553,13 +553,13 @@ TAO_StreamCtrl::start (const AVStreams::flowSpec &flow_spec
 // Empty the_spec means apply operation to all flows
 void
 TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow))
 {
   ACE_TRY
     {
-      TAO_Basic_StreamCtrl::destroy (flow_spec TAO_ENV_ARG_PARAMETER);
+      TAO_Basic_StreamCtrl::destroy (flow_spec ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (this->flow_connection_map_.current_size () > 0)
         return;
@@ -568,13 +568,13 @@ TAO_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -600,7 +600,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                            AVStreams::MMDevice_ptr b_party,
                            AVStreams::streamQoS &the_qos,
                            const AVStreams::flowSpec &the_flows
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -649,7 +649,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                                     met_qos,
                                     named_vdev.inout (),
                                     the_flows
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (TAO_debug_level > 0)
@@ -659,21 +659,21 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               streamctrl_any <<= this->streamctrl_.in ();
               this->sep_a_->define_property ("Related_StreamCtrl",
                                              streamctrl_any
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::Any vdev_a_any;
               vdev_a_any <<= this->vdev_a_.in ();
               this->sep_a_->define_property ("Related_VDev",
                                              vdev_a_any
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::Any streamendpoint_a_any;
               streamendpoint_a_any <<= this->sep_a_.in ();
               this->vdev_a_->define_property ("Related_StreamEndpoint",
                                               streamendpoint_a_any
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
 
@@ -681,7 +681,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               mmdevice_a_any <<= a_party;
               this->vdev_a_->define_property ("Related_MMDevice",
                                               mmdevice_a_any
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // add the mmdevice, sep and vdev to the map.
@@ -720,7 +720,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                                     met_qos,
                                     named_vdev.inout (),
                                     the_flows
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n"));
@@ -728,28 +728,28 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
                           "\n(%P|%t)stream_endpoint_b_ = %s",
                           TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in ()
-                                                                              TAO_ENV_ARG_PARAMETER)));
+                                                                              ACE_ENV_ARG_PARAMETER)));
               ACE_TRY_CHECK;
               // Define ourselves as the related_streamctrl property of the sep.
               CORBA::Any streamctrl_any;
               streamctrl_any <<= this->streamctrl_.in ();
               this->sep_b_->define_property ("Related_StreamCtrl",
                                              streamctrl_any
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::Any vdev_b_any;
               vdev_b_any <<= this->vdev_b_.in ();
               this->sep_b_->define_property ("Related_VDev",
                                              vdev_b_any
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::Any streamendpoint_b_any;
               streamendpoint_b_any <<= this->sep_b_.in ();
               this->vdev_b_->define_property ("Related_StreamEndpoint",
                                               streamendpoint_b_any
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
 
@@ -757,7 +757,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               mmdevice_b_any <<= b_party;
               this->vdev_b_->define_property ("Related_MMDevice",
                                               mmdevice_b_any
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               // add the mmdevice, sep and vdev to the map.
               MMDevice_Map_Entry map_entry;
@@ -783,12 +783,12 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
           sep_b_peer_any <<= this->sep_a_.in();
           this->sep_a_->define_property ("PeerAdapter",
                                           sep_a_peer_any
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->sep_b_->define_property ("PeerAdapter",
                                          sep_b_peer_any
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -801,20 +801,20 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
           ACE_TRY_EX (set_source_id)
             {
               CORBA::Any_ptr flows_any = this->sep_a_->get_property_value ("Flows"
-                                                                           TAO_ENV_ARG_PARAMETER);
+                                                                           ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK_EX (set_source_id);
               AVStreams::flowSpec_var flows;
               *flows_any >>= flows.out ();
               for (u_int i=0; i< flows->length ();i++)
                 {
                   CORBA::Object_var fep_obj =
-                    this->sep_a_->get_fep (flows [i] TAO_ENV_ARG_PARAMETER);
+                    this->sep_a_->get_fep (flows [i] ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (set_source_id);
                   ACE_TRY_EX (producer_check)
                     {
                       AVStreams::FlowProducer_var producer =
                         AVStreams::FlowProducer::_narrow (fep_obj.in ()
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK_EX (producer_check);
                       producer->set_source_id (this->source_id_++);
                     }
@@ -839,7 +839,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               // the streamctrl has to give an array of source ids to
               // the sep.
               this->sep_a_->set_source_id (this->source_id_++
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_ENDTRY;
@@ -850,7 +850,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                               TAO_MCastConfigIf,
                               0);
               // @@: Deactivating the object thru poa means calling remove_ref after _this.
-              this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           // Multicast source being added.
@@ -858,7 +858,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                                                                  this->mcastconfigif_ptr_.in (),
                                                                  the_qos,
                                                                  the_flows
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
           if (!result)
             ACE_ERROR_RETURN ((LM_ERROR, "set_Mcast_peer failed\n"), 0);
         }
@@ -873,7 +873,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               this->mcastconfigif_->set_peer (this->vdev_b_.in (),
                                               the_qos,
                                               the_flows
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -885,7 +885,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               connect_leaf_success = this->sep_a_->connect_leaf (this->sep_b_.in (),
                                                                  the_qos,
                                                                  the_flows
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK_EX (connect_leaf);
               connect_leaf_success = 1;
             }
@@ -905,9 +905,9 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               if (TAO_debug_level > 0)
                 ACE_DEBUG ((LM_DEBUG,"TAO_StreamCtrl::bind_devs Multiconnect\n"));
               AVStreams::flowSpec connect_flows = the_flows;
-              this->sep_a_->multiconnect (the_qos, connect_flows TAO_ENV_ARG_PARAMETER);
+              this->sep_a_->multiconnect (the_qos, connect_flows ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
-              this->sep_b_->multiconnect (the_qos, connect_flows TAO_ENV_ARG_PARAMETER);
+              this->sep_b_->multiconnect (the_qos, connect_flows ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -921,14 +921,14 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                                        this->vdev_b_.in (),
                                        the_qos,
                                        the_flows
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
               this->vdev_b_->set_peer (this->streamctrl_.in (),
                                        this->vdev_a_.in (),
                                        the_qos,
                                        the_flows
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
 
@@ -938,7 +938,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                 this->sep_a_->connect (this->sep_b_.in (),
                                        the_qos,
                                        the_flows
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               if (result == 0)
                 ACE_ERROR_RETURN ((LM_ERROR, "sep_a->connect (sep_b) failed\n"), 0);
@@ -951,7 +951,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                           this->sep_b_.in (),
                           the_qos,
                           the_flows
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -973,7 +973,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       AVStreams::StreamEndPoint_B_ptr sep_b,
                       AVStreams::streamQoS &stream_qos,
                       const AVStreams::flowSpec &flow_spec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -997,24 +997,24 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
       sep_any <<= sep_b;
       sep_a->define_property ("PeerAdapter",
                               sep_any
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       sep_any <<= sep_a;
       sep_b->define_property ("PeerAdapter",
                               sep_any
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // since its full profile we do the viable stream setup algorithm.
       // get the flows for the A streamendpoint.
       // the flows spec is empty and hence we do a exhaustive match.
       AVStreams::flowSpec a_flows, b_flows;
       CORBA::Any_var flows_any;
-      flows_any = sep_a->get_property_value ("Flows" TAO_ENV_ARG_PARAMETER);
+      flows_any = sep_a->get_property_value ("Flows" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::flowSpec *temp_flows;
       flows_any.in () >>= temp_flows;
       a_flows = *temp_flows;
-      flows_any = sep_b->get_property_value ("Flows" TAO_ENV_ARG_PARAMETER);
+      flows_any = sep_b->get_property_value ("Flows" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       flows_any.in () >>= temp_flows;
       b_flows = *temp_flows;
@@ -1033,11 +1033,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
           // get the flowendpoint references.
           CORBA::Object_var fep_obj =
             sep_a->get_fep (flowname
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           AVStreams::FlowEndPoint_ptr fep =
             AVStreams::FlowEndPoint::_narrow (fep_obj.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_CString fep_key (flowname);
           result = a_fep_map->bind (fep_key, fep);
@@ -1051,11 +1051,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
           // get the flowendpoint references.
           CORBA::Object_var fep_obj =
             sep_b->get_fep (flowname
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           AVStreams::FlowEndPoint_ptr fep =
             AVStreams::FlowEndPoint::_narrow (fep_obj.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_CString fep_key (flowname);
           result = b_fep_map->bind (fep_key, fep);
@@ -1119,7 +1119,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
             {
               AVStreams::FlowEndPoint_ptr fep_a = a_feps_entry->int_id_;
               AVStreams::FlowEndPoint_var connected_to =
-                fep_a->get_connected_fep (TAO_ENV_SINGLE_ARG_PARAMETER);
+                fep_a->get_connected_fep (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK_EX (flow_connect);
 
               if (!CORBA::is_nil (connected_to.in ()))
@@ -1136,7 +1136,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                   AVStreams::FlowConnection_var flow_connection;
 
                   AVStreams::FlowEndPoint_var connected_to =
-                    fep_b->get_connected_fep (TAO_ENV_SINGLE_ARG_PARAMETER);
+                    fep_b->get_connected_fep (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (flow_connect);
 
                   if (!CORBA::is_nil (connected_to.in ()))
@@ -1146,7 +1146,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                     }
 
                   if (fep_a->is_fep_compatible (fep_b
-                                                TAO_ENV_ARG_PARAMETER) == 1)
+                                                ACE_ENV_ARG_PARAMETER) == 1)
                     {
                       ACE_TRY_CHECK_EX (flow_connect);
                       // assume that flow names are same so that we
@@ -1154,7 +1154,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       CORBA::Object_var flow_connection_obj;
                       CORBA::Any_var flowname_any =
                         fep_a->get_property_value ("Flow"
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK_EX (flow_connect);
                       const char *flowname = 0;
                       flowname_any.in () >>= flowname;
@@ -1162,11 +1162,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                         {
                           flow_connection_obj =
                             this->get_flow_connection (flowname
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (flow_connection);
                           flow_connection =
                             AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
-                                                                TAO_ENV_ARG_PARAMETER);
+                                                                ACE_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (flow_connection);
                         }
                       ACE_CATCHANY
@@ -1175,11 +1175,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                           ACE_NEW_RETURN (flowConnection,
                                           TAO_FlowConnection,
                                           0);
-                          flow_connection = flowConnection->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+                          flow_connection = flowConnection->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (flow_connect);
                           this->set_flow_connection (flowname,
                                                      flow_connection.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (flow_connect);
                         }
                       ACE_ENDTRY;
@@ -1198,11 +1198,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                         {
                           producer =
                             AVStreams::FlowProducer::_narrow (fep_a
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (producer_check);
                           consumer =
                             AVStreams::FlowConsumer::_narrow (fep_b
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (producer_check);
 
                           // If the types don't match then try in
@@ -1211,11 +1211,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                             {
                               producer =
                                 AVStreams::FlowProducer::_narrow (fep_b
-                                                                  TAO_ENV_ARG_PARAMETER);
+                                                                  ACE_ENV_ARG_PARAMETER);
                               ACE_TRY_CHECK_EX (producer_check);
                               consumer =
                                 AVStreams::FlowConsumer::_narrow (fep_a
-                                                                  TAO_ENV_ARG_PARAMETER);
+                                                                  ACE_ENV_ARG_PARAMETER);
                               ACE_TRY_CHECK_EX (producer_check);
                             }
                           // At this point they should both be
@@ -1234,12 +1234,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       ACE_CHECK_RETURN (0);
                       CORBA::String_var fep_a_name, fep_b_name;
                       flowname_any = fep_a->get_property_value ("FlowName"
-                                                                TAO_ENV_ARG_PARAMETER);
+                                                                ACE_ENV_ARG_PARAMETER);
                       const char *temp_name;
                       flowname_any.in () >>= temp_name;
                       fep_a_name = CORBA::string_dup (temp_name);
                       flowname_any = fep_b->get_property_value ("FlowName"
-                                                                TAO_ENV_ARG_PARAMETER);
+                                                                ACE_ENV_ARG_PARAMETER);
                       flowname_any.in () >>= temp_name;
                       fep_b_name = CORBA::string_dup (temp_name);
                       AVStreams::QoS flow_qos;
@@ -1258,7 +1258,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       flow_connection->connect (producer.in (),
                                                 consumer.in (),
                                                 flow_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK_EX (flow_connect);
                     }
                 }
@@ -1280,7 +1280,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
       this->sep_a_->connect (this->sep_b_.in (),
                              stream_qos,
                              flow_spec
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_ENDTRY;
@@ -1289,7 +1289,7 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
 }
 
 void
-TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL)
+TAO_StreamCtrl::unbind (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed))
 {
@@ -1305,13 +1305,13 @@ TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL)
       MMDevice_Map::ENTRY *entry = 0;
       for (;a_iterator.next (entry)!= 0;a_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       MMDevice_Map_Iterator b_iterator (this->mmdevice_b_map_);
       for (;b_iterator.next (entry)!= 0;b_iterator.advance ())
         {
-          entry->int_id_.sep_->destroy (flow_spec TAO_ENV_ARG_PARAMETER);
+          entry->int_id_.sep_->destroy (flow_spec ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -1327,7 +1327,7 @@ TAO_StreamCtrl::unbind (TAO_ENV_SINGLE_ARG_DECL)
 void
 TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */,
                               const AVStreams::flowSpec &/* the_spec */
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow))
@@ -1337,7 +1337,7 @@ TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr /* the_ep */,
 void
 TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */,
                             const AVStreams::flowSpec & /* the_spec */
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow))
@@ -1347,7 +1347,7 @@ TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr /* dev */,
 AVStreams::VDev_ptr
 TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev,
                                   AVStreams::StreamEndPoint_out sep
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed))
 {
@@ -1369,7 +1369,7 @@ CORBA::Boolean
 
 TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
                             const AVStreams::flowSpec &the_spec
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
@@ -1438,13 +1438,13 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
 
           if (in_flowspec.length () != 0)
             {
-              this->vdev_a_->modify_QoS (new_qos, in_flowspec TAO_ENV_ARG_PARAMETER);
+              this->vdev_a_->modify_QoS (new_qos, in_flowspec ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
           if (out_flowspec.length () != 0)
             {
-              this->vdev_b_->modify_QoS (new_qos, out_flowspec TAO_ENV_ARG_PARAMETER);
+              this->vdev_b_->modify_QoS (new_qos, out_flowspec ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -1479,7 +1479,7 @@ CORBA::Boolean
 TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
                              AVStreams::streamQoS & qos,
                              const AVStreams::flowSpec & flow_spec
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed,
                    AVStreams::streamOpFailed))
@@ -1490,7 +1490,7 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
       ACE_NEW_RETURN (info,
                       Peer_Info,
                       0);
-      info->peer_ = AVStreams::VDev::_narrow (peer TAO_ENV_ARG_PARAMETER);
+      info->peer_ = AVStreams::VDev::_narrow (peer ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       info->qos_ = qos;
       info->flow_spec_ = flow_spec;
@@ -1509,7 +1509,7 @@ TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
 // In future this should be a multicast message instead of point-to-point unicasts.
 void
 TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Peer_Info *info;
@@ -1519,7 +1519,7 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati
            (info = this->peer_list_iterator_.next ()) != 0;
            this->peer_list_iterator_.advance ())
         {
-          info->peer_->configure (a_configuration TAO_ENV_ARG_PARAMETER);
+          info->peer_->configure (a_configuration ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -1535,7 +1535,7 @@ TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configurati
 
 void
 TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties &initial
-                                              TAO_ENV_ARG_DECL_NOT_USED)
+                                              ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->initial_configuration_ = initial;
@@ -1545,7 +1545,7 @@ TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properti
 void
 TAO_MCastConfigIf::set_format (const char * flowName,
                                const char * format_name
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
@@ -1558,7 +1558,7 @@ TAO_MCastConfigIf::set_format (const char * flowName,
         {
           if (this->in_flowSpec (info->flow_spec_, flowName))
             {
-              info->peer_->set_format (flowName, format_name TAO_ENV_ARG_PARAMETER);
+              info->peer_->set_format (flowName, format_name ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -1576,7 +1576,7 @@ TAO_MCastConfigIf::set_format (const char * flowName,
 void
 TAO_MCastConfigIf::set_dev_params (const char * flowName,
                                    const CosPropertyService::Properties & new_params
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
@@ -1591,7 +1591,7 @@ TAO_MCastConfigIf::set_dev_params (const char * flowName,
         {
           if (this->in_flowSpec (info->flow_spec_, flowName))
             {
-              info->peer_->set_dev_params (flowName, new_params TAO_ENV_ARG_PARAMETER);
+              info->peer_->set_dev_params (flowName, new_params ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -1650,21 +1650,21 @@ TAO_Base_StreamEndPoint::handle_open (void)
 
 int
 TAO_Base_StreamEndPoint::handle_stop (const AVStreams::flowSpec &
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
 TAO_Base_StreamEndPoint::handle_start (const AVStreams::flowSpec &
-                                       TAO_ENV_ARG_DECL_NOT_USED)
+                                       ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
 TAO_Base_StreamEndPoint::handle_destroy (const AVStreams::flowSpec &
-                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
@@ -1686,7 +1686,7 @@ TAO_Base_StreamEndPoint::handle_postconnect (AVStreams::flowSpec &)
 // The following function is for backward compatibility.
 CORBA::Boolean
 TAO_Base_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &
-                                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 1;
 }
@@ -1758,7 +1758,7 @@ CORBA::Boolean
 TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                              AVStreams::streamQoS &qos,
                              const AVStreams::flowSpec &the_spec
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -1784,7 +1784,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
               CORBA::Boolean result =
                 this->negotiator_->negotiate (peer_negotiator,
                                               qos
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK_EX (negotiate);
               if (!result)
                 if (TAO_debug_level > 0)
@@ -1805,7 +1805,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
         {
           // choose protocols based on what the remote endpoint can support.
           CORBA::Any_var protocols_any =
-            responder->get_property_value ("AvailableProtocols" TAO_ENV_ARG_PARAMETER);
+            responder->get_property_value ("AvailableProtocols" ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (available_protocols);
           AVStreams::protocolSpec peer_protocols;
           AVStreams::protocolSpec *temp_protocols;
@@ -1884,14 +1884,14 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
         ACE_ERROR_RETURN ((LM_ERROR, "%N:%l TAO_AV_Core::init_forward_flows failed\n"), 0);
 
 
-      AVStreams::StreamEndPoint_var streamendpoint = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      AVStreams::StreamEndPoint_var streamendpoint = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       retv = responder->request_connection (streamendpoint.in (),
                                             0,
                                             network_qos,
                                             flow_spec
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (TAO_debug_level > 0)
@@ -1959,12 +1959,12 @@ TAO_StreamEndPoint::translate_qos (const AVStreams::streamQoS& application_qos,
 
 void
 TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
   // Make the upcall into the app
-  this->handle_stop (flow_spec TAO_ENV_ARG_PARAMETER);
+  this->handle_stop (flow_spec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (flow_spec.length () > 0)
@@ -2007,13 +2007,13 @@ TAO_StreamEndPoint::stop (const AVStreams::flowSpec &flow_spec
 // Empty the_spec --> apply to all flows
 void
 TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::start\n"));
   // Make the upcall into the app
-  this->handle_start (flow_spec TAO_ENV_ARG_PARAMETER);
+  this->handle_start (flow_spec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (flow_spec.length () > 0)
@@ -2098,12 +2098,12 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec
 // Close the connection
 void
 TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow))
 {
   CORBA::Any_var vdev_any = this->get_property_value ("Related_VDev"
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   CORBA::Any_var mc_str_any;
   CORBA::Object_var mc_obj;
   AVStreams::VDev_ptr vdev;
@@ -2112,10 +2112,10 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec
   const char *media_ctrl_str;
   vdev_any.in() >>= vdev;
   mc_str_any = vdev->get_property_value ("Related_MediaCtrl"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   mc_str_any.in() >>= media_ctrl_str;
   mc_obj = TAO_AV_CORE::instance()->orb()->string_to_object (media_ctrl_str
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
   media_ctrl = Null_MediaCtrl::_narrow (mc_obj.in());
 
   // deactivate the associated vdev and media ctrl
@@ -2210,7 +2210,7 @@ TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &flow_spec
     }
 
   // Make the upcall into the app
-  //  this->handle_destroy (the_spec TAO_ENV_ARG_PARAMETER);
+  //  this->handle_destroy (the_spec ACE_ENV_ARG_PARAMETER);
   //
 }
 
@@ -2221,7 +2221,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
                                         CORBA::Boolean /*is_mcast*/,
                                         AVStreams::streamQoS &qos,
                                         AVStreams::flowSpec &flow_spec
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpDenied,
                    AVStreams::noSuchFlow,
@@ -2293,7 +2293,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
         return 0;
 
       // Make the upcall to the app
-      result = this->handle_connection_requested (flow_spec TAO_ENV_ARG_PARAMETER);
+      result = this->handle_connection_requested (flow_spec ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2310,7 +2310,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
 int
 TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
                                 const AVStreams::flowSpec &the_flows
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -2347,7 +2347,7 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos,
 CORBA::Boolean
 TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
                                 const AVStreams::flowSpec &the_flows
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
@@ -2356,7 +2356,7 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
   ACE_DEBUG ((LM_DEBUG,
               "TAO_StreamEndPoint::modify_QoS\n"));
 
-  int result =  this->change_qos (new_qos, the_flows TAO_ENV_ARG_PARAMETER);
+  int result =  this->change_qos (new_qos, the_flows ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (result != 0)
@@ -2370,7 +2370,7 @@ TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
 
 CORBA::Boolean
 TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &protocols
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -2380,7 +2380,7 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro
       protocol_restriction_any <<= protocols;
       this->define_property ("ProtocolRestriction",
                              protocol_restriction_any
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->protocols_ = protocols;
     }
@@ -2397,7 +2397,7 @@ TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &pro
 
 void
 TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::streamOpFailed))
@@ -2411,7 +2411,7 @@ void
 TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/,
                                   const char *fp_name,
                                   const CORBA::Any &fp_settings
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::FPError))
@@ -2425,7 +2425,7 @@ TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &/*the_spec*/,
 
 CORBA::Object_ptr
 TAO_StreamEndPoint::get_fep (const char *flow_name
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::noSuchFlow))
@@ -2439,7 +2439,7 @@ TAO_StreamEndPoint::get_fep (const char *flow_name
 
 char*
 TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
@@ -2461,7 +2461,7 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
       flowname_any <<= flow_name.in ();
       fep->define_property ("Flow",
                             flowname_any
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2476,7 +2476,7 @@ TAO_StreamEndPoint::add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
 
 char*
 TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
@@ -2485,7 +2485,7 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep
   ACE_TRY
     {
       CORBA::Any_var flow_name_any =
-        fep->get_property_value ("FlowName" TAO_ENV_ARG_PARAMETER);
+        fep->get_property_value ("FlowName" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *tmp;
@@ -2495,7 +2495,7 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep
   ACE_CATCHANY
     {
       flow_name =
-        this->add_fep_i_add_property (fep TAO_ENV_ARG_PARAMETER);
+        this->add_fep_i_add_property (fep ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   ACE_ENDTRY;
@@ -2504,22 +2504,22 @@ TAO_StreamEndPoint::add_fep_i (AVStreams::FlowEndPoint_ptr fep
 
 char *
 TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
 {
   AVStreams::FlowEndPoint_var fep =
-    AVStreams::FlowEndPoint::_narrow (fep_obj TAO_ENV_ARG_PARAMETER);
+    AVStreams::FlowEndPoint::_narrow (fep_obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::String_var flow_name =
-    this->add_fep_i (fep.in () TAO_ENV_ARG_PARAMETER);
+    this->add_fep_i (fep.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TRY
     {
-      fep->lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fep->lock (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // Add it to the sequence of flowNames supported.
       // put the flowname and the flowendpoint in a hashtable.
@@ -2537,7 +2537,7 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj
       flows_any <<= this->flows_;
       this->define_property ("Flows",
                              flows_any
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2552,7 +2552,7 @@ TAO_StreamEndPoint::add_fep (CORBA::Object_ptr fep_obj
 
 void
 TAO_StreamEndPoint::remove_fep (const char *flow_name
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed))
@@ -2575,7 +2575,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name
       this->flows_ = new_flows;
       this->define_property ("Flows",
                              flows
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2589,7 +2589,7 @@ TAO_StreamEndPoint::remove_fep (const char *flow_name
 // Sets the negotiator object.
 void
 TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -2598,7 +2598,7 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator
       negotiator <<= new_negotiator;
       this->define_property ("Negotiator",
                              negotiator
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->negotiator_ = AVStreams::Negotiator::_duplicate (new_negotiator);
     }
@@ -2615,7 +2615,7 @@ TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator
 void
 TAO_StreamEndPoint::set_key (const char *flow_name,
                              const AVStreams::key & the_key
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -2627,7 +2627,7 @@ TAO_StreamEndPoint::set_key (const char *flow_name,
       ACE_OS::sprintf (PublicKey_property, "%s_PublicKey", flow_name);
       this->define_property (PublicKey_property,
                              PublicKey
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -2641,7 +2641,7 @@ TAO_StreamEndPoint::set_key (const char *flow_name,
 // Set the source id.
 void
 TAO_StreamEndPoint::set_source_id (CORBA::Long source_id
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->source_id_ = source_id;
@@ -2650,7 +2650,7 @@ TAO_StreamEndPoint::set_source_id (CORBA::Long source_id
 CORBA::Boolean
 TAO_StreamEndPoint::multiconnect (AVStreams::streamQoS &/*the_qos*/,
                                   AVStreams::flowSpec &/*flow_spec*/
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::multiconnect\n"));
@@ -2701,7 +2701,7 @@ TAO_StreamEndPoint_A::TAO_StreamEndPoint_A (void)
 CORBA::Boolean
 TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                                     AVStreams::flowSpec &flow_spec
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -2738,7 +2738,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                   if (result < 0)
                     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "QoS not found for %s", forward_entry->flowname ()));
                   // Narrow it to FlowProducer.
-                  AVStreams::FlowProducer_var producer = AVStreams::FlowProducer::_narrow (flow_endpoint TAO_ENV_ARG_PARAMETER);
+                  AVStreams::FlowProducer_var producer = AVStreams::FlowProducer::_narrow (flow_endpoint ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (narrow);
                   // Else narrow succeeeded.
                   if (!CORBA::is_nil (producer.in ()))
@@ -2750,7 +2750,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                               {
                                 CORBA::Any_var streamctrl_any;
                                 streamctrl_any = this->get_property_value ("Related_StreamCtrl"
-                                                                           TAO_ENV_ARG_PARAMETER);
+                                                                           ACE_ENV_ARG_PARAMETER);
                                 ACE_TRY_CHECK;
                                 AVStreams::StreamCtrl_ptr streamctrl;
                                 streamctrl_any.in () >>= streamctrl;
@@ -2759,10 +2759,10 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
 
                           CORBA::Object_var flow_connection_obj =
                             this->streamctrl_->get_flow_connection (forward_entry->flowname ()
-                                                                    TAO_ENV_ARG_PARAMETER);
+                                                                    ACE_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (flow_connection);
                           flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
-                                                                                TAO_ENV_ARG_PARAMETER);
+                                                                                ACE_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK_EX (flow_connection);
                         }
                       ACE_CATCHANY
@@ -2775,11 +2775,11 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                           flowConnection->set_mcast_addr (this->mcast_addr_, this->mcast_port_);
                           this->mcast_port_++;
                           flowConnection->set_protocol (forward_entry->carrier_protocol_str ());
-                          flow_connection = flowConnection->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+                          flow_connection = flowConnection->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
                           ACE_TRY_CHECK;
                           this->streamctrl_->set_flow_connection (forward_entry->flowname (),
                                                                   flow_connection.in ()
-                                                                  TAO_ENV_ARG_PARAMETER);
+                                                                  ACE_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK;
                         }
                       ACE_ENDTRY;
@@ -2789,12 +2789,12 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                           CORBA::Any fp_settings;
                           flow_connection->use_flow_protocol (forward_entry->flow_protocol_str (),
                                                               fp_settings
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK;
                         }
                       result = flow_connection->add_producer (producer.in (),
                                                               flow_qos
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
                       if (result == 0)
                         ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_A::multiconnect: add_producer failed\n"), 0);
@@ -2894,7 +2894,7 @@ CORBA::Boolean
 TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */,
                                     AVStreams::streamQoS & /* the_qos */,
                                     const AVStreams::flowSpec & /* the_flows */
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -2908,7 +2908,7 @@ TAO_StreamEndPoint_A::connect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */
 void
 TAO_StreamEndPoint_A::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr /* the_ep */,
                                        const AVStreams::flowSpec & /* theSpec */
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
@@ -2937,7 +2937,7 @@ TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void)
 CORBA::Boolean
 TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
                                     AVStreams::flowSpec &flow_spec
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -2963,7 +2963,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
               AVStreams::FlowConsumer_var consumer;
               ACE_TRY_EX (narrow)
                 {
-                  consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in () TAO_ENV_ARG_PARAMETER);
+                  consumer = AVStreams::FlowConsumer::_narrow (flow_endpoint.in () ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (narrow);
                 }
               ACE_CATCHANY
@@ -2984,7 +2984,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
                     {
                       CORBA::Any_var streamctrl_any;
                       streamctrl_any = this->get_property_value ("Related_StreamCtrl"
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
                       AVStreams::StreamCtrl_ptr streamctrl;
                       streamctrl_any.in () >>= streamctrl;
@@ -2992,10 +2992,10 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
                     }
                   CORBA::Object_var flow_connection_obj =
                     this->streamctrl_->get_flow_connection (forward_entry->flowname ()
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (flow_connection);
                   flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj.in ()
-                                                                        TAO_ENV_ARG_PARAMETER);
+                                                                        ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (flow_connection);
                 }
               ACE_CATCHANY
@@ -3007,7 +3007,7 @@ TAO_StreamEndPoint_B::multiconnect (AVStreams::streamQoS &stream_qos,
               ACE_CHECK_RETURN (0);
               result = flow_connection->add_consumer (consumer.in (),
                                                       flow_qos
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               if (result == 0)
                 ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint_B::multiconnect:add_consumer failed\n"), 0);
@@ -3089,7 +3089,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                     AVStreams::VDev_ptr the_peer_dev,
                     AVStreams::streamQoS &the_qos,
                     const AVStreams::flowSpec &the_spec
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -3105,7 +3105,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_VDev::set_peer: called"));
 
       CORBA::String_var ior = TAO_ORB_Core_instance ()->orb ()->object_to_string (the_peer_dev
-                                                                                  TAO_ENV_ARG_PARAMETER);
+                                                                                  ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -3117,7 +3117,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
       anyval <<= ior.in ();
       this->define_property ("Related_VDev",
                              anyval
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -3127,7 +3127,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
       CORBA::Any_var anyptr;
       const char *media_ctrl_ior;
       anyptr = this->peer_->get_property_value ("Related_MediaCtrl"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       anyptr.in () >>= media_ctrl_ior;
@@ -3136,10 +3136,10 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                     media_ctrl_ior));
       CORBA::Object_ptr media_ctrl_obj =
         TAO_ORB_Core_instance ()->orb ()->string_to_object
-        (media_ctrl_ior TAO_ENV_ARG_PARAMETER);
+        (media_ctrl_ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      result = this->set_media_ctrl (media_ctrl_obj TAO_ENV_ARG_PARAMETER);
+      result = this->set_media_ctrl (media_ctrl_obj ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3154,7 +3154,7 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
 
 CORBA::Boolean
 TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 
 {
 //  ACE_UNUSED_ARG (media_ctrl);
@@ -3175,7 +3175,7 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */,
                           AVStreams::MCastConfigIf_ptr mcast_peer,
                           AVStreams::streamQoS &/* the_qos */,
                           const AVStreams::flowSpec &/* the_spec */
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed,
@@ -3188,7 +3188,7 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr /* the_ctrl */,
 // applications should override this to handle configuration changes.
 void
 TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
@@ -3199,7 +3199,7 @@ TAO_VDev::configure (const CosPropertyService::Property &/*the_config_mesg*/
 void
 TAO_VDev::set_format (const char *flowName,
                       const char *format_name
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
@@ -3213,7 +3213,7 @@ TAO_VDev::set_format (const char *flowName,
       format <<= format_name;
       this->define_property (format_property,
                              format
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3230,7 +3230,7 @@ TAO_VDev::set_format (const char *flowName,
 void
 TAO_VDev::set_dev_params (const char *flowName,
                           const CosPropertyService::Properties &new_params
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
@@ -3245,7 +3245,7 @@ TAO_VDev::set_dev_params (const char *flowName,
       devParams <<= new_params;
       this->define_property (devParams_property,
                              devParams
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3262,7 +3262,7 @@ TAO_VDev::set_dev_params (const char *flowName,
 CORBA::Boolean
 TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
                       const AVStreams::flowSpec &flowspec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
@@ -3282,13 +3282,13 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
 
           CORBA::Any_ptr streamendpoint_a_any =
           this->get_property_value ("Related_StreamEndpoint"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           *streamendpoint_a_any >>= sep_a;
           if (sep_a != 0)
             {
-              sep_a->modify_QoS (the_qos, flowspec TAO_ENV_ARG_PARAMETER);
+              sep_a->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (0);
             }
           else ACE_DEBUG ((LM_DEBUG,
@@ -3300,10 +3300,10 @@ TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
 
           CORBA::Any_ptr streamendpoint_b_any =
           this->get_property_value ("Related_StreamEndpoint"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
           *streamendpoint_b_any >>= sep_b;
-          sep_b->modify_QoS (the_qos, flowspec TAO_ENV_ARG_PARAMETER);
+          sep_b->modify_QoS (the_qos, flowspec ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
   }
@@ -3334,7 +3334,7 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
                     AVStreams::streamQoS &the_qos,
                     CORBA::Boolean_out is_met,
                     const AVStreams::flowSpec &the_spec
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -3347,15 +3347,15 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
       ACE_NEW_RETURN (this->stream_ctrl_,
                       TAO_StreamCtrl,
                       0);
-      AVStreams::MMDevice_var mmdevice = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      AVStreams::MMDevice_var mmdevice = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->stream_ctrl_->bind_devs (peer_device,
                                      mmdevice.in (),
                                      the_qos,
                                      the_spec
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      streamctrl = this->stream_ctrl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      streamctrl = this->stream_ctrl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3374,7 +3374,7 @@ TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer,
                           AVStreams::streamQoS &the_qos,
                           CORBA::Boolean_out is_met,
                           const AVStreams::flowSpec &the_spec
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -3397,7 +3397,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                           CORBA::Boolean_out met_qos,
                           char *&/*named_vdev*/,
                           const AVStreams::flowSpec &flow_spec
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   AVStreams::StreamEndPoint_A_ptr sep_a (AVStreams::StreamEndPoint_A::_nil ());
   AVStreams::StreamEndPoint_B_ptr sep_b (AVStreams::StreamEndPoint_B::_nil ());
@@ -3410,7 +3410,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
           {
             if (this->endpoint_strategy_->create_A (sep_a,
                                                     the_vdev
-                                                    TAO_ENV_ARG_PARAMETER) == -1)
+                                                    ACE_ENV_ARG_PARAMETER) == -1)
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "TAO_MMDevice::create_A_B (%P|%t) - "
                                  "error in create_A\n"),
@@ -3422,7 +3422,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
           {
             if (this->endpoint_strategy_->create_B (sep_b,
                                                     the_vdev
-                                                    TAO_ENV_ARG_PARAMETER) == -1)
+                                                    ACE_ENV_ARG_PARAMETER) == -1)
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "TAO_MMDevice::create_A_B (%P|%t) - "
                                  "error in create_B\n"),
@@ -3451,12 +3451,12 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                 {
                   // Get the flowconnection for this flow.
                   CORBA::Object_var flowconnection_obj =
-                    streamctrl->get_flow_connection (forward_entry.flowname () TAO_ENV_ARG_PARAMETER);
+                    streamctrl->get_flow_connection (forward_entry.flowname () ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (flowconnection);
                   if (!CORBA::is_nil (flowconnection_obj.in ()))
                     {
                       flowconnection = AVStreams::FlowConnection::_narrow (flowconnection_obj.in ()
-                                                                           TAO_ENV_ARG_PARAMETER);
+                                                                           ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK_EX (flowconnection);
                     }
                 }
@@ -3494,7 +3494,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                                                        flow_qos,
                                                        met_qos,
                                                        named_fdev.inout ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
                         }
                         break;
                       case MMDEVICE_B:
@@ -3504,7 +3504,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                                                        flow_qos,
                                                        met_qos,
                                                        named_fdev.inout ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
                         }
                         break;
                       }
@@ -3525,7 +3525,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                                                        flow_qos,
                                                        met_qos,
                                                        named_fdev.inout ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
                         }
                         break;
                       case MMDEVICE_B:
@@ -3538,7 +3538,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                                                        flow_qos,
                                                        met_qos,
                                                        named_fdev.inout ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
                         }
                         break;
                       }
@@ -3550,10 +3550,10 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                 }
               CORBA::Any flowname_any;
               flowname_any <<= forward_entry.flowname ();
-              flow_endpoint->define_property ("FlowName", flowname_any TAO_ENV_ARG_PARAMETER);
+              flow_endpoint->define_property ("FlowName", flowname_any ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               sep->add_fep (flow_endpoint.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -3575,7 +3575,7 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
                         CORBA::Boolean_out met_qos,
                         char *&named_vdev,
                         const AVStreams::flowSpec &flow_spec
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -3584,16 +3584,16 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
                    AVStreams::noSuchFlow))
 {
   CORBA::String_var str_ctrl_ior =
-       TAO_ORB_Core_instance ()->orb ()->object_to_string (streamctrl TAO_ENV_ARG_PARAMETER);
+       TAO_ORB_Core_instance ()->orb ()->object_to_string (streamctrl ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   AVStreams::StreamEndPoint_A_ptr sep_a = 0;
   AVStreams::StreamEndPoint_var sep;
   ACE_TRY
     {
-      sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec TAO_ENV_ARG_PARAMETER);
+      sep = this->create_A_B (MMDEVICE_A, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in() TAO_ENV_ARG_PARAMETER);
+      sep_a = AVStreams::StreamEndPoint_A::_narrow (sep.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3614,7 +3614,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
                         CORBA::Boolean_out met_qos,
                         char *&named_vdev,
                         const AVStreams::flowSpec &flow_spec
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -3627,9 +3627,9 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
 
   ACE_TRY
     {
-      sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec TAO_ENV_ARG_PARAMETER);
+      sep = this->create_A_B (MMDEVICE_B, streamctrl, the_vdev, stream_qos, met_qos, named_vdev, flow_spec ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in() TAO_ENV_ARG_PARAMETER);
+      sep_b = AVStreams::StreamEndPoint_B::_narrow (sep.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3647,7 +3647,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
 void
 TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */,
                        const char * /* vdev_name */
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
@@ -3661,7 +3661,7 @@ TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr /* the_ep */,
 
 char *
 TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::streamOpFailed))
@@ -3679,7 +3679,7 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev
       ACE_OS::sprintf (tmp, "flow%d", flow_num_++);
       CORBA::Any flowname_any;
       flowname_any <<= flow_name.in ();
-      fdev->define_property ("Flow", flowname_any TAO_ENV_ARG_PARAMETER);
+      fdev->define_property ("Flow", flowname_any ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3694,7 +3694,7 @@ TAO_MMDevice::add_fdev_i (AVStreams::FDev_ptr fdev
 // Adds the fdev object to the MMDevice.
 char *
 TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::streamOpFailed))
@@ -3704,14 +3704,14 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
   ACE_TRY_EX (flow_name)
     {
       CORBA::Any_ptr flow_name_any;
-      fdev = AVStreams::FDev::_narrow (fdev_obj TAO_ENV_ARG_PARAMETER);
+      fdev = AVStreams::FDev::_narrow (fdev_obj ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (flow_name);
 
       if (CORBA::is_nil (fdev.in ()))
           return 0;
 
 
-      flow_name_any = fdev->get_property_value ("Flow" TAO_ENV_ARG_PARAMETER);
+      flow_name_any = fdev->get_property_value ("Flow" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (flow_name);
 
       const char *tmp;
@@ -3721,7 +3721,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
   ACE_CATCHANY
     {
       flow_name =
-        this->add_fdev_i (fdev.in () TAO_ENV_ARG_PARAMETER);
+        this->add_fdev_i (fdev.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   ACE_ENDTRY;
@@ -3746,7 +3746,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
     {
       this->define_property ("Flows",
                              flows_any
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (flows);
     }
   ACE_CATCHANY
@@ -3762,7 +3762,7 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr fdev_obj
 // Gets the FDev object associated with this flow.
 CORBA::Object_ptr
 TAO_MMDevice::get_fdev (const char *flow_name
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::noSuchFlow))
@@ -3779,7 +3779,7 @@ TAO_MMDevice::get_fdev (const char *flow_name
 // Removes the fdev from this MMDevice.
 void
 TAO_MMDevice::remove_fdev (const char *flow_name
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::noSuchFlow,
@@ -3806,7 +3806,7 @@ TAO_MMDevice::remove_fdev (const char *flow_name
       this->flows_ = new_flows;
       this->define_property ("Flows",
                              flows
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3862,7 +3862,7 @@ TAO_FlowConnection::set_protocol (const char *protocol)
 
 // stop this flow.
 void
-TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::stop (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -3873,7 +3873,7 @@ TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL)
              this->flow_producer_set_.end ();
            producer_begin != producer_end; ++producer_begin)
         {
-          (*producer_begin)->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (*producer_begin)->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
@@ -3882,7 +3882,7 @@ TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL)
              this->flow_consumer_set_.end ();
            consumer_begin != consumer_end; ++consumer_begin)
         {
-          (*consumer_begin)->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (*consumer_begin)->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -3897,7 +3897,7 @@ TAO_FlowConnection::stop (TAO_ENV_SINGLE_ARG_DECL)
 
 // start this flow.
 void
-TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::start (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -3908,7 +3908,7 @@ TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL)
              this->flow_consumer_set_.end ();
            consumer_begin != consumer_end; ++consumer_begin)
         {
-          (*consumer_begin)->start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (*consumer_begin)->start (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       FlowProducer_SetItor producer_begin = this->flow_producer_set_.begin
@@ -3917,7 +3917,7 @@ TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL)
              this->flow_producer_set_.end ();
            producer_begin != producer_end; ++producer_begin)
         {
-          (*producer_begin)->start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (*producer_begin)->start (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -3932,7 +3932,7 @@ TAO_FlowConnection::start (TAO_ENV_SINGLE_ARG_DECL)
 
 // destroy this flow.
 void
-TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -3943,7 +3943,7 @@ TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL)
              this->flow_producer_set_.end ();
            producer_begin != producer_end; ++producer_begin)
         {
-          (*producer_begin)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (*producer_begin)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
@@ -3952,7 +3952,7 @@ TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL)
              this->flow_consumer_set_.end ();
            consumer_begin != consumer_end; ++consumer_begin)
         {
-          (*consumer_begin)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (*consumer_begin)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -3971,7 +3971,7 @@ TAO_FlowConnection::destroy (TAO_ENV_SINGLE_ARG_DECL)
 // modify the QoS for this flow.
 CORBA::Boolean
 TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed))
 {
@@ -3984,7 +3984,7 @@ TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos
 CORBA::Boolean
 TAO_FlowConnection::use_flow_protocol (const char * fp_name,
                                        const CORBA::Any & fp_settings
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::FPError,
                    AVStreams::notSupported))
@@ -3998,7 +3998,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
        producer_begin != producer_end; ++producer_begin)
     {
       (*producer_begin)->use_flow_protocol
-        (fp_name, fp_settings TAO_ENV_ARG_PARAMETER);
+        (fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   FlowConsumer_SetItor consumer_begin = this->flow_consumer_set_.begin
@@ -4008,7 +4008,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
        consumer_begin != consumer_end; ++consumer_begin)
     {
       (*consumer_begin)->use_flow_protocol
-        (fp_name, fp_settings TAO_ENV_ARG_PARAMETER);
+        (fp_name, fp_settings ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return 1;
@@ -4016,7 +4016,7 @@ TAO_FlowConnection::use_flow_protocol (const char * fp_name,
 
 void
 TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (the_event);
@@ -4026,7 +4026,7 @@ CORBA::Boolean
 TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
                                   AVStreams::FDev_ptr b_party,
                                   AVStreams::QoS & flow_qos
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -4035,7 +4035,7 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
   CORBA::Boolean result = 0;
   ACE_TRY
     {
-      AVStreams::FlowConnection_var flowconnection = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      AVStreams::FlowConnection_var flowconnection = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Boolean met_qos;
       CORBA::String_var named_fdev ((const char *)"");
@@ -4044,19 +4044,19 @@ TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
                                   flow_qos,
                                   met_qos,
                                   named_fdev.inout ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::FlowConsumer_var consumer =
         b_party->create_consumer (flowconnection.in (),
                                   flow_qos,
                                   met_qos,
                                   named_fdev.inout ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       result = this->connect (producer.in (),
                               consumer.in (),
                               flow_qos
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4074,7 +4074,7 @@ CORBA::Boolean
 TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
                              AVStreams::FlowConsumer_ptr consumer,
                              AVStreams::QoS & the_qos
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::formatMismatch,
                    AVStreams::FEPMismatch,
@@ -4091,19 +4091,19 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
       this->flow_producer_set_.insert (flow_producer);
       this->flow_consumer_set_.insert (flow_consumer);
       AVStreams::FlowConnection_var flowconnection =
-        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       flow_producer->set_peer (flowconnection.in (),
                                flow_consumer,
                                the_qos
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       flow_consumer->set_peer (flowconnection.in (),
                                flow_producer,
                                the_qos
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       char *consumer_address =
@@ -4111,7 +4111,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
                                      0, // false for is_mcast
                                      flow_producer,
                                      this->fp_name_.inout ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp (consumer_address, "") == 0)
@@ -4121,12 +4121,12 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
                                                           0, // false for is_mcast
                                                           flow_consumer,
                                                           this->fp_name_.inout ()
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           flow_consumer->connect_to_peer (the_qos,
                                           consumer_address,
                                           this->fp_name_.inout ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           // @@ Naga: We have to find means to set the reverse channel for the producer.
           // Its broken in the point-to_point case for UDP.
@@ -4137,7 +4137,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
           flow_producer->connect_to_peer (the_qos,
                                           consumer_address,
                                           this->fp_name_.inout ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -4152,7 +4152,7 @@ TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr producer,
 
 
 CORBA::Boolean
-TAO_FlowConnection::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FlowConnection::disconnect (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_CHECK_RETURN (0);
@@ -4162,7 +4162,7 @@ TAO_FlowConnection::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 CORBA::Boolean
 TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
                                   AVStreams::QoS & the_qos
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::alreadyConnected,
                    AVStreams::notSupported))
@@ -4181,7 +4181,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
           for (; begin != end; ++begin)
             {
               if ((*begin)->_is_equivalent (producer
-                                            TAO_ENV_ARG_PARAMETER))
+                                            ACE_ENV_ARG_PARAMETER))
               // producer exists in the set, a duplicate.
               ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_producer: producer already exists\n"), 1);
             }
@@ -4216,7 +4216,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
                                                         met_qos,
                                                         mcast_address,
                                                         this->fp_name_.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
           if (this->producer_address_.in () == 0)
@@ -4239,15 +4239,15 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
               ACE_NEW_RETURN (this->mcastconfigif_i_,
                               TAO_MCastConfigIf,
                               0);
-              this->mcastconfigif_ = this->mcastconfigif_i_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->mcastconfigif_ = this->mcastconfigif_i_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
-          AVStreams::FlowConnection_var flowconnection = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          AVStreams::FlowConnection_var flowconnection = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           flow_producer->set_Mcast_peer (flowconnection.in (),
                                          this->mcastconfigif_.in (),
                                          the_qos
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4263,7 +4263,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
 CORBA::Boolean
 TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
                                   AVStreams::QoS & the_qos
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::alreadyConnected))
 {
@@ -4276,7 +4276,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
       for (; begin != end; ++begin)
         {
           if ((*begin)->_is_equivalent (consumer
-                                        TAO_ENV_ARG_PARAMETER))
+                                        ACE_ENV_ARG_PARAMETER))
             // Consumer exists in the set, a duplicate.
             ACE_ERROR_RETURN ((LM_WARNING, "TAO_FlowConnection::add_Consumer: Consumer already exists\n"), 1);
         }
@@ -4301,21 +4301,21 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
       if (!this->ip_multicast_)
         {
           flow_consumer->set_protocol_restriction (protocols
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           char * address =
             flow_consumer->go_to_listen (the_qos,
                                          1,
                                          flow_producer,
                                          this->fp_name_.inout ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           CORBA::Boolean is_met;
           flow_producer->connect_mcast (the_qos,
                                         is_met,
                                         address,
                                         this->fp_name_.inout ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
        else
@@ -4328,14 +4328,14 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
           flow_consumer->connect_to_peer (the_qos,
                                           this->producer_address_.in (),
                                           this->fp_name_.inout ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
 
           //  char * address =
           //             flow_consumer->go_to_listen (the_qos,
           //                                          1,
           //                                          flow_producer,
           //                                          this->fp_name_.inout ()
-          //                                          TAO_ENV_ARG_PARAMETER);
+          //                                          ACE_ENV_ARG_PARAMETER);
 
           //            ACE_TRY_CHECK;
         }
@@ -4349,7 +4349,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
       this->mcastconfigif_->set_peer (flow_consumer,
                                       stream_qos,
                                       flow_spec
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4364,7 +4364,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
 
 CORBA::Boolean
 TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notConnected))
 {
@@ -4405,17 +4405,17 @@ TAO_FlowEndPoint::open (const char *flowname,
   this->format_ = format;
 
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_FlowEndPoint::open\n"));
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::Any flowname_any;
       flowname_any <<= flowname;
       this->define_property ("Flow",
                              flowname_any
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->set_format (format
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->protocol_addresses_ = protocols;
       AVStreams::protocolSpec protocol_spec (protocols.length ());
@@ -4429,7 +4429,7 @@ TAO_FlowEndPoint::open (const char *flowname,
           if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", protocol_spec[i].in ()));
         }
       this->set_protocol_restriction (protocol_spec
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4453,7 +4453,7 @@ TAO_FlowEndPoint::set_flowname (const char *flowname)
 // used by one flowconnection so that multiple connections cant use
 // the same flowendpoint.
 CORBA::Boolean
-TAO_FlowEndPoint::lock (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FlowEndPoint::lock (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // lock the current flowendpoint
@@ -4467,7 +4467,7 @@ TAO_FlowEndPoint::lock (TAO_ENV_SINGLE_ARG_DECL)
 
 // unlocks the flowendpoint , becomes free to be used in another flow.
 void
-TAO_FlowEndPoint::unlock (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FlowEndPoint::unlock (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_CHECK;
@@ -4477,7 +4477,7 @@ TAO_FlowEndPoint::unlock (TAO_ENV_SINGLE_ARG_DECL)
 
 
 void
-TAO_FlowEndPoint::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int result = TAO_AV_Core::deactivate_servant (this);
@@ -4490,7 +4490,7 @@ TAO_FlowEndPoint::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 AVStreams::StreamEndPoint_ptr
-TAO_FlowEndPoint::related_sep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::related_sep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -4499,14 +4499,14 @@ TAO_FlowEndPoint::related_sep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep
-                               TAO_ENV_ARG_DECL_NOT_USED)
+                               ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->related_sep_ = AVStreams::StreamEndPoint::_duplicate (related_sep);
 }
 
 AVStreams::FlowConnection_ptr
-TAO_FlowEndPoint::related_flow_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::related_flow_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return AVStreams::FlowConnection::_duplicate (this->related_flow_connection_.in ());
@@ -4514,7 +4514,7 @@ TAO_FlowEndPoint::related_flow_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_CHECK;
@@ -4524,7 +4524,7 @@ TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related
 
 // returns the connected peer for this flow
 AVStreams::FlowEndPoint_ptr
-TAO_FlowEndPoint::get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowEndPoint::get_connected_fep (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notConnected,
                    AVStreams::notSupported))
@@ -4535,7 +4535,7 @@ TAO_FlowEndPoint::get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 CORBA::Boolean
 TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
                                      const CORBA::Any &
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::FPError,
                    AVStreams::notSupported))
@@ -4547,7 +4547,7 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
       flowname_property <<= fp_name;
       this->define_property ("FlowProtocol",
                              flowname_property
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4562,7 +4562,7 @@ TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
 
 void
 TAO_FlowEndPoint::set_format (const char * format
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
@@ -4575,7 +4575,7 @@ TAO_FlowEndPoint::set_format (const char * format
       format_val <<= format;
       this->define_property ("Format",
                              format_val
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4588,7 +4588,7 @@ TAO_FlowEndPoint::set_format (const char * format
 
 void
 TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::PropertyException,
                    AVStreams::streamOpFailed))
@@ -4600,7 +4600,7 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set
       DevParams_property <<= new_settings;
       this->define_property ("DevParams",
                              DevParams_property
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4613,7 +4613,7 @@ TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_set
 
 void
 TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & protocols
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
@@ -4630,11 +4630,11 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
       AvailableProtocols_property <<= protocols;
       this->define_property ("AvailableProtocols",
                              AvailableProtocols_property
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::protocolSpec *temp_spec;
       CORBA::Any_var temp_any = this->get_property_value ("AvailableProtocols"
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       temp_any.in () >>= temp_spec;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%N:%l\n"));
@@ -4655,7 +4655,7 @@ TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & prot
 
 CORBA::Boolean
 TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::formatMismatch,
                    AVStreams::deviceQosMismatch))
@@ -4671,7 +4671,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
 
       exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format";
       format_ptr = this->get_property_value ("Format"
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *temp_format;
@@ -4680,7 +4680,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
       // get my peer's format value
       exception_message = "TAO_FlowEndPoint::is_fep_compatible - Format[2]";
       format_ptr = peer_fep->get_property_value ("Format"
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       format_ptr.in () >>= temp_format;
       peer_format = CORBA::string_dup (temp_format);
@@ -4696,7 +4696,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
       exception_message =
         "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols";
       AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols"
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AvailableProtocols_ptr.in () >>= temp_protocols;
       my_protocol_spec = *temp_protocols;
@@ -4704,7 +4704,7 @@ TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep
       exception_message =
         "TAO_FlowEndPoint::is_fep_compatible - AvailableProtocols[2]";
       AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols"
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AvailableProtocols_ptr.in () >>= temp_protocols;
       peer_protocol_spec = *temp_protocols;
@@ -4750,7 +4750,7 @@ CORBA::Boolean
 TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr /* the_fc */,
                             AVStreams::FlowEndPoint_ptr the_peer_fep,
                             AVStreams::QoS & /* the_qos */
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed,
                    AVStreams::streamOpFailed))
@@ -4764,7 +4764,7 @@ CORBA::Boolean
 TAO_FlowEndPoint::set_Mcast_peer (AVStreams::FlowConnection_ptr /* the_fc */,
                                   AVStreams::MCastConfigIf_ptr mcast_peer,
                                   AVStreams::QoS & /* the_qos */
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::QoSRequestFailed))
 {
@@ -4778,7 +4778,7 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role,
                                   CORBA::Boolean /*is_mcast*/,
                                   AVStreams::FlowEndPoint_ptr peer_fep,
                                   char *& flowProtocol
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToListen,
                    AVStreams::FPError,
@@ -4800,13 +4800,13 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role,
   AVStreams::protocolSpec *temp_protocols;
   CORBA::Any_var AvailableProtocols_ptr =
     peer_fep->get_property_value ("AvailableProtocols"
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   AvailableProtocols_ptr.in () >>= temp_protocols;
   peer_protocol_spec = *temp_protocols;
   AvailableProtocols_ptr =
     this->get_property_value ("AvailableProtocols"
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   AvailableProtocols_ptr.in () >>= temp_protocols;
   my_protocol_spec = *temp_protocols;
@@ -4871,7 +4871,7 @@ TAO_FlowEndPoint::connect_to_peer_i (TAO_FlowSpec_Entry::Role role,
                                      AVStreams::QoS & /*the_qos*/,
                                      const char * address,
                                      const char * use_flow_protocol
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::FPError,
@@ -4935,7 +4935,7 @@ TAO_FlowProducer::TAO_FlowProducer (const char *flowname,
 // gets the reverse channel for feedback.
 char *
 TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -4943,7 +4943,7 @@ TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/
 
 // The start, stop and destroy are to be handled by the application.
 void
-TAO_FlowProducer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowProducer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -4956,7 +4956,7 @@ TAO_FlowProducer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_FlowProducer::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowProducer::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -4980,7 +4980,7 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos,
                                 CORBA::Boolean is_mcast,
                                 AVStreams::FlowEndPoint_ptr peer_fep,
                                 char *& flowProtocol
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToListen,
                    AVStreams::FPError,
@@ -4991,14 +4991,14 @@ TAO_FlowProducer::go_to_listen (AVStreams::QoS & the_qos,
                                is_mcast,
                                peer_fep,
                                flowProtocol
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos,
                                    const char * address,
                                    const char * use_flow_protocol
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::FPError,
@@ -5008,7 +5008,7 @@ TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos,
                                   the_qos,
                                   address,
                                   use_flow_protocol
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 //  Connect to a IP multicast address.
 char *
@@ -5016,7 +5016,7 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */,
                                  CORBA::Boolean_out /* is_met */,
                                  const char *address,
                                  const char * use_flow_protocol
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::notSupported,
@@ -5060,7 +5060,7 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */,
 // sets the key for this flow.
 void
 TAO_FlowProducer::set_key (const AVStreams::key & the_key
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -5069,7 +5069,7 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key
       anyval <<= the_key;
       this->define_property ("PublicKey",
                              anyval
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -5083,7 +5083,7 @@ TAO_FlowProducer::set_key (const AVStreams::key & the_key
 // source id to be used to distinguish this source from others.
 void
 TAO_FlowProducer::set_source_id (CORBA::Long source_id
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->source_id_ = source_id;
@@ -5108,7 +5108,7 @@ TAO_FlowConsumer::TAO_FlowConsumer (const char *flowname,
 
 // The start, stop and destroy are to be handled by the application.
 void
-TAO_FlowConsumer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowConsumer::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -5118,7 +5118,7 @@ TAO_FlowConsumer::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_FlowConsumer::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FlowConsumer::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_AV_FlowSpecSetItor end = this->flow_spec_set_.end ();
@@ -5134,7 +5134,7 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos,
                                 CORBA::Boolean is_mcast,
                                 AVStreams::FlowEndPoint_ptr peer_fep,
                                 char *& flowProtocol
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToListen,
                    AVStreams::FPError,
@@ -5145,14 +5145,14 @@ TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos,
                                is_mcast,
                                peer_fep,
                                flowProtocol
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos,
                                    const char * address,
                                    const char * use_flow_protocol
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::failedToConnect,
                    AVStreams::FPError,
@@ -5162,7 +5162,7 @@ TAO_FlowConsumer::connect_to_peer (AVStreams::QoS & the_qos,
                                   the_qos,
                                   address,
                                   use_flow_protocol
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 //------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 80edd90fc01..95ab3009b5b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -95,14 +95,14 @@ public:
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
   virtual void stop (const AVStreams::flowSpec &the_spec
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Start the transfer of data in the stream.
   /// Empty the_spec means apply operation to all flows
   virtual void start (const AVStreams::flowSpec &the_spec
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -112,7 +112,7 @@ public:
    * Empty the_spec means apply operation to all flows
    */
   virtual void destroy (const AVStreams::flowSpec &the_spec
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -120,7 +120,7 @@ public:
   /// Empty the_spec means apply operation to all flows
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
                                      const AVStreams::flowSpec &the_spec
-                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
@@ -128,14 +128,14 @@ public:
   /// Used by StreamEndPoint and VDev to inform StreamCtrl of events.
   /// E.g., loss of flow, reestablishment of flow, etc..
   virtual void push_event (const struct CosPropertyService::Property & the_event
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to control the flow protocol parameters.
   virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
                              const char *fp_name,
                              const CORBA::Any &fp_settings
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::FPError));
@@ -143,7 +143,7 @@ public:
   /// Not implemented in the light profile, will raise the notsupported
   /// exception
   virtual CORBA::Object_ptr get_flow_connection (const char *flow_name
-                                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::notSupported));
@@ -152,7 +152,7 @@ public:
   /// exception
   virtual void set_flow_connection (const char *flow_name,
                                     CORBA::Object_ptr flow_connection
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::notSupported));
@@ -186,7 +186,7 @@ class TAO_AV_Export TAO_Negotiator
 public:
   virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator,
                                     const AVStreams::streamQoS &qos_spec
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -251,14 +251,14 @@ public:
   /// Stop the transfer of data of the stream
   /// Empty the_spec means apply operation to all flows
   virtual void stop (const AVStreams::flowSpec &the_spec
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Start the transfer of data in the stream.
   /// Empty the_spec means apply operation to all flows
   virtual void start (const AVStreams::flowSpec &the_spec
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -268,7 +268,7 @@ public:
    * Empty the_spec means apply operation to all flows
    */
   virtual void destroy (const AVStreams::flowSpec &the_spec
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -283,7 +283,7 @@ public:
                                     AVStreams::MMDevice_ptr b_party,
                                     AVStreams::streamQoS& the_qos,
                                     const AVStreams::flowSpec& the_flows
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -298,7 +298,7 @@ public:
                                AVStreams::StreamEndPoint_B_ptr b_party,
                                AVStreams::streamQoS &the_qos,
                                const AVStreams::flowSpec &the_flows
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::noSuchFlow,
@@ -306,7 +306,7 @@ public:
 
   virtual void unbind_dev (AVStreams::MMDevice_ptr dev,
                            const AVStreams::flowSpec & the_spec
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow));
@@ -314,19 +314,19 @@ public:
   /// Unbind the_ep from the stream. Empty the_spec means apply to all flows.
   virtual void unbind_party (AVStreams::StreamEndPoint_ptr the_ep,
                              const AVStreams::flowSpec &the_spec
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow));
 
   /// unbind the stream. Same effect as Basic_StreamCtrl::destroy ()
-  virtual void unbind (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void unbind (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed));
 
   virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev,
                                                 AVStreams::StreamEndPoint_out sep
-                                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed));
 
@@ -334,7 +334,7 @@ public:
   /// Empty the_spec means apply operation to all flows
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
                                      const AVStreams::flowSpec &the_spec
-                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
@@ -386,28 +386,28 @@ public:
   virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer,
                                    AVStreams::streamQoS & the_qos,
                                    const AVStreams::flowSpec & the_spec
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed,
                      AVStreams::streamOpFailed));
 
   virtual void configure (const CosPropertyService::Property & a_configuration
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_initial_configuration (const CosPropertyService::Properties & initial
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_format (const char * flowName,
                            const char * format_name
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   virtual void set_dev_params (const char * flowName,
                                const CosPropertyService::Properties & new_params
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
@@ -494,15 +494,15 @@ public:
 
   /// Application needs to define this
   virtual int handle_stop (const AVStreams::flowSpec &the_spec
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Application needs to define this
   virtual int handle_start (const AVStreams::flowSpec &the_spec
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Application needs to define this
   virtual int handle_destroy (const AVStreams::flowSpec &the_spec
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Application needs to define this
   virtual CORBA::Boolean handle_preconnect (AVStreams::flowSpec &the_spec);
@@ -512,7 +512,7 @@ public:
 
   /// Application needs to define this
   virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec
-                                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
@@ -563,19 +563,19 @@ public:
 
    /// Stop the stream. Empty the_spec means, for all the flows
   virtual void stop (const AVStreams::flowSpec &the_spec
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Start the stream, Empty the_spec means, for all the flows
   virtual void start (const AVStreams::flowSpec &the_spec
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
   /// Destroy the stream, Empty the_spec means, for all the flows
   virtual void destroy (const AVStreams::flowSpec &the_spec
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow));
 
@@ -583,7 +583,7 @@ public:
   virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder,
                                   AVStreams::streamQoS& qos_spec,
                                   const AVStreams::flowSpec& the_spec
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
@@ -595,7 +595,7 @@ public:
                                              CORBA::Boolean is_mcast,
                                              AVStreams::streamQoS &qos,
                                              AVStreams::flowSpec &the_spec
-                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpDenied,
                      AVStreams::noSuchFlow,
@@ -605,23 +605,23 @@ public:
   /// Change the transport qos on a stream
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
                                      const AVStreams::flowSpec &the_flows
-                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
 
   virtual int change_qos (AVStreams::streamQoS &new_qos,
                           const AVStreams::flowSpec &the_flows
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Used to restrict the set of protocols
   virtual CORBA::Boolean set_protocol_restriction (const AVStreams::protocolSpec &the_pspec
-                                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// disconnect the flows
   virtual void disconnect (const AVStreams::flowSpec &the_spec
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::streamOpFailed));
@@ -630,46 +630,46 @@ public:
   virtual void set_FPStatus (const AVStreams::flowSpec &the_spec,
                              const char *fp_name,
                              const CORBA::Any &fp_settings
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::FPError));
 
   /// Not implemented in the light profile, throws notsupported
   virtual CORBA::Object_ptr get_fep (const char *flow_name
-                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::noSuchFlow));
 
   /// Not implemented in the light profile, throws notsupported
   virtual char * add_fep (CORBA::Object_ptr the_fep
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
 
   /// Not implemented in the light profile, throws notsupported
   virtual void remove_fep (const char *fep_name
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
 
   /// Used to "attach" a negotiator to the endpoint
   virtual void set_negotiator (AVStreams::Negotiator_ptr new_negotiator
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used for public key encryption.
   virtual void set_key (const char *flow_name,
                         const AVStreams::key & the_key
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Used to set a unique id for packets sent by this streamendpoint
   virtual void set_source_id (CORBA::Long source_id
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destructor
@@ -677,17 +677,17 @@ public:
 
   CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
                                AVStreams::flowSpec &the_spec
-                               TAO_ENV_ARG_DECL);
+                               ACE_ENV_ARG_DECL);
 
 protected:
   /// Helper methods to implement add_fep()
   char* add_fep_i (AVStreams::FlowEndPoint_ptr fep
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
   char* add_fep_i_add_property (AVStreams::FlowEndPoint_ptr fep
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
@@ -753,7 +753,7 @@ public:
   /// Used for ATM-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
                                        AVStreams::flowSpec &the_spec
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
@@ -763,7 +763,7 @@ public:
   virtual CORBA::Boolean connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
                                        AVStreams::streamQoS &the_qos,
                                        const AVStreams::flowSpec &the_flows
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -773,7 +773,7 @@ public:
   /// Used to remove a multicast leaf
   virtual void disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
                                 const AVStreams::flowSpec &theSpec
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -806,7 +806,7 @@ public:
   /// Used for internet-style multicast
   virtual CORBA::Boolean multiconnect (AVStreams::streamQoS &the_qos,
                                        AVStreams::flowSpec &the_spec
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -837,7 +837,7 @@ public:
                                    AVStreams::VDev_ptr the_peer_dev,
                                    AVStreams::streamQoS &the_qos,
                                    const AVStreams::flowSpec &the_spec
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
@@ -848,7 +848,7 @@ public:
                                          AVStreams::MCastConfigIf_ptr a_mcastconfigif,
                                          AVStreams::streamQoS &the_qos,
                                          const AVStreams::flowSpec &the_spec
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed,
@@ -856,7 +856,7 @@ public:
 
   /// Called by the peer VDev to configure the device (catch all)
   virtual void configure (const CosPropertyService::Property &the_config_mesg
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
                      AVStreams::streamOpFailed));
@@ -864,14 +864,14 @@ public:
   /// Used to set a format on a flowname
   virtual void set_format (const char *flowName,
                            const char *format_name
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// Used to set device parameters
   virtual void set_dev_params (const char *flowName,
                                const CosPropertyService::Properties &new_params
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
                      AVStreams::streamOpFailed));
@@ -879,7 +879,7 @@ public:
   /// Called to change QoS of the device
   virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &the_qos,
                                      const AVStreams::flowSpec &the_spec
-                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed));
@@ -890,7 +890,7 @@ public:
 protected:
   /// hook called after set_peer is done to set the media ctrl of the peer vdev.
   virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// My stream controller
   AVStreams::StreamCtrl_var streamctrl_;
@@ -927,7 +927,7 @@ public:
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
                                                      const AVStreams::flowSpec &the_spec
-                                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Can be used to request the MMDevice to create a new StreamCtrl,
   /// and call bind_devs on it
@@ -935,7 +935,7 @@ public:
                                            AVStreams::streamQoS &the_qos,
                                            CORBA::Boolean_out is_met,
                                            const AVStreams::flowSpec &the_spec
-                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -946,7 +946,7 @@ public:
                                                  AVStreams::streamQoS &the_qos,
                                                  CORBA::Boolean_out is_met,
                                                  const AVStreams::flowSpec &the_spec
-                                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::noSuchFlow,
@@ -959,7 +959,7 @@ public:
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
                                                      const AVStreams::flowSpec &the_spec
-                                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -974,7 +974,7 @@ public:
                                                      CORBA::Boolean_out met_qos,
                                                      char *&named_vdev,
                                                      const AVStreams::flowSpec &the_spec
-                                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -985,27 +985,27 @@ public:
   /// Remove the StreamEndPoint and the related vdev
   virtual void destroy (AVStreams::StreamEndPoint_ptr the_ep,
                         const char *vdev_name
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// Not supported in the light profile, raises notsupported
   virtual char * add_fdev (CORBA::Object_ptr the_fdev
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::streamOpFailed));
 
   /// Not supported in the light profile, raises notsupported
   virtual CORBA::Object_ptr get_fdev (const char *flow_name
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::noSuchFlow));
 
   /// Not supported in the light profile, raises notsupported
   virtual void remove_fdev (const char *flow_name
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported,
                      AVStreams::noSuchFlow,
@@ -1017,7 +1017,7 @@ public:
 protected:
   /// Helper method to implement add_fdev()
   char* add_fdev_i (AVStreams::FDev_ptr fdev
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported,
                    AVStreams::streamOpFailed));
@@ -1066,34 +1066,34 @@ public:
   TAO_FlowConnection (void);
 
   /// stop this flow.
-  virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// start this flow.
-  virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// destroy this flow.
-  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));
 
   /// modify the QoS for this flow.
   virtual CORBA::Boolean modify_QoS (AVStreams::QoS & new_qos
-                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed));
 
   /// use the specified flow protocol for this flow.
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
                                             const CORBA::Any & fp_settings
-                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::FPError,
                      AVStreams::notSupported));
 
   /// pushes an event , to be handled by the application.
   virtual void push_event (const AVStreams::streamEvent & the_event
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1101,7 +1101,7 @@ public:
   virtual CORBA::Boolean connect_devs (AVStreams::FDev_ptr a_party,
                                        AVStreams::FDev_ptr b_party,
                                        AVStreams::QoS & the_qos
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -1111,20 +1111,20 @@ public:
   virtual CORBA::Boolean connect (AVStreams::FlowProducer_ptr flow_producer,
                                   AVStreams::FlowConsumer_ptr flow_consumer,
                                   AVStreams::QoS & the_qos
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::formatMismatch,
                      AVStreams::FEPMismatch,
                      AVStreams::alreadyConnected));
 
   /// disconnect this flow connection.
-  virtual CORBA::Boolean disconnect (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean disconnect (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// adds the producer to this flow connection.
   virtual CORBA::Boolean add_producer (AVStreams::FlowProducer_ptr flow_producer,
                                        AVStreams::QoS & the_qos
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::alreadyConnected,
                      AVStreams::notSupported));
@@ -1132,13 +1132,13 @@ public:
   /// adds a consumer to this flow connection.
   virtual CORBA::Boolean add_consumer (AVStreams::FlowConsumer_ptr flow_consumer,
                                        AVStreams::QoS & the_qos
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::alreadyConnected));
 
   /// drops a flow endpoint from the flow.
   virtual CORBA::Boolean drop (AVStreams::FlowEndPoint_ptr target
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notConnected));
 
@@ -1200,41 +1200,41 @@ public:
                                    TAO_AV_Protocol_Object *object);
 
   /// lock the flow endpoint for a particular flow.
-  virtual CORBA::Boolean lock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// unlock the flow endpoint for subsequent use.
-  virtual void unlock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void unlock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   /// destroy this flow.
-  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));
 
   /// get method for the related streamendpoint under which this
   /// flowendpoint is.
-  virtual AVStreams::StreamEndPoint_ptr related_sep(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual AVStreams::StreamEndPoint_ptr related_sep(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// set method for the related streamendpoint under which this
   /// flowendpoint is.
   virtual void related_sep (AVStreams::StreamEndPoint_ptr related_sep
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual AVStreams::FlowConnection_ptr related_flow_connection(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual AVStreams::FlowConnection_ptr related_flow_connection(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // accessor for the related flow connection attribute.
 
   /// set method for the related flow connection attribute.
   virtual void related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection
-                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// returns the other flowendpoint to which this is connected.
-  virtual AVStreams::FlowEndPoint_ptr get_connected_fep (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual AVStreams::FlowEndPoint_ptr get_connected_fep (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notConnected,
                      AVStreams::notSupported));
@@ -1242,33 +1242,33 @@ public:
   //// use the specified flow protocol.
   virtual CORBA::Boolean use_flow_protocol (const char * fp_name,
                                             const CORBA::Any & fp_settings
-                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::FPError,
                      AVStreams::notSupported));
 
   /// sets the data format.
   virtual void set_format (const char * format
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// sets the device parameters.
   virtual void set_dev_params (const CosPropertyService::Properties & new_settings
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::PropertyException,
                      AVStreams::streamOpFailed));
 
   /// sets the list of protocols to be used.
   virtual void set_protocol_restriction (const AVStreams::protocolSpec & the_spec
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
   /// checks whether the passed flowendpoint is compatible with this.
   virtual CORBA::Boolean is_fep_compatible (AVStreams::FlowEndPoint_ptr fep
-                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::formatMismatch,
                      AVStreams::deviceQosMismatch));
@@ -1277,7 +1277,7 @@ public:
   virtual CORBA::Boolean set_peer (AVStreams::FlowConnection_ptr the_fc,
                                    AVStreams::FlowEndPoint_ptr the_peer_fep,
                                    AVStreams::QoS & the_qos
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed,
                      AVStreams::streamOpFailed));
@@ -1286,7 +1286,7 @@ public:
   virtual CORBA::Boolean set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc,
                                          AVStreams::MCastConfigIf_ptr a_mcastconfigif,
                                          AVStreams::QoS & the_qos
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::QoSRequestFailed));
 
@@ -1299,7 +1299,7 @@ public:
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
                                           const char * use_flow_protocol
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1310,7 +1310,7 @@ public:
                                             AVStreams::QoS & the_qos,
                                             const char * address,
                                             const char * use_flow_protocol
-                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1325,7 +1325,7 @@ public:
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
                                char *& flowProtocol
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1337,7 +1337,7 @@ public:
                                  CORBA::Boolean is_mcast,
                                  AVStreams::FlowEndPoint_ptr peer,
                                  char *& flowProtocol
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1394,22 +1394,22 @@ public:
    * know the reverse channel on its peer fep to send data to.
    */
   virtual char * get_rev_channel (const char * pcol_name
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// stop this flow, to be overridden by the application.
-  virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// start this flow, to be overridden by the application.
-  virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
                                char *& flowProtocol
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1418,7 +1418,7 @@ public:
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
                                           const char * use_flow_protocol
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1429,7 +1429,7 @@ public:
                                 CORBA::Boolean_out is_met,
                                 const char * address,
                                 const char * use_flow_protocol
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::notSupported,
@@ -1440,13 +1440,13 @@ public:
 
   /// sets the public key  to be used for encryption of the data.
   virtual void set_key (const AVStreams::key & the_key
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// sets the source id of this flow producer so that it can be used
   /// to distinguish this producer from others in the multicast case.
   virtual void set_source_id (CORBA::Long source_id
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -1469,18 +1469,18 @@ public:
                     const char *format);
 
   /// stop this flow, to be overridden by the application.
-  virtual void stop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// start this flow, to be overridden by the application.
-  virtual void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
                                AVStreams::FlowEndPoint_ptr peer,
                                char *& flowProtocol
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToListen,
                      AVStreams::FPError,
@@ -1489,7 +1489,7 @@ public:
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
                                           const char * use_flow_protocol
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::failedToConnect,
                      AVStreams::FPError,
@@ -1513,33 +1513,33 @@ public:
 
   virtual AVStreams::Position get_media_position (AVStreams::PositionOrigin an_origin,
                                                   AVStreams::PositionKey a_key
-                                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::MediaControl::PostionKeyNotSupported)) =0;
 
   virtual void set_media_position (const AVStreams::Position & a_position
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::MediaControl::PostionKeyNotSupported,
                      AVStreams::InvalidPosition)) =0;
 
   virtual void start (const AVStreams::Position & a_position
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
   virtual void pause (const AVStreams::Position & a_position
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
   virtual void resume (const AVStreams::Position & a_position
-                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
   virtual void stop (const AVStreams::Position & a_position
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::InvalidPosition)) =0;
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 1c4406449ed..5c73560bc55 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -149,7 +149,7 @@ TAO_AV_Core::reactor (void)
 int
 TAO_AV_Core::init (CORBA::ORB_ptr orb,
                    PortableServer::POA_ptr poa
-                   TAO_ENV_ARG_DECL_NOT_USED)
+                   ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Core::init "));
   this->orb_ = CORBA::ORB::_duplicate (orb);
@@ -1016,18 +1016,18 @@ TAO_AV_Core::deactivate_servant (PortableServer::Servant servant)
   // the servant when all pending requests on this servant are
   // complete.
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      PortableServer::POA_var poa = servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::POA_var poa = servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id = poa->servant_to_id (servant
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       poa->deactivate_object (id.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index d170ef600b4..c1242aed973 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -86,7 +86,7 @@ public:
 
   int init (CORBA::ORB_ptr orb,
             PortableServer::POA_ptr poa
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   int run (void);
   int stop_run (void);
   int init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index fe0fb2884ad..f70a5c8b9e9 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -53,7 +53,7 @@ TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void)
 int
 TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_endpoint */,
                                     AVStreams::VDev_ptr & /* vdev */
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "(%P|%t) Error creating A endpoint\n"),
@@ -67,7 +67,7 @@ TAO_AV_Endpoint_Strategy::create_A (AVStreams::StreamEndPoint_A_ptr & /* stream_
 int
 TAO_AV_Endpoint_Strategy::create_B (AVStreams::StreamEndPoint_B_ptr & /* stream_endpoint */,
                                     AVStreams::VDev_ptr & /*vdev */
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_ERROR_RETURN ((LM_ERROR,
                      "(%P|%t) Error creating B endpoint\n"),
@@ -156,19 +156,19 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
                        "remove"),
                       -1);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Get ourselves a Naming service
-      this->bind_to_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->bind_to_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the stream endpoint created by the child from the naming service
-      this->get_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->get_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the Vdev created by the child from the naming service
-      this->get_vdev (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->get_vdev (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -183,7 +183,7 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
 
 // Get ourselves a Naming service reference
 int
-TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -191,7 +191,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DEC
         return 0;
 
       CORBA::Object_var naming_obj =
-        TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        TAO_ORB_Core_instance ()->orb ()->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -200,7 +200,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DEC
                           -1);
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -215,7 +215,7 @@ TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DEC
 
 // Get the VDev created in the child process from the namingservice
 int
-TAO_AV_Endpoint_Process_Strategy::get_vdev (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy::get_vdev (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -236,13 +236,13 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (TAO_ENV_SINGLE_ARG_DECL)
       // Get the CORBA::Object
       CORBA::Object_var vdev =
         this->naming_context_->resolve (VDev_Name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow it
       this->vdev_ =
         AVStreams::VDev::_narrow (vdev.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check if valid
@@ -280,7 +280,7 @@ TAO_AV_Endpoint_Process_Strategy_A::~TAO_AV_Endpoint_Process_Strategy_A (void)
 int
 TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
                                            AVStreams::VDev_ptr &vdev
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
 {
   // use the baseclass activate
   if (this->activate () == -1)
@@ -297,7 +297,7 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s
 
 // Gets the stream endpoint object reference from the naming service
 int
-TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -319,13 +319,13 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL
       // Get the CORBA::Object
       CORBA::Object_var stream_endpoint_a =
         this->naming_context_->resolve (Stream_Endpoint_A_Name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the reference
       this->stream_endpoint_a_ =
         AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check for validity
@@ -363,7 +363,7 @@ TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B (void)
 int
 TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
                                               AVStreams::VDev_ptr &vdev
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -374,7 +374,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
 
     if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is:%s\n",
                 TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_
-                                                                    TAO_ENV_ARG_PARAMETER)));
+                                                                    ACE_ENV_ARG_PARAMETER)));
     ACE_TRY_CHECK;
     stream_endpoint = this->stream_endpoint_b_;
     vdev = this->vdev_;
@@ -391,7 +391,7 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
 
 // Gets the B type stream_endpoint from the Naming service
 int
-TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -413,13 +413,13 @@ TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL
       // Get the CORBA::Object reference
       CORBA::Object_var stream_endpoint_b =
         this->naming_context_->resolve (Stream_Endpoint_B_Name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the reference
       this->stream_endpoint_b_ =
         AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check for validity
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 7323dd79bcb..f57d2ac3533 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -44,12 +44,12 @@ public:
   /// Called by the MMDevice, when it needs to create an A type endpoint
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
                         AVStreams::VDev_ptr &vdev
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
   /// Called by the MMDevice, when it needs to create an B type endpoint
   virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
                         AVStreams::VDev_ptr &vdev
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
 protected:
   /// The "A" stream endpoint
@@ -87,18 +87,18 @@ public:
 
 protected:
   /// Bind to the naming service
-  virtual int bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL);
 
   /**
    * Get the object reference for the newly created stream
    * endpoint (which will be in the child process)
    * Subclasses will define the functionality for this
    */
-  virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
   /// Get the Vdev object reference for the newly created
   /// endpoint
-  virtual int get_vdev (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int get_vdev (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Naming context
   CosNaming::NamingContext_var naming_context_;
@@ -135,10 +135,10 @@ protected:
   /// Creates an "A" type stream endpoint, and a vdev
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
                         AVStreams::VDev_ptr &vdev
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
   /// Gets the "A" type stream endpoint from the child process
-  virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
 
 };
 
@@ -163,11 +163,11 @@ protected:
   /// Creates a "B" type stream endpoint, and a vdev
   virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
                         AVStreams::VDev_ptr &vdev
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
 
   /// Gets the object reference of the "B" type streamendpoint.
-  virtual int get_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index 87dac015760..68df61b060d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -32,15 +32,15 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->activate_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->activate_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated stream_endpoint\n"));
 
-      this->activate_vdev (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->activate_vdev (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated vdev\n"));
 
-      this->activate_mediactrl (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->activate_mediactrl (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated mediactrl\n"));
     }
@@ -56,22 +56,22 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 char *
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL)
 {
 
   PortableServer::ObjectId_var id =
     this->poa_->activate_object (servant
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Object_var obj =
     this->poa_->id_to_reference (id.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::String_var str =
     this->orb_->object_to_string (obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return str._retn ();
@@ -81,7 +81,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 // Activate VDev into the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -92,15 +92,15 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 
       // Activate the object under the root poa.
 //      CORBA::String_var vdev_ior = this->activate_with_poa (vdev,
-//                                                            TAO_ENV_ARG_PARAMETER);
+//                                                            ACE_ENV_ARG_PARAMETER);
 //      ACE_TRY_CHECK;
 //      if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_vdev, vdev ior is:%s\n",
 //                  vdev_ior. in ()));
 
       // Save the object reference, so that create_A can return it
-      this->vdev_ = vdev->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->vdev_ = vdev->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      vdev->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      vdev->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -117,7 +117,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 // Activate the media_controller
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -128,7 +128,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 
       // Activate the mediactrl object under the root poa.
 //      CORBA::String_var mediactrl_ior = this->activate_with_poa (media_ctrl
-//                                                                 TAO_ENV_ARG_PARAMETER);
+//                                                                 ACE_ENV_ARG_PARAMETER);
 
 //      ACE_TRY_CHECK;
 //      if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl , media_ctrl ior is :%s\n",
@@ -138,13 +138,13 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
       // Associate the media controller object reference with the vdev, as per the OMG spec
       CORBA::Any anyval;
       CORBA::Object_var media_ctrl_obj
-        = media_ctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = media_ctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      media_ctrl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      media_ctrl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str = this->orb_->object_to_string (media_ctrl_obj.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
 
       anyval <<= str.in();
 
@@ -152,7 +152,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
 
      this->vdev_->define_property ("Related_MediaCtrl",
                                    anyval
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
@@ -235,7 +235,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
                                                                                       AVStreams::VDev_ptr &vdev
-                                                                                      TAO_ENV_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                                                                                      ACE_ENV_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */)
 {
   if (this->activate () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -251,7 +251,7 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea
 // Put the stream_endpoint into the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -262,14 +262,14 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
         return -1;
 
 //      CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_a
-//                                                                            TAO_ENV_ARG_PARAMETER);
+//                                                                            ACE_ENV_ARG_PARAMETER);
 //      ACE_TRY_CHECK;
 //      if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ()));
 
       // Save the object references, so that create_a can return them
-      this->stream_endpoint_a_ = stream_endpoint_a->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->stream_endpoint_a_ = stream_endpoint_a->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      stream_endpoint_a->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      stream_endpoint_a->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -312,7 +312,7 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::ini
 // Activate stream_endpoint
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -321,13 +321,13 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
       if (this->make_stream_endpoint (stream_endpoint_b) == -1)
         return -1;
 //      CORBA::String_var stream_endpoint_ior = this->activate_with_poa (stream_endpoint_b
-//                                                                       TAO_ENV_ARG_PARAMETER);
+//                                                                       ACE_ENV_ARG_PARAMETER);
 //      ACE_TRY_CHECK;
 //      if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ()));
 
-      this->stream_endpoint_b_ = stream_endpoint_b->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->stream_endpoint_b_ = stream_endpoint_b->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      stream_endpoint_b->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      stream_endpoint_b->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -345,7 +345,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
                                                                                       AVStreams::VDev_ptr &vdev
-                                                                                      TAO_ENV_ARG_DECL_NOT_USED/* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                                                                                      ACE_ENV_ARG_DECL_NOT_USED/* ACE_ENV_SINGLE_ARG_PARAMETER */)
 {
   if (this->activate () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -393,19 +393,19 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
       // create the objects and activate them in the poa
       this->activate_objects (argc,
                               argv
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get ourselves a naming_service object reference
-      this->bind_to_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->bind_to_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register the vdev with the naming service
-      this->register_vdev (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->register_vdev (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // register the stream_endpoing with the naming_service
-      this->register_stream_endpoint (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->register_stream_endpoint (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -427,22 +427,22 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 char *
 TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant
-                                                                                 TAO_ENV_ARG_DECL)
+                                                                                 ACE_ENV_ARG_DECL)
 {
 
   PortableServer::ObjectId_var id =
     this->poa_->activate_object (servant
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Object_var obj =
     this->poa_->id_to_reference (id.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::String_var str =
     this->orb_->object_to_string (obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return str._retn ();
@@ -453,7 +453,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects (int /*argc*/,
                                                                                  char ** /*argv*/
-                                                                                 TAO_ENV_ARG_DECL)
+                                                                                 ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -471,7 +471,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
 
       // activate the stream_endpoint
       CORBA::String_var stream_endpoint_ior = this->activate_with_poa (this->stream_endpoint_
-                                                                       TAO_ENV_ARG_PARAMETER);
+                                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
                                            "(%P|%t)TAO_AV_Child_Process::activate_objects,stream_endpoint_ior :%s\n",
@@ -479,7 +479,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
 
       // activate the vdev
       CORBA::String_var vdev_ior = this->activate_with_poa (this->vdev_
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
                                            "(%P|%t)TAO_AV_Child_Process::activate_objects, vdev ior is :%s\n",
@@ -487,7 +487,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
 
       // activate the media controller
       CORBA::String_var media_ctrl_ior = this->activate_with_poa (this->media_ctrl_
-                                                                  TAO_ENV_ARG_PARAMETER);
+                                                                  ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,media_ctrl_ior is: %s\n",media_ctrl_ior.in ()));
@@ -505,12 +505,12 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects
 // Bind to the namingservice
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -519,7 +519,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se
       //  if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -535,7 +535,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_se
 // register the vdev with the naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_ptr vdev_obj = CORBA::Object::_nil ();
   ACE_TRY
@@ -555,26 +555,26 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (TA
       // make the media controller a property of the vdev
       CORBA::Any media_ctrl_property;
       CORBA::Object_var media_ctrl_obj =
-        this->media_ctrl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->media_ctrl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       media_ctrl_property <<= this->orb_->object_to_string (media_ctrl_obj.in ()
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->vdev_->define_property ("Related_MediaCtrl",
                                     media_ctrl_property
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      vdev_obj = this->vdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      vdev_obj = this->vdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      this->vdev_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->vdev_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_TRY_EX (bind)
         {
           // Register the vdev with the naming server.
           this->naming_context_->bind (this->vdev_name_,
                                        vdev_obj
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (bind);
         }
       ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
@@ -583,7 +583,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (TA
           // with this one
           this->naming_context_->rebind (this->vdev_name_,
                                          vdev_obj
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -612,7 +612,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_V
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
+      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -660,14 +660,14 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho
 // register the stream_endpoint with the naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil ();
   ACE_TRY
     {
-      stream_endpoint_obj = this->stream_endpoint_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      stream_endpoint_obj = this->stream_endpoint_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      this->stream_endpoint_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->stream_endpoint_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       //  if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
       // Create a name for the video control object
@@ -675,7 +675,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_e
       // Register the stream endpoint object with the naming server.
       this->naming_context_->bind (this->stream_endpoint_name_,
                                    stream_endpoint_obj
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
@@ -683,7 +683,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_e
       // if the name was already there, replace the reference with the new one
       this->naming_context_->rebind (this->stream_endpoint_name_,
                                      stream_endpoint_obj
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -742,11 +742,11 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::unbind_names (void)
       if (CORBA::is_nil (this->naming_context_.in ()) == 0)
         return 0;
       this->naming_context_->unbind (this->stream_endpoint_name_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->naming_context_->unbind (this->vdev_name_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index f4cb2acefd7..1ff9129d44f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -42,15 +42,15 @@ protected:
   virtual int activate (void);
 
   /// activates the stream_endpoint with the POA
-  virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
   /// activates the vdev with the POA
-  virtual int activate_vdev (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int activate_vdev (ACE_ENV_SINGLE_ARG_DECL);
 
 
 
   /// activates the media controller with the POA
-  virtual int activate_mediactrl (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int activate_mediactrl (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Bridge method to create a vdev, a la Acceptor. Applications
   /// can override this
@@ -65,7 +65,7 @@ protected:
   virtual int make_mediactrl (T_MediaCtrl *&media_ctrl);
 
 
-  char* activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL);
+  char* activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL);
 
   CORBA::ORB_var orb_;
 
@@ -95,12 +95,12 @@ public:
 
   /// Overrides the base class stream_endpoint activator, to activate
   /// an "A" type endpoint
-  virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Called by the MMDevice, when it needs to create an A type endpoint
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
                         AVStreams::VDev_ptr &vdev
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
 };
 
@@ -126,12 +126,12 @@ public:
 
   /// Overrides the base class stream_endpoint activator, to activate
   /// a "B" type endpoint
-  virtual int activate_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int activate_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Called by the MMDevice, when it needs to create a B type endpoint
   virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
                         AVStreams::VDev_ptr &vdev
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 };
 
 // ----------------------------------------------------------------------
@@ -168,22 +168,22 @@ protected:
    */
   int activate_objects (int argc,
                         char **argv
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
   ///activate the servant with the poa
-  char* activate_with_poa (PortableServer::Servant servant TAO_ENV_ARG_DECL);
+  char* activate_with_poa (PortableServer::Servant servant ACE_ENV_ARG_DECL);
 
   /// Removes the vdev and streamendpoint names from the naming service.
   int unbind_names (void);
 
   /// Binds to the naming service
-  int bind_to_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  int bind_to_naming_service (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Registers vdev with the naming service
-  int register_vdev (TAO_ENV_SINGLE_ARG_DECL);
+  int register_vdev (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Registers stream_endpoint with the naming service
-  int register_stream_endpoint (TAO_ENV_SINGLE_ARG_DECL);
+  int register_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Releases the semaphore on which the parent is waiting on
   int release_semaphore ();
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
index e26e6bc7116..a309efdf318 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
@@ -28,7 +28,7 @@ TAO_FDev<T_Producer, T_Consumer>::TAO_FDev (const char *flowname)
       flowname_any <<= flowname;
       this->define_property ("Flow",
                              flowname_any
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -63,7 +63,7 @@ TAO_FDev<T_Producer, T_Consumer>::flowname (const char *flow_name)
       flowname_any <<= flow_name;
       this->define_property ("Flow",
                              flowname_any
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -81,7 +81,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr
                                                    AVStreams::QoS & the_qos,
                                                    CORBA::Boolean_out met_qos,
                                                    char *& named_fdev
-                                                   TAO_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -93,7 +93,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_producer (AVStreams::FlowConnection_ptr
                               the_qos,
                               met_qos,
                               named_fdev
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 template <class T_Producer, class T_Consumer>
@@ -103,7 +103,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr /
                                                  AVStreams::QoS & /* the_qos */,
                                                  CORBA::Boolean_out /* met_qos */,
                                                  char *& /* named_fdev */
-                                                 TAO_ENV_ARG_DECL)
+                                                 ACE_ENV_ARG_DECL)
 {
   AVStreams::FlowProducer_ptr producer = AVStreams::FlowProducer::_nil ();
   ACE_TRY
@@ -114,7 +114,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_producer (AVStreams::FlowConnection_ptr /
                       T_Producer,
                       0);
       this->producer_list_.insert_tail (producer_i);
-      producer = producer_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      producer = producer_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -134,7 +134,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr /
                                                  AVStreams::QoS & /* the_qos */,
                                                  CORBA::Boolean_out /* met_qos */,
                                                  char *& /* named_fdev */
-                                                 TAO_ENV_ARG_DECL)
+                                                 ACE_ENV_ARG_DECL)
 {
   AVStreams::FlowConsumer_ptr consumer = AVStreams::FlowConsumer::_nil ();
   ACE_TRY
@@ -145,7 +145,7 @@ TAO_FDev<T_Producer, T_Consumer>::make_consumer (AVStreams::FlowConnection_ptr /
                       T_Consumer,
                       0);
       this->consumer_list_.insert_tail (consumer_i);
-      consumer = consumer_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer = consumer_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -164,7 +164,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr
                                                    AVStreams::QoS & the_qos,
                                                    CORBA::Boolean_out met_qos,
                                                    char *& named_fdev
-                                                   TAO_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::streamOpDenied,
@@ -175,7 +175,7 @@ TAO_FDev<T_Producer, T_Consumer>::create_consumer (AVStreams::FlowConnection_ptr
                               the_qos,
                               met_qos,
                               named_fdev
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 template <class T_Producer, class T_Consumer>
@@ -184,7 +184,7 @@ AVStreams::FlowConnection_ptr
 TAO_FDev<T_Producer, T_Consumer>::bind (AVStreams::FDev_ptr peer_device,
                                         AVStreams::QoS & the_qos,
                                         CORBA::Boolean_out is_met
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::QoSRequestFailed))
@@ -202,7 +202,7 @@ AVStreams::FlowConnection_ptr
 TAO_FDev<T_Producer, T_Consumer>::bind_mcast (AVStreams::FDev_ptr first_peer,
                                               AVStreams::QoS & the_qos,
                                               CORBA::Boolean_out is_met
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::streamOpFailed,
                    AVStreams::QoSRequestFailed))
@@ -218,7 +218,7 @@ template <class T_Producer, class T_Consumer>
 void
 TAO_FDev<T_Producer, T_Consumer>::destroy (AVStreams::FlowEndPoint_ptr /* the_ep */,
                                            const char * /* fdev_name */
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    AVStreams::notSupported))
 {
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
index b227851f3e7..c7a7cb87e47 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
@@ -48,7 +48,7 @@ public:
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
                                                        char *& named_fdev
-                                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -61,14 +61,14 @@ public:
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
                                                        char *& named_fdev
-                                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// create a flow consumer object.
   virtual AVStreams::FlowConsumer_ptr create_consumer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
                                                        char *& named_fdev
-                                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::streamOpDenied,
@@ -81,13 +81,13 @@ public:
                                                        AVStreams::QoS & the_qos,
                                                        CORBA::Boolean_out met_qos,
                                                        char *& named_fdev
-                                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// bind this FDev with another FDev.
   virtual AVStreams::FlowConnection_ptr bind (AVStreams::FDev_ptr peer_device,
                                               AVStreams::QoS & the_qos,
                                               CORBA::Boolean_out is_met
-                                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::QoSRequestFailed));
@@ -96,7 +96,7 @@ public:
   virtual AVStreams::FlowConnection_ptr bind_mcast (AVStreams::FDev_ptr first_peer,
                                                     AVStreams::QoS & the_qos,
                                                     CORBA::Boolean_out is_met
-                                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::streamOpFailed,
                      AVStreams::QoSRequestFailed));
@@ -104,7 +104,7 @@ public:
   /// destroys this FDev.
   virtual void destroy (AVStreams::FlowEndPoint_ptr the_ep,
                         const char * fdev_name
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::notSupported));
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index dbeb3e615f0..27d79bd3ebd 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -318,7 +318,7 @@ int
 TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/)
 {
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::handle_qos\n"));
@@ -375,7 +375,7 @@ TAO_AV_UDP_QoS_Flow_Handler::handle_qos (ACE_HANDLE /*fd*/)
                   AVStreams::Negotiator_var remote_negotiator;
                   this->negotiator_->negotiate (remote_negotiator.in (),
                                                 new_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
                 }
             }
     }
@@ -871,7 +871,7 @@ TAO_AV_UDP_QoS_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
 int
 TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   int result = 0;
 
   //  TAO_AV_Callback *callback = 0;
@@ -1020,7 +1020,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
     {
       CORBA::Any_ptr negotiator_any =
         this->endpoint_->get_property_value ("Negotiator"
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (negotiator);
 
       *negotiator_any >>= negotiator;
@@ -1298,7 +1298,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
     {
       CORBA::Any_ptr negotiator_any =
         this->endpoint_->get_property_value ("Negotiator"
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (negotiator);
 
       *negotiator_any >>= negotiator;
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index f81818b7a51..0d2a88a1430 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -13,27 +13,27 @@ ACE_RCSID(orbsvcs, Channel_Clients_T, "$Id$")
 
 template<class TARGET> void
 ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  target_->push (events TAO_ENV_ARG_PARAMETER);
+  target_->push (events ACE_ENV_ARG_PARAMETER);
 }
 
 template<class TARGET> void
 ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  target_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+  target_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template<class TARGET> void
 ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  target_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  target_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #endif /* ACE_CHANNEL_CLIENTS_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index 7b88fccc846..91d7310ff86 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -42,11 +42,11 @@ public:
   // Forwards all calls to <owner>.
 
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC (( CORBA::SystemException));
   // Forwards to target_.
 
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC (( CORBA::SystemException));
   // Forwards to target_.
 
@@ -71,7 +71,7 @@ public:
   ACE_PushSupplier_Adapter (TARGET *target);
   // Forwards all calls to <owner>.
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC (( CORBA::SystemException));
   // Forwards to target_.
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index ea9dc033f6f..6a0f43a1c82 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -39,7 +39,7 @@ CC_Lock::~CC_Lock (void)
 }
 
 void
-CC_Lock::lock (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CC_Lock::lock (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::lock\n"));
@@ -47,7 +47,7 @@ CC_Lock::lock (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::Boolean
-CC_Lock::try_lock (TAO_ENV_SINGLE_ARG_DECL)
+CC_Lock::try_lock (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::try_lock. "));
@@ -82,7 +82,7 @@ CC_Lock::try_lock (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CC_Lock::unlock (TAO_ENV_SINGLE_ARG_DECL)
+CC_Lock::unlock (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::unlock\n"));
@@ -103,7 +103,7 @@ CC_Lock::unlock (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::change_mode\n"));
@@ -201,7 +201,7 @@ void CC_LockModeIterator::First (void)
   current_ = CosConcurrencyControl::intention_read;
 }
 
-void CC_LockModeIterator::Next (TAO_ENV_SINGLE_ARG_DECL)
+void CC_LockModeIterator::Next (ACE_ENV_SINGLE_ARG_DECL)
 {
   switch (current_)
     {
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
index dbc60939bbc..24b87792c7c 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
@@ -58,18 +58,18 @@ public:
   ~CC_Lock (void);
   // Deletes the lock
 
-  void lock (TAO_ENV_SINGLE_ARG_DECL);
+  void lock (ACE_ENV_SINGLE_ARG_DECL);
   // Acquires this lock. Blocks until lock is obtained
 
-  CORBA::Boolean try_lock (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Boolean try_lock (ACE_ENV_SINGLE_ARG_DECL);
   // Tries to acquire this lock. If it is not possible to acquire the
   // lock, false is returned
 
-  void unlock (TAO_ENV_SINGLE_ARG_DECL);
+  void unlock (ACE_ENV_SINGLE_ARG_DECL);
   // Releases this lock.
 
   void change_mode (CosConcurrencyControl::lock_mode new_mode
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
   // Changes the mode of this lock.
 
   void set_mode (CosConcurrencyControl::lock_mode mode);
@@ -125,7 +125,7 @@ public:
   void First(void);
   // Reset the iterator to the first element
 
-  void Next(TAO_ENV_SINGLE_ARG_DECL);
+  void Next(ACE_ENV_SINGLE_ARG_DECL);
   // Advance the iterator to the next element
   // Throws exception if out of range
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index f3afff015db..63082ca944a 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -24,7 +24,7 @@ CC_LockSet::CC_LockSet (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->Init (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->Init (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -42,7 +42,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related)
 {
   ACE_TRY_NEW_ENV
     {
-      this->Init (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->Init (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -56,7 +56,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related)
 // Initialization.
 
 void
-CC_LockSet::Init (TAO_ENV_SINGLE_ARG_DECL)
+CC_LockSet::Init (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Set the mode of the statically allocated locks
   lock_[CC_IR] = 0;
@@ -93,7 +93,7 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr)
 
 void
 CC_LockSet::lock (CosConcurrencyControl::lock_mode mode
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n"));
@@ -114,7 +114,7 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode
 
 CORBA::Boolean
 CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockModeEnum lm = lmconvert (mode);
@@ -155,7 +155,7 @@ CC_LockSet::lmconvert (CosConcurrencyControl::lock_mode mode)
 
 void
 CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld))
 {
@@ -200,7 +200,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode
 void
 CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
                          CosConcurrencyControl::lock_mode new_mode
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld))
 {
@@ -213,7 +213,7 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
     ACE_THROW (CosConcurrencyControl::LockNotHeld());
   else if (this->change_mode_i (lm_held, lm_new)==1)
     {
-      this->unlock (held_mode TAO_ENV_ARG_PARAMETER);
+      this->unlock (held_mode ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (semaphore_.acquire () == -1)
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index efd63a16c41..e7080ab3572 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -87,25 +87,25 @@ public:
 
   // = CosConcurrencyControl methods
   virtual void lock (CosConcurrencyControl::lock_mode mode
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Acquires this lock. Blocks until lock is obtained
 
   virtual CORBA::Boolean try_lock (CosConcurrencyControl::lock_mode mode
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Tries to acquire this lock. If it is not possible to acquire the
   // lock, false is returned
 
   virtual void unlock (CosConcurrencyControl::lock_mode mode
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld));
   // Releases this lock.
 
   virtual void change_mode (CosConcurrencyControl::lock_mode held_mode,
                             CosConcurrencyControl::lock_mode new_mode
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosConcurrencyControl::LockNotHeld));
   // Changes the mode of this lock.
@@ -119,7 +119,7 @@ private:
   // Converts the CORBA specification's lock mode to the internal
   // representation
 
-  void Init (TAO_ENV_SINGLE_ARG_DECL);
+  void Init (ACE_ENV_SINGLE_ARG_DECL);
   // Initiatlizes the lock set array and acquires the initial
   // semaphore.
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index 87bcc3c04f6..56466309fd3 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -29,7 +29,7 @@ CC_LockSetFactory::~CC_LockSetFactory (void)
 }
 
 CosConcurrencyControl::LockSet_ptr
-CC_LockSetFactory::create (TAO_ENV_SINGLE_ARG_DECL)
+CC_LockSetFactory::create (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockSet *ls = 0;
@@ -41,12 +41,12 @@ CC_LockSetFactory::create (TAO_ENV_SINGLE_ARG_DECL)
                     CORBA::NO_MEMORY());
   ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ());
 
-  return ls->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return ls->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosConcurrencyControl::LockSet_ptr
 CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CC_LockSet *ls = 0;
@@ -58,5 +58,5 @@ CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which
                     CORBA::NO_MEMORY());
   ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ());
 
-  return ls->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return ls->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index 538f11e3a63..92c6a480bd3 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -46,12 +46,12 @@ public:
   // Destructor.
 
   virtual CosConcurrencyControl::LockSet_ptr create (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosConcurrencyControl::LockSet_ptr create_related (
       CosConcurrencyControl::LockSet_ptr which
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
index 266ea7e4c3c..3a46ea8d99b 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
@@ -53,7 +53,7 @@ TAO_Concurrency_Server::init (CORBA::ORB_var &orb,
 
       poa->activate_object_with_id (id.in (),
                                     &lock_set_factory_
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringify the objref we'll be implementing, and print it to
@@ -61,12 +61,12 @@ TAO_Concurrency_Server::init (CORBA::ORB_var &orb,
       // client.  Then release the object.
       CORBA::Object_var obj =
         poa->id_to_reference (id.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
         orb->object_to_string (obj.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index 164716520b0..f600d8a2a53 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -33,89 +33,89 @@ TAO_CEC_ConsumerAdmin::~TAO_CEC_ConsumerAdmin (void)
 
 void
 TAO_CEC_ConsumerAdmin::push (const CORBA::Any &event
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   TAO_CEC_Propagate_Event_Push push_worker (event);
 
   this->push_admin_.for_each (&push_worker
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_CEC_Propagate_Event_Pull pull_worker (event);
 
   this->pull_admin_.for_each (&pull_worker
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPushSupplier *supplier
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
-  this->push_admin_.connected (supplier TAO_ENV_ARG_PARAMETER);
+  this->push_admin_.connected (supplier ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPushSupplier *supplier
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  this->push_admin_.reconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->push_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPushSupplier *supplier
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
-  this->push_admin_.disconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->push_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_ConsumerAdmin::connected (TAO_CEC_ProxyPullSupplier *supplier
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
-  this->pull_admin_.connected (supplier TAO_ENV_ARG_PARAMETER);
+  this->pull_admin_.connected (supplier ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_ConsumerAdmin::reconnected (TAO_CEC_ProxyPullSupplier *supplier
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
-  this->pull_admin_.reconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->pull_admin_.reconnected (supplier ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_ConsumerAdmin::disconnected (TAO_CEC_ProxyPullSupplier *supplier
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  this->pull_admin_.disconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->pull_admin_.disconnected (supplier ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_ConsumerAdmin::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ConsumerAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->push_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->pull_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->pull_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CEC_ConsumerAdmin::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->push_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CEC_ConsumerAdmin::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ConsumerAdmin::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->pull_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
@@ -124,18 +124,18 @@ TAO_CEC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_CEC_Propagate_Event_Push::work (TAO_CEC_ProxyPushSupplier *supplier
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  supplier->push (this->event_ TAO_ENV_ARG_PARAMETER);
+  supplier->push (this->event_ ACE_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
 
 void
 TAO_CEC_Propagate_Event_Pull::work (TAO_CEC_ProxyPullSupplier *supplier
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  supplier->push (this->event_ TAO_ENV_ARG_PARAMETER);
+  supplier->push (this->event_ ACE_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index b980088789a..61c5a765a72 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -58,43 +58,43 @@ public:
 
   /// For each elements call <worker->work()>.
   void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
   void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
 
   /// Push the event to all the consumers
   void push (const CORBA::Any &event
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
   virtual void connected (TAO_CEC_ProxyPushSupplier*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void reconnected (TAO_CEC_ProxyPushSupplier*
-                            TAO_ENV_ARG_DECL_NOT_USED);
+                            ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_CEC_ProxyPushSupplier*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
   virtual void connected (TAO_CEC_ProxyPullSupplier*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void reconnected (TAO_CEC_ProxyPullSupplier*
-                            TAO_ENV_ARG_DECL_NOT_USED);
+                            ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_CEC_ProxyPullSupplier*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
 
   /// The event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   // = The CosEventChannelAdmin::ConsumerAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
           ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-      obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The Event Channel we belong to
@@ -119,7 +119,7 @@ public:
   TAO_CEC_Propagate_Event_Push (const CORBA::Any& event);
 
   void work (TAO_CEC_ProxyPushSupplier *supplier
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
 private:
   /// The event
@@ -134,7 +134,7 @@ public:
   TAO_CEC_Propagate_Event_Pull (const CORBA::Any& event);
 
   void work (TAO_CEC_ProxyPullSupplier *supplier
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
 private:
   /// The event
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
index 8db0065dc5b..254a5bdd1fa 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
@@ -3,17 +3,17 @@
 ACE_INLINE void
 TAO_CEC_ConsumerAdmin::
     for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
-  this->push_admin_.for_each (worker TAO_ENV_ARG_PARAMETER);
+  this->push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_CEC_ConsumerAdmin::
     for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
-  this->pull_admin_.for_each (worker TAO_ENV_ARG_PARAMETER);
+  this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
index 4bf1072dd1d..f72c989f4ed 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
@@ -30,20 +30,20 @@ TAO_CEC_ConsumerControl::shutdown (void)
 
 void
 TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPushSupplier *
-                                             TAO_ENV_ARG_DECL_NOT_USED)
+                                             ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_CEC_ConsumerControl::consumer_not_exist (TAO_CEC_ProxyPullSupplier *
-                                             TAO_ENV_ARG_DECL_NOT_USED)
+                                             ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_CEC_ConsumerControl::system_exception (TAO_CEC_ProxyPushSupplier *,
                                            CORBA::SystemException &
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index 9b84bca123e..1eccae7f2cf 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -59,7 +59,7 @@ public:
    * reclaim all the resources attached to that object.
    */
   virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy
-                                   TAO_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL_NOT_USED);
 
   /**
    * Invoked by helper classes when they detect that a consumer no
@@ -67,12 +67,12 @@ public:
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
   virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy
-                                   TAO_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Some system exception was rasied while trying to push an event.
   virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy,
                                  CORBA::SystemException &
-                                 TAO_ENV_ARG_DECL_NOT_USED);
+                                 ACE_ENV_ARG_DECL_NOT_USED);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
index 7c343706f36..a2343f4d940 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
@@ -32,15 +32,15 @@ TAO_CEC_Reactive_Dispatching::shutdown (void)
 void
 TAO_CEC_Reactive_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy,
                                     const CORBA::Any& event
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  proxy->reactive_push_to_consumer (event TAO_ENV_ARG_PARAMETER);
+  proxy->reactive_push_to_consumer (event ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_Reactive_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
                                            CORBA::Any& event
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
 {
-  proxy->reactive_push_to_consumer (event TAO_ENV_ARG_PARAMETER);
+  proxy->reactive_push_to_consumer (event ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
index 9c6873bb59c..90fee4b6d21 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
@@ -54,10 +54,10 @@ public:
   /// The consumer represented by <proxy> should receive <event>.
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
                      const CORBA::Any &event
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
                             CORBA::Any &event
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 };
 
 // ****************************************************************
@@ -82,10 +82,10 @@ public:
   virtual void shutdown (void);
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
                      const CORBA::Any &event
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier *proxy,
                             CORBA::Any &event
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
index a2fd07cb36e..3c9b579775f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
@@ -33,7 +33,7 @@ TAO_CEC_Dispatching_Task::svc (void)
               continue;
             }
 
-          int result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER);
+          int result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_Message_Block::release (mb);
@@ -54,7 +54,7 @@ TAO_CEC_Dispatching_Task::svc (void)
 void
 TAO_CEC_Dispatching_Task::push (TAO_CEC_ProxyPushSupplier *proxy,
                                 CORBA::Any& event
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
@@ -82,7 +82,7 @@ TAO_CEC_Dispatch_Command::~TAO_CEC_Dispatch_Command (void)
 // ****************************************************************
 
 int
-TAO_CEC_Shutdown_Task_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_Shutdown_Task_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return -1;
 }
@@ -95,9 +95,9 @@ TAO_CEC_Push_Command::~TAO_CEC_Push_Command (void)
 }
 
 int
-TAO_CEC_Push_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->proxy_->push_to_consumer (this->event_ TAO_ENV_ARG_PARAMETER);
+  this->proxy_->push_to_consumer (this->event_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index 85e81f2a5c8..b2a269a6793 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -42,7 +42,7 @@ public:
 
   virtual void push (TAO_CEC_ProxyPushSupplier *proxy,
                      CORBA::Any& event
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 private:
   /// An per-task allocator
@@ -68,7 +68,7 @@ public:
   virtual ~TAO_CEC_Dispatch_Command (void);
 
   /// Command callback
-  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0;
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) = 0;
 };
 
 // ****************************************************************
@@ -80,7 +80,7 @@ public:
   TAO_CEC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0);
 
   /// Command callback
-  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 };
 
 // ****************************************************************
@@ -98,7 +98,7 @@ public:
   virtual ~TAO_CEC_Push_Command (void);
 
   /// Command callback
-  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index e8613a8b31f..8a93d5c49cc 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -74,7 +74,7 @@ TAO_CEC_EventChannel::~TAO_CEC_EventChannel (void)
 }
 
 void
-TAO_CEC_EventChannel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_EventChannel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->dispatching_->activate ();
   this->pulling_strategy_->activate ();
@@ -83,7 +83,7 @@ TAO_CEC_EventChannel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_CEC_EventChannel::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->dispatching_->shutdown ();
   this->pulling_strategy_->shutdown ();
@@ -91,141 +91,141 @@ TAO_CEC_EventChannel::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   this->consumer_control_->shutdown ();
 
   PortableServer::POA_var consumer_poa =
-    this->consumer_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this->consumer_admin_ TAO_ENV_ARG_PARAMETER);
+    consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER);
+  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var supplier_poa =
-    this->supplier_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this->supplier_admin_ TAO_ENV_ARG_PARAMETER);
+    supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER);
+  supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-  this->consumer_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
-  this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER);
+  this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
-  this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER);
+  this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER);
+  this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
-  this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER);
+  this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
-  this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER);
+  this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER);
+  this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
-  this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
-  this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushSupplier* supplier
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullSupplier* supplier
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
-  this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullSupplier* supplier
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
-  this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullSupplier* supplier
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_CEC_EventChannel::for_consumers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->consumer_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_CEC_EventChannel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->supplier_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_EventChannel::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index 825280e394f..71d438ce9f9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -117,11 +117,11 @@ public:
 
   /// Start the internal threads (if any), etc.
   /// After this call the EC can be used.
-  virtual void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Shutdown any internal threads, cleanup all the internal
   /// structures, flush all the messages, etc.
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Access the dispatching module....
   TAO_CEC_Dispatching* dispatching (void) const;
@@ -183,32 +183,32 @@ public:
   /// Used to inform the EC that a Consumer has connected or
   /// disconnected from it.
   virtual void connected (TAO_CEC_ProxyPushConsumer*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void reconnected (TAO_CEC_ProxyPushConsumer*
-                            TAO_ENV_ARG_DECL_NOT_USED);
+                            ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_CEC_ProxyPushConsumer*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
   virtual void connected (TAO_CEC_ProxyPullConsumer*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void reconnected (TAO_CEC_ProxyPullConsumer*
-                            TAO_ENV_ARG_DECL_NOT_USED);
+                            ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_CEC_ProxyPullConsumer*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
   virtual void connected (TAO_CEC_ProxyPushSupplier*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void reconnected (TAO_CEC_ProxyPushSupplier*
-                            TAO_ENV_ARG_DECL_NOT_USED);
+                            ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_CEC_ProxyPushSupplier*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
   virtual void connected (TAO_CEC_ProxyPullSupplier*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void reconnected (TAO_CEC_ProxyPullSupplier*
-                            TAO_ENV_ARG_DECL_NOT_USED);
+                            ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_CEC_ProxyPullSupplier*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
 
   // Simple flags to control the EC behavior, set by the application
   // at construction time.
@@ -232,17 +232,17 @@ public:
   /// The default implementation is:
   ///    this->consumer_admin ()->_this (env);
   virtual CosEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (TAO_ENV_SINGLE_ARG_DECL)
+      for_consumers (ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The default implementation is:
   ///    this->supplier_admin ()->_this (env);
   virtual CosEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+      for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Commit suicide.
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index edefea7c31f..52fe306124f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -38,16 +38,16 @@ TAO_CEC_Event_Loader::~TAO_CEC_Event_Loader (void)
 int
 TAO_CEC_Event_Loader::init (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       this->orb_=
-        CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        this->create_object (this->orb_.in (), argc, argv TAO_ENV_ARG_PARAMETER);
+        this->create_object (this->orb_.in (), argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -63,7 +63,7 @@ TAO_CEC_Event_Loader::init (int argc, char *argv[])
 CORBA::Object_ptr
 TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
                                      int argc, char *argv[]
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -125,15 +125,15 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
 
       // POA initialization and activation ...
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
 
@@ -151,17 +151,17 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
                                                  this->factory_,
                                                  this->terminate_flag_);
 
-      this->ec_impl_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->ec_impl_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        this->ec_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ior_file != 0)
         {
           CORBA::String_var ior =
-            orb->object_to_string (event_channel.in () TAO_ENV_ARG_PARAMETER);
+            orb->object_to_string (event_channel.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           FILE *file = ACE_OS::fopen (ior_file, "w");
           ACE_OS::fprintf (file, "%s\n", ior.in ());
@@ -176,12 +176,12 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
         {
           CORBA::Object_var obj =
             orb->resolve_initial_references ("NameService"
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->naming_context_ =
             CosNaming::NamingContext::_narrow (obj.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->channel_name_.length (1);
@@ -191,14 +191,14 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
             {
               this->naming_context_->rebind (this->channel_name_,
                                       event_channel.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             {
               this->naming_context_->bind (this->channel_name_,
                                     event_channel.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -219,30 +219,30 @@ TAO_CEC_Event_Loader::fini (void)
   //   + Since it was activated with _this() you have to do the
   //   canonical:
   //     get_object_id
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Release the resources of the Event Channel
-      this->ec_impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->ec_impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Deactivate the EC
       PortableServer::POA_var poa =
-        this->ec_impl_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this->ec_impl_ TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Unbind the Naming Service
       if (this->bind_to_naming_service_)
         {
           this->naming_context_->unbind (this->channel_name_
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index af490dc459f..f9d23daca61 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -49,7 +49,7 @@ public:
    */
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                    int argc, char *argv[]
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
index 6cbad8bdcd8..bec500f45bf 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
@@ -63,20 +63,20 @@ TAO_CEC_MT_Dispatching::shutdown (void)
 void
 TAO_CEC_MT_Dispatching::push (TAO_CEC_ProxyPushSupplier* proxy,
                               const CORBA::Any& event
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   CORBA::Any event_copy = event;
-  this->push_nocopy (proxy, event_copy TAO_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, event_copy ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_MT_Dispatching::push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
                                      CORBA::Any& event
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   // Double checked locking....
   if (this->active_ == 0)
     this->activate ();
 
-  this->task_.push (proxy, event TAO_ENV_ARG_PARAMETER);
+  this->task_.push (proxy, event ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
index 22b00e1c42e..e6c8fc6bf7d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
@@ -48,10 +48,10 @@ public:
   virtual void shutdown (void);
   virtual void push (TAO_CEC_ProxyPushSupplier* proxy,
                      const CORBA::Any & event
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (TAO_CEC_ProxyPushSupplier* proxy,
                             CORBA::Any& event
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
 private:
   /// Use our own thread manager.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index 49022892370..5e7eccaa6ae 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -32,13 +32,13 @@ TAO_CEC_ProxyPullConsumer::~TAO_CEC_ProxyPullConsumer (void)
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CEC_ProxyPullConsumer::activate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullConsumer::activate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPullConsumer_var result;
   ACE_TRY
     {
-      result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -50,18 +50,18 @@ TAO_CEC_ProxyPullConsumer::activate (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_CEC_ProxyPullConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -82,7 +82,7 @@ TAO_CEC_ProxyPullConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 CORBA::Any*
 TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
     CORBA::Boolean_out has_event
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   has_event = 0;
   CosEventComm::PullSupplier_var supplier;
@@ -106,7 +106,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
   CORBA::Any_var any;
   ACE_TRY
     {
-      any = supplier->try_pull (has_event TAO_ENV_ARG_PARAMETER);
+      any = supplier->try_pull (has_event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
@@ -114,7 +114,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
       TAO_CEC_SupplierControl *control =
         this->event_channel_->supplier_control ();
 
-      control->supplier_not_exist (this TAO_ENV_ARG_PARAMETER);
+      control->supplier_not_exist (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -124,7 +124,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
 
       control->system_exception (this,
                                  sysex
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -137,7 +137,7 @@ TAO_CEC_ProxyPullConsumer::try_pull_from_supplier (
 
 CORBA::Any*
 TAO_CEC_ProxyPullConsumer::pull_from_supplier (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
 {
   CosEventComm::PullSupplier_var supplier;
   {
@@ -160,7 +160,7 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier (
   CORBA::Any_var any;
   ACE_TRY
     {
-      any = supplier->pull (TAO_ENV_SINGLE_ARG_PARAMETER);
+      any = supplier->pull (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -175,7 +175,7 @@ TAO_CEC_ProxyPullConsumer::pull_from_supplier (
 CORBA::Boolean
 TAO_CEC_ProxyPullConsumer::supplier_non_existent (
       CORBA::Boolean_out disconnected
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
@@ -191,14 +191,14 @@ TAO_CEC_ProxyPullConsumer::supplier_non_existent (
     }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return this->supplier_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->supplier_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 void
-TAO_CEC_ProxyPullConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosEventComm::PullSupplier_var supplier;
 
@@ -212,7 +212,7 @@ TAO_CEC_ProxyPullConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     supplier = this->supplier_._retn ();
   }
 
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (supplier.in ()))
@@ -220,7 +220,7 @@ TAO_CEC_ProxyPullConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      supplier->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -263,7 +263,7 @@ TAO_CEC_ProxyPullConsumer::_decr_refcnt (void)
 void
 TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
       CosEventComm::PullSupplier_ptr pull_supplier
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
@@ -298,7 +298,7 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
+          this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -311,12 +311,12 @@ TAO_CEC_ProxyPullConsumer::connect_pull_supplier (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PullSupplier_var supplier;
@@ -337,14 +337,14 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->event_channel_->disconnect_callbacks ())
     {
       ACE_TRY
         {
-          supplier->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+          supplier->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -357,19 +357,19 @@ TAO_CEC_ProxyPullConsumer::disconnect_pull_consumer (
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPullConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPullConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPullConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index 10c22bd458e..c02dc393684 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -53,10 +53,10 @@ public:
   virtual ~TAO_CEC_ProxyPullConsumer (void);
 
   /// Activate in the POA
-  virtual CosEventChannelAdmin::ProxyPullConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::ProxyPullConsumer_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return 0 if no supplier is connected...
@@ -68,8 +68,8 @@ public:
 
   /// Pulls from the supplier, verifies that it is connected.
   CORBA::Any* try_pull_from_supplier (CORBA::Boolean_out has_event
-                                      TAO_ENV_ARG_DECL);
-  CORBA::Any* pull_from_supplier (TAO_ENV_SINGLE_ARG_DECL);
+                                      ACE_ENV_ARG_DECL);
+  CORBA::Any* pull_from_supplier (ACE_ENV_SINGLE_ARG_DECL);
 
   /**
    * Invoke the _non_existent() pseudo-operation on the supplier. If
@@ -77,10 +77,10 @@ public:
    * <disconnected> flag.
    */
   CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
-                                        TAO_ENV_ARG_DECL);
+                                        ACE_ENV_ARG_DECL);
 
   /// The event channel is shutting down
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// Increment and decrement the reference count.
   CORBA::ULong _incr_refcnt (void);
@@ -89,16 +89,16 @@ public:
   // = The CosEventChannelAdmin::ProxyPullConsumer methods...
   virtual void connect_pull_supplier (
                 CosEventComm::PullSupplier_ptr pull_supplier
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
-  virtual void disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 protected:
   /// Set the supplier, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index 7f0c235a487..c9cf88c6059 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -31,13 +31,13 @@ TAO_CEC_ProxyPullSupplier::~TAO_CEC_ProxyPullSupplier (void)
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CEC_ProxyPullSupplier::activate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::activate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPullSupplier_var result;
   ACE_TRY
     {
-      result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -49,18 +49,18 @@ TAO_CEC_ProxyPullSupplier::activate (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_CEC_ProxyPullSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -74,7 +74,7 @@ TAO_CEC_ProxyPullSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_CEC_ProxyPullSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Save the consumer we where connected to, we need to send a
   // disconnect message to it.
@@ -90,7 +90,7 @@ TAO_CEC_ProxyPullSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     consumer = this->consumer_._retn ();
   }
 
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (consumer.in ()))
@@ -98,7 +98,7 @@ TAO_CEC_ProxyPullSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      consumer->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -112,7 +112,7 @@ TAO_CEC_ProxyPullSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 CORBA::Boolean
 TAO_CEC_ProxyPullSupplier::consumer_non_existent (
       CORBA::Boolean_out disconnected
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
@@ -132,7 +132,7 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent (
     }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return this->consumer_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->consumer_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
@@ -140,7 +140,7 @@ TAO_CEC_ProxyPullSupplier::consumer_non_existent (
 
 void
 TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (this->is_connected () == 0)
     return;
@@ -154,7 +154,7 @@ TAO_CEC_ProxyPullSupplier::push (const CORBA::Any &event
 }
 
 CORBA::Any *
-TAO_CEC_ProxyPullSupplier::pull (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPullSupplier::pull (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventComm::Disconnected))
 {
@@ -176,7 +176,7 @@ TAO_CEC_ProxyPullSupplier::pull (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Any *
 TAO_CEC_ProxyPullSupplier::try_pull (CORBA::Boolean_out has_event
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   has_event = 0;
@@ -232,7 +232,7 @@ TAO_CEC_ProxyPullSupplier::_decr_refcnt (void)
 void
 TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
       CosEventComm::PullConsumer_ptr pull_consumer
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
@@ -264,7 +264,7 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER);
+          this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
         return;
@@ -276,12 +276,12 @@ TAO_CEC_ProxyPullSupplier::connect_pull_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PullConsumer_var consumer;
@@ -302,7 +302,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
   }
 
   // Notify the event channel....
-  this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (consumer.in ()))
@@ -312,7 +312,7 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
     {
       ACE_TRY
         {
-          consumer->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+          consumer->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -327,19 +327,19 @@ TAO_CEC_ProxyPullSupplier::disconnect_pull_supplier (
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPullSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPullSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPullSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPullSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index a602d56a722..64627f44280 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -56,10 +56,10 @@ public:
   virtual ~TAO_CEC_ProxyPullSupplier (void);
 
   /// Activate in the POA
-  virtual CosEventChannelAdmin::ProxyPullSupplier_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::ProxyPullSupplier_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return 0 if no consumer is connected...
@@ -74,7 +74,7 @@ public:
   CosEventComm::PullConsumer_ptr consumer (void) const;
 
   /// The event channel is shutting down
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
   /**
    * Invoke the _non_existent() pseudo-operation on the consumer. If
@@ -82,24 +82,24 @@ public:
    * <disconnected> flag.
    */
   CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected
-                                        TAO_ENV_ARG_DECL);
+                                        ACE_ENV_ARG_DECL);
 
   /// Push an event into the queue.
   void push (const CORBA::Any &event
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
   // = The CosEventChannelAdmin::ProxyPullSupplier methods...
   virtual void connect_pull_consumer (
                 CosEventComm::PullConsumer_ptr pull_consumer
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
-  virtual CORBA::Any * pull (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Any * pull (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
   virtual CORBA::Any * try_pull (CORBA::Boolean_out has_event
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  virtual void disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Increment and decrement the reference count.
@@ -107,9 +107,9 @@ public:
   CORBA::ULong _decr_refcnt (void);
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
   /// Set the consumer, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index fde22699136..b76b417808e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -32,13 +32,13 @@ TAO_CEC_ProxyPushConsumer::~TAO_CEC_ProxyPushConsumer (void)
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CEC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushConsumer::activate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushConsumer_var result;
   ACE_TRY
     {
-      result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -50,18 +50,18 @@ TAO_CEC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_CEC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -77,7 +77,7 @@ TAO_CEC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 CORBA::Boolean
 TAO_CEC_ProxyPushConsumer::supplier_non_existent (
       CORBA::Boolean_out disconnected
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
@@ -97,14 +97,14 @@ TAO_CEC_ProxyPushConsumer::supplier_non_existent (
     }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return this->supplier_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->supplier_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 void
-TAO_CEC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosEventComm::PushSupplier_var supplier;
 
@@ -119,7 +119,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     this->connected_ = 0;
   }
 
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (supplier.in ()))
@@ -127,7 +127,7 @@ TAO_CEC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -171,7 +171,7 @@ TAO_CEC_ProxyPushConsumer::_decr_refcnt (void)
 void
 TAO_CEC_ProxyPushConsumer::connect_push_supplier (
       CosEventComm::PushSupplier_ptr push_supplier
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected))
 {
@@ -202,7 +202,7 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier (
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
+          this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -216,12 +216,12 @@ TAO_CEC_ProxyPushConsumer::connect_push_supplier (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_CEC_ProxyPushConsumer_Guard ace_mon (this->lock_,
@@ -232,13 +232,13 @@ TAO_CEC_ProxyPushConsumer::push (const CORBA::Any& event
     return;
 
   this->event_channel_->consumer_admin ()->push (event
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PushSupplier_var supplier;
@@ -259,7 +259,7 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (supplier.in ()))
@@ -269,7 +269,7 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
     {
       ACE_TRY
         {
-          supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+          supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -282,19 +282,19 @@ TAO_CEC_ProxyPushConsumer::disconnect_push_consumer (
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPushConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPushConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index 433c5f71dee..11f903f48ed 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -53,10 +53,10 @@ public:
   virtual ~TAO_CEC_ProxyPushConsumer (void);
 
   /// Activate in the POA
-  virtual CosEventChannelAdmin::ProxyPushConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::ProxyPushConsumer_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return 0 if no supplier is connected...
@@ -72,10 +72,10 @@ public:
    * <disconnected> flag.
    */
   CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
-                                        TAO_ENV_ARG_DECL);
+                                        ACE_ENV_ARG_DECL);
 
   /// The event channel is shutting down
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// Increment and decrement the reference count.
   CORBA::ULong _incr_refcnt (void);
@@ -84,19 +84,19 @@ public:
   // = The CosEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
                 CosEventComm::PushSupplier_ptr push_supplier
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
   virtual void push (const CORBA::Any& event
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 protected:
   /// Set the supplier, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index e6b129f6bb3..e96d67bf03e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -32,13 +32,13 @@ TAO_CEC_ProxyPushSupplier::~TAO_CEC_ProxyPushSupplier (void)
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CEC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::activate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushSupplier_var result;
   ACE_TRY
     {
-      result = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -50,18 +50,18 @@ TAO_CEC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_CEC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -75,7 +75,7 @@ TAO_CEC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_CEC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Save the consumer we where connected to, we need to send a
   // disconnect message to it.
@@ -91,7 +91,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     consumer = this->consumer_._retn ();
   }
 
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (consumer.in ()))
@@ -99,7 +99,7 @@ TAO_CEC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -114,7 +114,7 @@ typedef TAO_ESF_Proxy_RefCount_Guard<TAO_CEC_EventChannel,TAO_CEC_ProxyPushSuppl
 
 void
 TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -134,7 +134,7 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event
       ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock);
       this->event_channel_->dispatching ()->push (this,
                                                   event
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   }
@@ -142,7 +142,7 @@ TAO_CEC_ProxyPushSupplier::push (const CORBA::Any &event
 
 void
 TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -162,7 +162,7 @@ TAO_CEC_ProxyPushSupplier::push_nocopy (CORBA::Any &event
       ACE_GUARD (TAO_CEC_Unlock, ace_mon, reverse_lock);
       this->event_channel_->dispatching ()->push_nocopy (this,
                                                          event
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   }
@@ -200,7 +200,7 @@ TAO_CEC_ProxyPushSupplier::_decr_refcnt (void)
 void
 TAO_CEC_ProxyPushSupplier::connect_push_consumer (
       CosEventComm::PushConsumer_ptr push_consumer
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected,
                      CosEventChannelAdmin::TypeError))
@@ -236,7 +236,7 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
           // @@ CosEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER);
+          this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
         return;
@@ -247,12 +247,12 @@ TAO_CEC_ProxyPushSupplier::connect_push_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventComm::PushConsumer_var consumer;
@@ -273,14 +273,14 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
   }
 
   // Notify the event channel....
-  this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->event_channel_->disconnect_callbacks ())
     {
       ACE_TRY
         {
-          consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+          consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -296,7 +296,7 @@ TAO_CEC_ProxyPushSupplier::disconnect_push_supplier (
 
 void
 TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
 {
   CosEventComm::PushConsumer_var consumer;
   {
@@ -315,7 +315,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
 
   ACE_TRY
     {
-      consumer->push (event TAO_ENV_ARG_PARAMETER);
+      consumer->push (event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
@@ -323,7 +323,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
       TAO_CEC_ConsumerControl *control =
         this->event_channel_->consumer_control ();
 
-      control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER);
+      control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -333,7 +333,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
 
       control->system_exception (this,
                                  sysex
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -346,7 +346,7 @@ TAO_CEC_ProxyPushSupplier::push_to_consumer (const CORBA::Any& event
 void
 TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
     const CORBA::Any& event
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   CosEventComm::PushConsumer_var consumer;
   {
@@ -360,7 +360,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
 
   ACE_TRY
     {
-      consumer->push (event TAO_ENV_ARG_PARAMETER);
+      consumer->push (event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
@@ -368,7 +368,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
       TAO_CEC_ConsumerControl *control =
         this->event_channel_->consumer_control ();
 
-      control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER);
+      control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -378,7 +378,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
 
       control->system_exception (this,
                                  sysex
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -391,7 +391,7 @@ TAO_CEC_ProxyPushSupplier::reactive_push_to_consumer (
 CORBA::Boolean
 TAO_CEC_ProxyPushSupplier::consumer_non_existent (
       CORBA::Boolean_out disconnected
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
@@ -407,26 +407,26 @@ TAO_CEC_ProxyPushSupplier::consumer_non_existent (
     }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return this->consumer_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->consumer_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
 PortableServer::POA_ptr
-TAO_CEC_ProxyPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_CEC_ProxyPushSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_CEC_ProxyPushSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index a3bcddab675..c83f3ac5679 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -54,10 +54,10 @@ public:
   virtual ~TAO_CEC_ProxyPushSupplier (void);
 
   /// Activate in the POA
-  virtual CosEventChannelAdmin::ProxyPushSupplier_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual CosEventChannelAdmin::ProxyPushSupplier_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return 0 if no consumer is connected...
@@ -72,19 +72,19 @@ public:
   CosEventComm::PushConsumer_ptr consumer (void) const;
 
   /// The event channel is shutting down
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Internal methods to push an event to each consumer.
   virtual void push (const CORBA::Any &event
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (CORBA::Any &event
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
   /// Pushes to the consumer, verifies that it is connected.
   void push_to_consumer (const CORBA::Any &event
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   void reactive_push_to_consumer (const CORBA::Any &event
-                                  TAO_ENV_ARG_DECL);
+                                  ACE_ENV_ARG_DECL);
 
   /**
    * Invoke the _non_existent() pseudo-operation on the consumer. If
@@ -92,16 +92,16 @@ public:
    * <disconnected> flag.
    */
   CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected
-                                        TAO_ENV_ARG_DECL);
+                                        ACE_ENV_ARG_DECL);
 
   // = The CosEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 CosEventComm::PushConsumer_ptr push_consumer
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected,
                        CosEventChannelAdmin::TypeError));
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Increment and decrement the reference count.
@@ -109,9 +109,9 @@ public:
   CORBA::ULong _decr_refcnt (void);
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
   /// Set the consumer, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
index 1b49e6ccb4c..17a9b861a61 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
@@ -51,11 +51,11 @@ public:
 #if 0
   /// Some strategies may want to keep track of connected consumers.
   virtual void connected (TAO_CEC_ProxyPullConsumer *
-                          TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                          ACE_ENV_ARG_DECL_NOT_USED) = 0;
   virtual void reconnected (TAO_CEC_ProxyPullConsumer *
-                            TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                            ACE_ENV_ARG_DECL_NOT_USED) = 0;
   virtual void diconnected (TAO_CEC_ProxyPullConsumer *
-                            TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                            ACE_ENV_ARG_DECL_NOT_USED) = 0;
 #endif /* 0 */
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index 538bda35e5f..e69cc13e61d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -34,16 +34,16 @@ TAO_CEC_Reactive_ConsumerControl::~TAO_CEC_Reactive_ConsumerControl (void)
 
 void
 TAO_CEC_Reactive_ConsumerControl::query_consumers (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_CEC_Ping_Push_Consumer push_worker (this);
   this->event_channel_->consumer_admin ()->for_each (&push_worker
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_CEC_Ping_Pull_Consumer pull_worker (this);
   this->event_channel_->consumer_admin ()->for_each (&pull_worker
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -59,26 +59,26 @@ TAO_CEC_Reactive_ConsumerControl::handle_timeout (
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
         this->policy_current_->get_policy_overrides (types
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
                                                    CORBA::ADD_OVERRIDE
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Query the state of the consumers...
-      this->query_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
                                                    CORBA::SET_OVERRIDE
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -105,12 +105,12 @@ TAO_CEC_Reactive_ConsumerControl::activate (void)
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
         this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_ =
         CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Pre-compute the policy list to the set the right timeout
@@ -125,7 +125,7 @@ TAO_CEC_Reactive_ConsumerControl::activate (void)
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                any
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -148,11 +148,11 @@ TAO_CEC_Reactive_ConsumerControl::shutdown (void)
 void
 TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
       TAO_CEC_ProxyPushSupplier *proxy
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -167,11 +167,11 @@ TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
 void
 TAO_CEC_Reactive_ConsumerControl::consumer_not_exist (
       TAO_CEC_ProxyPullSupplier *proxy
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      proxy->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -187,7 +187,7 @@ void
 TAO_CEC_Reactive_ConsumerControl::system_exception (
       TAO_CEC_ProxyPushSupplier *proxy,
       CORBA::SystemException & /* exception */
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -201,7 +201,7 @@ TAO_CEC_Reactive_ConsumerControl::system_exception (
       //   return;
 
       // Anything else is serious, including timeouts...
-      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -232,24 +232,24 @@ TAO_CEC_ConsumerControl_Adapter::handle_timeout (
 
 void
 TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
         supplier->consumer_non_existent (disconnected
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (non_existent && !disconnected)
         {
-          this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
+          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
+      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
@@ -263,7 +263,7 @@ TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier
       //     && exception->minor () == 0x54410085)
       //   return;
 
-      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
+      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -277,24 +277,24 @@ TAO_CEC_Ping_Push_Consumer::work (TAO_CEC_ProxyPushSupplier *supplier
 
 void
 TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
         supplier->consumer_non_existent (disconnected
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (non_existent && !disconnected)
         {
-          this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
+          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
+      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
@@ -308,7 +308,7 @@ TAO_CEC_Ping_Pull_Consumer::work (TAO_CEC_ProxyPullSupplier *supplier
       //     && exception->minor () == 0x54410085)
       //   return;
 
-      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
+      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index c6ab0973fdd..6020bc61659 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -86,17 +86,17 @@ public:
   virtual int activate (void);
   virtual int shutdown (void);
   virtual void consumer_not_exist (TAO_CEC_ProxyPushSupplier *proxy
-                                   TAO_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL_NOT_USED);
   virtual void consumer_not_exist (TAO_CEC_ProxyPullSupplier *proxy
-                                   TAO_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL_NOT_USED);
   virtual void system_exception (TAO_CEC_ProxyPushSupplier *proxy,
                                  CORBA::SystemException &
-                                 TAO_ENV_ARG_DECL_NOT_USED);
+                                 ACE_ENV_ARG_DECL_NOT_USED);
 
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_consumers (TAO_ENV_SINGLE_ARG_DECL);
+  void query_consumers (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The polling rate
@@ -129,7 +129,7 @@ public:
   TAO_CEC_Ping_Push_Consumer (TAO_CEC_ConsumerControl *control);
 
   virtual void work (TAO_CEC_ProxyPushSupplier *supplier
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 private:
   TAO_CEC_ConsumerControl *control_;
@@ -143,7 +143,7 @@ public:
   TAO_CEC_Ping_Pull_Consumer (TAO_CEC_ConsumerControl *control);
 
   virtual void work (TAO_CEC_ProxyPullSupplier *supplier
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 private:
   TAO_CEC_ConsumerControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index 2270576d96a..fd272fcf314 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -42,29 +42,29 @@ TAO_CEC_Reactive_Pulling_Strategy::handle_timeout (
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
         this->policy_current_->get_policy_overrides (types
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
                                                    CORBA::ADD_OVERRIDE
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_CEC_Pull_Event worker (this->event_channel_->consumer_admin (),
                                  this->event_channel_->supplier_control ());
 
       this->event_channel_->supplier_admin ()->for_each (&worker
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
                                                    CORBA::SET_OVERRIDE
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -91,12 +91,12 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void)
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
         this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_ =
         CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Pre-compute the policy list to the set the right timeout
@@ -111,7 +111,7 @@ TAO_CEC_Reactive_Pulling_Strategy::activate (void)
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                any
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -149,7 +149,7 @@ TAO_CEC_Pulling_Strategy_Adapter::handle_timeout (
 
 void
 TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean has_event = 0;
   CORBA::Any_var any;
@@ -157,7 +157,7 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer
   ACE_TRY
     {
       any = consumer->try_pull_from_supplier (has_event
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -169,7 +169,7 @@ TAO_CEC_Pull_Event::work (TAO_CEC_ProxyPullConsumer *consumer
 
   if (has_event)
     {
-      this->consumer_admin_->push (any.in () TAO_ENV_ARG_PARAMETER);
+      this->consumer_admin_->push (any.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index e72af9018fd..77cdcb69b4e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -112,7 +112,7 @@ public:
                       TAO_CEC_SupplierControl *control);
 
   virtual void work (TAO_CEC_ProxyPullConsumer *consumer
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 private:
   /// Used to propagate the events.
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index 75651b761dc..c7a9465d8d9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -35,16 +35,16 @@ TAO_CEC_Reactive_SupplierControl::~TAO_CEC_Reactive_SupplierControl (void)
 
 void
 TAO_CEC_Reactive_SupplierControl::query_suppliers (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_CEC_Ping_Push_Supplier push_worker (this);
   this->event_channel_->supplier_admin ()->for_each (&push_worker
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_CEC_Ping_Pull_Supplier pull_worker (this);
   this->event_channel_->supplier_admin ()->for_each (&pull_worker
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -60,26 +60,26 @@ TAO_CEC_Reactive_SupplierControl::handle_timeout (
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
         this->policy_current_->get_policy_overrides (types
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
                                                    CORBA::ADD_OVERRIDE
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Query the state of the suppliers...
-      this->query_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
                                                    CORBA::SET_OVERRIDE
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -106,12 +106,12 @@ TAO_CEC_Reactive_SupplierControl::activate (void)
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
         this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_ =
         CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Pre-compute the policy list to the set the right timeout
@@ -126,7 +126,7 @@ TAO_CEC_Reactive_SupplierControl::activate (void)
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                any
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -149,11 +149,11 @@ TAO_CEC_Reactive_SupplierControl::shutdown (void)
 void
 TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
       TAO_CEC_ProxyPushConsumer *proxy
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -166,11 +166,11 @@ TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
 void
 TAO_CEC_Reactive_SupplierControl::supplier_not_exist (
       TAO_CEC_ProxyPullConsumer *proxy
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      proxy->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -184,7 +184,7 @@ void
 TAO_CEC_Reactive_SupplierControl::system_exception (
       TAO_CEC_ProxyPullConsumer *proxy,
       CORBA::SystemException & /* exception */
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -198,7 +198,7 @@ TAO_CEC_Reactive_SupplierControl::system_exception (
       //   return;
 
       // Anything else is serious, including timeouts...
-      proxy->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -229,24 +229,24 @@ TAO_CEC_SupplierControl_Adapter::handle_timeout (
 
 void
 TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
         consumer->supplier_non_existent (disconnected
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
+          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
+      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
@@ -261,7 +261,7 @@ TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer
       //   return;
 
       // Anything else is serious, including timeouts...
-      this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
+      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -275,24 +275,24 @@ TAO_CEC_Ping_Push_Supplier::work (TAO_CEC_ProxyPushConsumer *consumer
 
 void
 TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
         consumer->supplier_non_existent (disconnected
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
+          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
+      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
@@ -307,7 +307,7 @@ TAO_CEC_Ping_Pull_Supplier::work (TAO_CEC_ProxyPullConsumer *consumer
       //   return;
 
       // Anything else is serious, including timeouts...
-      this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
+      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index 278d23130d8..f0a4ba4eba9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -86,17 +86,17 @@ public:
   virtual int activate (void);
   virtual int shutdown (void);
   virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy
-                                   TAO_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL_NOT_USED);
   virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy
-                                   TAO_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL_NOT_USED);
   virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy,
                                  CORBA::SystemException &
-                                 TAO_ENV_ARG_DECL_NOT_USED);
+                                 ACE_ENV_ARG_DECL_NOT_USED);
 
 private:
   /// Check if the suppliers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+  void query_suppliers (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The polling rate
@@ -129,7 +129,7 @@ public:
   TAO_CEC_Ping_Push_Supplier (TAO_CEC_SupplierControl *control);
 
   virtual void work (TAO_CEC_ProxyPushConsumer *consumer
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 private:
   TAO_CEC_SupplierControl *control_;
@@ -143,7 +143,7 @@ public:
   TAO_CEC_Ping_Pull_Supplier (TAO_CEC_SupplierControl *control);
 
   virtual void work (TAO_CEC_ProxyPullConsumer *consumer
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 private:
   TAO_CEC_SupplierControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index 7ec53139c38..fb7b6ba79aa 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -32,75 +32,75 @@ TAO_CEC_SupplierAdmin::~TAO_CEC_SupplierAdmin (void)
 }
 
 PortableServer::POA_ptr
-TAO_CEC_SupplierAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_CEC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
 TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPushConsumer *consumer
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
-  this->push_admin_.connected (consumer TAO_ENV_ARG_PARAMETER);
+  this->push_admin_.connected (consumer ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPushConsumer *consumer
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  this->push_admin_.reconnected (consumer TAO_ENV_ARG_PARAMETER);
+  this->push_admin_.reconnected (consumer ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPushConsumer *consumer
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
-  this->push_admin_.disconnected (consumer TAO_ENV_ARG_PARAMETER);
+  this->push_admin_.disconnected (consumer ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_SupplierAdmin::connected (TAO_CEC_ProxyPullConsumer *consumer
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
-  this->pull_admin_.connected (consumer TAO_ENV_ARG_PARAMETER);
+  this->pull_admin_.connected (consumer ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_SupplierAdmin::reconnected (TAO_CEC_ProxyPullConsumer *consumer
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  this->pull_admin_.reconnected (consumer TAO_ENV_ARG_PARAMETER);
+  this->pull_admin_.reconnected (consumer ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_CEC_SupplierAdmin::disconnected (TAO_CEC_ProxyPullConsumer *consumer
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
-  this->pull_admin_.disconnected (consumer TAO_ENV_ARG_PARAMETER);
+  this->pull_admin_.disconnected (consumer ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_SupplierAdmin::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_SupplierAdmin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->push_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->push_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->pull_admin_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->pull_admin_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CEC_SupplierAdmin::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->push_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->push_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CEC_SupplierAdmin::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL)
+TAO_CEC_SupplierAdmin::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->pull_admin_.obtain (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->pull_admin_.obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index 5dbc4252c95..c9a06913059 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -58,40 +58,40 @@ public:
 
   /// For each elements call <worker->work()>.
   void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
 
   /// For each elements call <worker->work()>.
   void for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
 
   /// Keep track of connected consumers.
   virtual void connected (TAO_CEC_ProxyPushConsumer*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void reconnected (TAO_CEC_ProxyPushConsumer*
-                            TAO_ENV_ARG_DECL_NOT_USED);
+                            ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_CEC_ProxyPushConsumer*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
   virtual void connected (TAO_CEC_ProxyPullConsumer*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void reconnected (TAO_CEC_ProxyPullConsumer*
-                            TAO_ENV_ARG_DECL_NOT_USED);
+                            ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_CEC_ProxyPullConsumer*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
 
   /// The event channel is shutting down, inform all the consumers of
   /// this
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   // = The CosEventChannelAdmin::SupplierAdmin methods...
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
           ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-      obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The Event Channel we belong to
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
index 43b2cfbab3d..dc20a41a684 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
@@ -3,15 +3,15 @@
 ACE_INLINE void
 TAO_CEC_SupplierAdmin::
     for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
-  this->push_admin_.for_each (worker TAO_ENV_ARG_PARAMETER);
+  this->push_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_CEC_SupplierAdmin::
     for_each (TAO_ESF_Worker<TAO_CEC_ProxyPullConsumer> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
-  this->pull_admin_.for_each (worker TAO_ENV_ARG_PARAMETER);
+  this->pull_admin_.for_each (worker ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
index c0856651a75..c87f08c65aa 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
@@ -30,20 +30,20 @@ TAO_CEC_SupplierControl::shutdown (void)
 
 void
 TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPushConsumer *
-                                             TAO_ENV_ARG_DECL_NOT_USED)
+                                             ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_CEC_SupplierControl::supplier_not_exist (TAO_CEC_ProxyPullConsumer *
-                                             TAO_ENV_ARG_DECL_NOT_USED)
+                                             ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_CEC_SupplierControl::system_exception (TAO_CEC_ProxyPullConsumer *,
                                            CORBA::SystemException &
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index 6e92fbcda70..5374a09b73d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -63,7 +63,7 @@ public:
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
   virtual void supplier_not_exist (TAO_CEC_ProxyPushConsumer *proxy
-                                   TAO_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL_NOT_USED);
 
   /**
    * Invoked by helper classes when they detect that a supplier does
@@ -71,12 +71,12 @@ public:
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
   virtual void supplier_not_exist (TAO_CEC_ProxyPullConsumer *proxy
-                                   TAO_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Some system exception was rasied while trying to push an event.
   virtual void system_exception (TAO_CEC_ProxyPullConsumer *proxy,
                                  CORBA::SystemException &
-                                 TAO_ENV_ARG_DECL_NOT_USED);
+                                 ACE_ENV_ARG_DECL_NOT_USED);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
index 011fe07d0ea..44b02a11e47 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp
@@ -29,7 +29,7 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     for_each (TAO_ESF_Worker<PROXY> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   // @@ Use an allocator for this memory...
   PROXY **proxies = 0;
@@ -58,7 +58,7 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 
       for (PROXY **j = proxies; j != proxies + size; ++j)
         {
-          worker->work (*j TAO_ENV_ARG_PARAMETER);
+          worker->work (*j ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           (*j)->_decr_refcnt ();
         }
@@ -81,42 +81,42 @@ TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     connected (PROXY *proxy
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     reconnected (PROXY *proxy
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     disconnected (PROXY *proxy
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    shutdown (TAO_ENV_SINGLE_ARG_DECL)
+    shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #endif /* TAO_ESF_COPY_ON_READ_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
index 5f1b3e1e100..98578fe4fb5 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -41,14 +41,14 @@ public:
 
   // = The TAO_ESF_Proxy_Collection methods
   virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   virtual void connected (PROXY *proxy
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (PROXY *proxy
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (PROXY *proxy
-                             TAO_ENV_ARG_DECL);
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index 1ecba5d20e3..160bd3cabc4 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -66,7 +66,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
     for_each (TAO_ESF_Worker<PROXY> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   Read_Guard ace_mon (this->mutex_,
                       this->collection_);
@@ -74,7 +74,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
   ITERATOR end = ace_mon.collection->collection.end ();
   for (ITERATOR i = ace_mon.collection->collection.begin (); i != end; ++i)
     {
-      worker->work (*i TAO_ENV_ARG_PARAMETER);
+      worker->work (*i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -82,7 +82,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
     connected (PROXY *proxy
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -91,13 +91,13 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->collection_);
 
   proxy->_incr_refcnt ();
-  ace_mon.copy->collection.connected (proxy TAO_ENV_ARG_PARAMETER);
+  ace_mon.copy->collection.connected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
     reconnected (PROXY *proxy
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -106,13 +106,13 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->collection_);
 
   proxy->_incr_refcnt ();
-  ace_mon.copy->collection.reconnected (proxy TAO_ENV_ARG_PARAMETER);
+  ace_mon.copy->collection.reconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
     disconnected (PROXY *proxy
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   Write_Guard ace_mon (this->mutex_,
                        this->cond_,
@@ -120,12 +120,12 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->writing_,
                        this->collection_);
 
-  ace_mon.copy->collection.disconnected (proxy TAO_ENV_ARG_PARAMETER);
+  ace_mon.copy->collection.disconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
-    shutdown (TAO_ENV_SINGLE_ARG_DECL)
+    shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // We need to perform a copy to follow the protocol.
   Write_Guard ace_mon (this->mutex_,
@@ -134,7 +134,7 @@ TAO_ESF_Copy_On_Write<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
                        this->writing_,
                        this->collection_);
 
-  ace_mon.copy->collection.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ace_mon.copy->collection.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template<class COLLECTION, class ITERATOR, ACE_SYNCH_DECL>
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
index 8e646428cb0..52f2303f730 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -126,14 +126,14 @@ public:
 
   // = The TAO_ESF_Proxy methods
   virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   virtual void connected (PROXY *proxy
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (PROXY *proxy
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (PROXY *proxy
-                             TAO_ENV_ARG_DECL);
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   typedef TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR> Collection;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index 564e6d08805..3344bc33cab 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -46,14 +46,14 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 template<class PROXY, class COLLECTION, class ITERATOR, ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
     for_each (TAO_ESF_Worker<PROXY> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (Busy_Lock, ace_mon, this->lock_);
 
   ITERATOR end = this->collection_.end ();
   for (ITERATOR i = this->collection_.begin (); i != end; ++i)
     {
-      worker->work (*i TAO_ENV_ARG_PARAMETER);
+      worker->work (*i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
   }
@@ -108,7 +108,7 @@ TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>::
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     connected (PROXY *proxy
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -118,7 +118,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can add the object immediately
-      this->connected_i (proxy TAO_ENV_ARG_PARAMETER);
+      this->connected_i (proxy ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -135,7 +135,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     reconnected (PROXY *proxy
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -145,7 +145,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can reconnect the object immediately
-      this->reconnected_i (proxy TAO_ENV_ARG_PARAMETER);
+      this->reconnected_i (proxy ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -162,7 +162,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     disconnected (PROXY *proxy
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -171,7 +171,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can remove the object immediately
-      this->disconnected_i (proxy TAO_ENV_ARG_PARAMETER);
+      this->disconnected_i (proxy ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -187,7 +187,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    shutdown (TAO_ENV_SINGLE_ARG_DECL)
+    shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->busy_lock_,
       CORBA::INTERNAL ());
@@ -196,7 +196,7 @@ TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
   if (this->busy_count_ == 0)
     {
       // We can shutdown the object immediately
-      this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
index 7c28ba64540..175066320f3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
@@ -93,12 +93,12 @@ public:
   int execute_delayed_operations (void);
 
   void connected_i (PROXY *proxy
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   void reconnected_i (PROXY *proxy
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   void disconnected_i (PROXY *proxy
-                     TAO_ENV_ARG_DECL);
-  void shutdown_i (TAO_ENV_SINGLE_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
+  void shutdown_i (ACE_ENV_SINGLE_ARG_DECL);
 
   typedef TAO_ESF_Connected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Connected_Command;
   typedef TAO_ESF_Reconnected_Command<TAO_ESF_Delayed_Changes<PROXY,COLLECTION,ITERATOR,ACE_SYNCH_USE>,PROXY> Reconnected_Command;
@@ -107,14 +107,14 @@ public:
 
   // = The TAO_ESF_Proxy methods
   virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   virtual void connected (PROXY *proxy
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (PROXY *proxy
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (PROXY *proxy
-                             TAO_ENV_ARG_DECL);
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
index 964625575f9..7ba390a202f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
@@ -3,30 +3,30 @@
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     connected_i (PROXY *proxy
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
-  this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     reconnected_i (PROXY *proxy
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
-  this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
     disconnected_i (PROXY *proxy
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
-  this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class C, class I,ACE_SYNCH_DECL> void
 TAO_ESF_Delayed_Changes<PROXY,C,I,ACE_SYNCH_USE>::
-    shutdown_i (TAO_ENV_SINGLE_ARG_DECL)
+    shutdown_i (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
index 89fa3596658..631c41190c6 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -18,16 +18,16 @@ TAO_ESF_Connected_Command<Target,Object>::execute (void* arg)
 {
   if (arg != 0)
     {
-      TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
+      ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                             *ACE_static_cast(CORBA::Environment*, arg));
       this->target_->connected_i (this->object_
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
     }
   else
     {
-      TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV);
+      ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
       this->target_->connected_i (this->object_
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
     }
 
   return 0;
@@ -40,16 +40,16 @@ TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg)
 {
   if (arg != 0)
     {
-      TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
+      ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                              *ACE_static_cast(CORBA::Environment*, arg));
       this->target_->reconnected_i (this->object_
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     }
   else
     {
-      TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV);
+      ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
       this->target_->reconnected_i (this->object_
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     }
   return 0;
 }
@@ -61,16 +61,16 @@ TAO_ESF_Disconnected_Command<Target,Object>::execute (void* arg)
 {
   if (arg != 0)
     {
-      TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
+      ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                              *ACE_static_cast(CORBA::Environment*, arg));
       this->target_->disconnected_i (this->object_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
     }
   else
     {
-      TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV);
+      ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
       this->target_->disconnected_i (this->object_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
     }
   return 0;
 }
@@ -82,14 +82,14 @@ TAO_ESF_Shutdown_Command<Target>::execute (void* arg)
 {
   if (arg != 0)
     {
-      TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
+      ACE_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
                              *ACE_static_cast(CORBA::Environment*, arg));
-      this->target_->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
-      TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV);
-      this->target_->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ACE_ENV_EMIT_CODE (ACE_DECLARE_NEW_CORBA_ENV);
+      this->target_->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
index 2fc47be1f6c..28d63858848 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
@@ -31,14 +31,14 @@ TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
 template<class PROXY, class C, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,C,ITERATOR,ACE_LOCK>::
     for_each (TAO_ESF_Worker<PROXY> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   ITERATOR end = this->collection_.end ();
   for (ITERATOR i = this->collection_.begin (); i != end; ++i)
     {
-      worker->work ((*i) TAO_ENV_ARG_PARAMETER);
+      worker->work ((*i) ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
index db5b6b2563a..8d08c77b968 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
@@ -33,14 +33,14 @@ public:
 
   // = The TAO_ESF_Proxy methods
   virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   virtual void connected (PROXY *proxy
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (PROXY *proxy
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (PROXY *proxy
-                             TAO_ENV_ARG_DECL);
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   COLLECTION collection_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
index 21bf4981b67..d90394ed395 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
@@ -3,40 +3,40 @@
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     connected (PROXY *proxy
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.connected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.connected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     reconnected (PROXY *proxy
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
   proxy->_incr_refcnt ();
-  this->collection_.reconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.reconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
     disconnected (PROXY *proxy
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.disconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_.disconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void
 TAO_ESF_Immediate_Changes<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
-    shutdown (TAO_ENV_SINGLE_ARG_DECL)
+    shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (ACE_LOCK, ace_mon, this->lock_);
 
-  this->collection_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
index 21123fd2cd9..c514674fda3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.cpp
@@ -29,34 +29,34 @@ TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
     peer_connected (PEER *peer
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Connected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker TAO_ENV_ARG_PARAMETER);
+  this->for_each (&worker ACE_ENV_ARG_PARAMETER);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
     peer_reconnected (PEER *peer
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Reconnected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker TAO_ENV_ARG_PARAMETER);
+  this->for_each (&worker ACE_ENV_ARG_PARAMETER);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER> void
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
     peer_disconnected (PEER *peer
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Peer_Disconnected<PROXY,PEER> worker (peer);
 
-  this->for_each (&worker TAO_ENV_ARG_PARAMETER);
+  this->for_each (&worker ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_ESF_PEER_ADMIN_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
index 256e342e17a..646fab48906 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -38,17 +38,17 @@
  * the PROXY interface must implement:
  *
  * @verbatim
- * void connected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw ();
- * void reconnected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw ();
- * void disconnected (PEER *peer TAO_ENV_ARG_DECL_NOT_USED) throw ();
+ * void connected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw ();
+ * void reconnected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw ();
+ * void disconnected (PEER *peer ACE_ENV_ARG_DECL_NOT_USED) throw ();
  * @endverbatim
  *
  * Similarly, the PEER interface must implement:
  *
  * @verbatim
- * void connected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw ();
- * void reconnected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw ();
- * void disconnected (PROXY *proxy TAO_ENV_ARG_DECL_NOT_USED) throw ();
+ * void connected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw ();
+ * void reconnected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw ();
+ * void disconnected (PROXY *proxy ACE_ENV_ARG_DECL_NOT_USED) throw ();
  * @endverbatim
  */
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER>
@@ -67,7 +67,7 @@ public:
    * The default implementation is a no-op.
    */
   virtual void peer_connected (PEER *peer
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -77,7 +77,7 @@ public:
    * <reconnected> method
    */
   virtual void peer_reconnected (PEER *peer
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -86,7 +86,7 @@ public:
    * proxy.
    */
   virtual void peer_disconnected (PEER *peer
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
index 81f2ea5d27a..ad0678ae0a7 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
@@ -13,12 +13,12 @@ ACE_RCSID(ESF, ESF_Peer_Workers, "$Id$")
 
 template<class P, class R> void
 TAO_ESF_Peer_Connected<P,R>::work (P *proxy
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
-  proxy->connected (this->peer_ TAO_ENV_ARG_PARAMETER);
+  proxy->connected (this->peer_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 
-  this->peer_->connected (proxy TAO_ENV_ARG_PARAMETER);
+  this->peer_->connected (proxy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 }
 
@@ -26,12 +26,12 @@ TAO_ESF_Peer_Connected<P,R>::work (P *proxy
 
 template<class P, class R> void
 TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
-  proxy->reconnected (this->peer_ TAO_ENV_ARG_PARAMETER);
+  proxy->reconnected (this->peer_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 
-  this->peer_->reconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->peer_->reconnected (proxy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 }
 
@@ -39,12 +39,12 @@ TAO_ESF_Peer_Reconnected<P,R>::work (P *proxy
 
 template<class P, class R> void
 TAO_ESF_Peer_Disconnected<P,R>::work (P *proxy
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
-  proxy->disconnected (this->peer_ TAO_ENV_ARG_PARAMETER);
+  proxy->disconnected (this->peer_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 
-  this->peer_->disconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->peer_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Shouldn't happen, just following the discipline
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
index e69984da721..9998a29d19f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
@@ -33,7 +33,7 @@ public:
   TAO_ESF_Peer_Connected (PEER *peer);
 
   void work (PROXY *proxy
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
 private:
   PEER* peer_;
@@ -56,7 +56,7 @@ public:
   TAO_ESF_Peer_Reconnected (PEER *peer);
 
   void work (PROXY *proxy
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
 private:
   PEER* peer_;
@@ -79,7 +79,7 @@ public:
   TAO_ESF_Peer_Disconnected (PEER *peer);
 
   void work (PROXY *proxy
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
 private:
   PEER* peer_;
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index 062b06869aa..a4bbb416902 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -30,7 +30,7 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> INTERFACE*
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    obtain (TAO_ENV_SINGLE_ARG_DECL)
+    obtain (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PROXY* proxy;
@@ -39,10 +39,10 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
   PortableServer::ServantBase_var holder = proxy;
 
   ACE_TYPENAME PROXY::_var_type result =
-    proxy->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+    proxy->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (INTERFACE::_nil ());
 
-  this->collection_->connected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_->connected (proxy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (INTERFACE::_nil ());
 
   return result._retn ();
@@ -50,21 +50,21 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
-    shutdown (TAO_ENV_SINGLE_ARG_DECL)
+    shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ESF_Shutdown_Proxy<PROXY> worker;
 
-  this->collection_->for_each (&worker TAO_ENV_ARG_PARAMETER);
+  this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER);
   ACE_CHECK; // Cannot happen, just following the discipline.
 
-  this->collection_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
     connected (PROXY *
-               TAO_ENV_ARG_DECL_NOT_USED)
+               ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -72,24 +72,24 @@ TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
     reconnected (PROXY *proxy
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->collection_->reconnected (proxy TAO_ENV_ARG_PARAMETER);
+  this->collection_->reconnected (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE> void
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
     disconnected (PROXY *proxy
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  proxy->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  proxy->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK; // Cannot happen, just following the discipline.
 
   ACE_TRY
     {
-      this->collection_->disconnected (proxy TAO_ENV_ARG_PARAMETER);
+      this->collection_->disconnected (proxy ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
index a76275f083b..dfe39ce311e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -53,7 +53,7 @@
  * // The T_var for the IDL interface implemented by the PROXY.
  *
  * PROXY::_ptr_type
- * PROXY::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) throw ();
+ * PROXY::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) throw ();
  * // activate the proxy and return the object reference
  * @endverbatim
  *
@@ -70,7 +70,7 @@ public:
 
   /// Iterate over its internal collection.
   void for_each (TAO_ESF_Worker<PROXY> *worker
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // @TODO We should use INTERFACE::_ptr_type or PROXY::_ptr_type, but
@@ -80,7 +80,7 @@ public:
   // code is supposed to run under TAO only.
   /// Create a new PROXY and activate it.
   virtual INTERFACE*
-      obtain (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -88,7 +88,7 @@ public:
    * down. Invoke <shutdown> on all the proxies, cleanup the
    * collection and prepare to terminate.
    */
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -97,7 +97,7 @@ public:
    * The default implementation is a no-op.
    */
   virtual void connected (PROXY *proxy
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -107,7 +107,7 @@ public:
    * <reconnected> method
    */
   virtual void reconnected (PROXY *proxy
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -116,7 +116,7 @@ public:
    * proxy.
    */
   virtual void disconnected (PROXY *proxy
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
index be00cdad82e..9eec0894754 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
@@ -3,8 +3,8 @@
 template<class EC,class P,class I> ACE_INLINE void
 TAO_ESF_Proxy_Admin<EC,P,I>::
     for_each (TAO_ESF_Worker<P> *worker
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->collection_->for_each (worker TAO_ENV_ARG_PARAMETER);
+  this->collection_->for_each (worker ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
index b04cbe9f3b7..0337ec87245 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -129,12 +129,12 @@ public:
    * This encapsulates
    */
   virtual void for_each (TAO_ESF_Worker<PROXY> *worker
-                         TAO_ENV_ARG_DECL) = 0;
+                         ACE_ENV_ARG_DECL) = 0;
 
   /// Insert a new element into the collection.  The collection assumes
   /// ownership of the element.
   virtual void connected (PROXY *proxy
-                          TAO_ENV_ARG_DECL) = 0;
+                          ACE_ENV_ARG_DECL) = 0;
 
   /**
    * Insert an element into the collection.  No errors can be raised
@@ -144,14 +144,14 @@ public:
    * collection.
    */
   virtual void reconnected (PROXY *proxy
-                            TAO_ENV_ARG_DECL) = 0;
+                            ACE_ENV_ARG_DECL) = 0;
 
   /// Remove an element from the collection.
   virtual void disconnected (PROXY *proxy
-                             TAO_ENV_ARG_DECL) = 0;
+                             ACE_ENV_ARG_DECL) = 0;
 
   /// The EC is shutting down, must release all the elements.
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0;
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
index e871ce15a7d..04702e9feed 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -19,7 +19,7 @@ TAO_ESF_Proxy_List<PROXY>::
 
 template<class PROXY> void
 TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.insert (proxy);
   if (r == 0)
@@ -40,7 +40,7 @@ TAO_ESF_Proxy_List<PROXY>::connected (PROXY *proxy
 
 template<class PROXY> void
 TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.insert (proxy);
   if (r == 0)
@@ -65,7 +65,7 @@ TAO_ESF_Proxy_List<PROXY>::reconnected (PROXY *proxy
 
 template<class PROXY> void
 TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy
-                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.remove (proxy);
   if (r != 0)
@@ -78,7 +78,7 @@ TAO_ESF_Proxy_List<PROXY>::disconnected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_List<PROXY>::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_List<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   Iterator end = this->impl_.end ();
   for (Iterator i = this->impl_.begin (); i != end; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
index 85d6d3f9914..4a2410b1a70 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -50,19 +50,19 @@ public:
 
   /// Insert a new element to the collection
   void connected (PROXY *
-                  TAO_ENV_ARG_DECL_NOT_USED);
+                  ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Insert a new element that could be there already.
   void reconnected (PROXY *
-                    TAO_ENV_ARG_DECL_NOT_USED);
+                    ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Remove an element from the collection
   void disconnected (PROXY *
-                     TAO_ENV_ARG_DECL_NOT_USED);
+                     ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   /// The underlying implementation object
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
index 002cc934635..9e6993882d8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -19,7 +19,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::
 
 template<class PROXY> void
 TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy
-                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.bind (proxy, 1);
   if (r == 0)
@@ -40,7 +40,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::connected (PROXY *proxy
 
 template<class PROXY> void
 TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.rebind (proxy, 1);
   if (r == 0)
@@ -63,7 +63,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::reconnected (PROXY *proxy
 
 template<class PROXY> void
 TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
 {
   int r = this->impl_.unbind (proxy);
   if (r != 0)
@@ -76,7 +76,7 @@ TAO_ESF_Proxy_RB_Tree<PROXY>::disconnected (PROXY *proxy
 }
 
 template<class PROXY> void
-TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ESF_Proxy_RB_Tree<PROXY>::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   Iterator end = this->impl_.end ();
   for (Iterator i = this->impl_.begin (); i != end; ++i)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
index c957b46209a..ccaa98f8010 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
@@ -74,18 +74,18 @@ public:
 
   /// Insert a new element to the collection
   void connected (PROXY *
-                  TAO_ENV_ARG_DECL_NOT_USED);
+                  ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Insert a new element that could be there already.
   void reconnected (PROXY *
-                    TAO_ENV_ARG_DECL_NOT_USED);
+                    ACE_ENV_ARG_DECL_NOT_USED);
   /// Remove an element from the collection
   void disconnected (PROXY *
-                     TAO_ENV_ARG_DECL_NOT_USED);
+                     ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Shutdown the collection, i.e. remove all elements and release
   /// resources
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   /// The underlying implementation object
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
index 21627fef89f..6058198ef9e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
@@ -13,11 +13,11 @@ ACE_RCSID(ESF, ESF_Shutdown_Proxy, "$Id$")
 
 template<class PROXY> void
 TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      proxy->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
index 69b3de4dc73..feffd2ccb3a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
@@ -27,7 +27,7 @@ public:
   TAO_ESF_Shutdown_Proxy (void);
 
   void work (PROXY *proxy
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
index c555be82e53..fe282efe565 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
@@ -35,7 +35,7 @@ public:
 
   /// Callback interface.
   virtual void work (Object *object
-                     TAO_ENV_ARG_DECL) = 0;
+                     ACE_ENV_ARG_DECL) = 0;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
index 77181c7c351..dd3d08881af 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
@@ -41,7 +41,7 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
   CORBA::TCKind corba_type = CORBA::tk_null;
   ACE_TRY
     {
-      corba_type = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      corba_type = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -59,14 +59,14 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
       this->op_.integer_ = 0;
 
       if (corba_type == CORBA::tk_short)
-	      {
-	        CORBA::Short sh;
-	        any_ref >>= sh;
-	        this->op_.integer_ = (CORBA::Long) sh;
-	      }
+              {
+                CORBA::Short sh;
+                any_ref >>= sh;
+                this->op_.integer_ = (CORBA::Long) sh;
+              }
       else
         {
-	        any_ref >>= this->op_.integer_;
+                any_ref >>= this->op_.integer_;
         }
 
       break;
@@ -74,24 +74,24 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
       this->op_.uinteger_ = 0;
 
       if (corba_type == CORBA::tk_ushort)
-	      {
-	        CORBA::UShort sh;
-	        any_ref >>= sh;
-	        this->op_.uinteger_ = (CORBA::ULong) sh;
-	      }
+              {
+                CORBA::UShort sh;
+                any_ref >>= sh;
+                this->op_.uinteger_ = (CORBA::ULong) sh;
+              }
       else
         {
-	        any_ref >>= this->op_.uinteger_;
+                any_ref >>= this->op_.uinteger_;
         }
 
       break;
     case TAO_ETCL_DOUBLE:
       if (corba_type == CORBA::tk_float)
-	      {
-	        CORBA::Float fl;
+              {
+                CORBA::Float fl;
                 (*any) >>= fl;
-	        this->op_.double_ = (CORBA::Double) fl;
-	      }
+                this->op_.double_ = (CORBA::Double) fl;
+              }
       else
         {
           (*any) >>= this->op_.double_;
@@ -100,15 +100,15 @@ TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (CORBA::Any * any)
       break;
     case TAO_ETCL_BOOLEAN:
       {
-	      CORBA_Any::to_boolean tmp (this->op_.bool_);
+              CORBA_Any::to_boolean tmp (this->op_.bool_);
         (*any) >>= tmp;
       }
       break;
     case TAO_ETCL_STRING:
       {
-	      const char* s;
-	      any_ref >>= s;
-	      this->op_.str_ = CORBA::string_dup (s);
+              const char* s;
+              any_ref >>= s;
+              this->op_.str_ = CORBA::string_dup (s);
       }
       break;
     case TAO_ETCL_COMPONENT:
@@ -300,17 +300,17 @@ TAO_ETCL_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
   CORBA::TCKind kind = CORBA::tk_null;
   ACE_TRY
     {
-      kind = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      kind = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::TypeCode_var tmp = CORBA::TypeCode::_duplicate (type);
 
       while (kind == CORBA::tk_alias)
         {
-          tmp = tmp->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+          tmp = tmp->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          kind = tmp->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+          kind = tmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -510,7 +510,7 @@ TAO_ETCL_Literal_Constraint::operator>= (const TAO_ETCL_Literal_Constraint & rhs
   switch (widest_type)
     {
     case TAO_ETCL_STRING:
-      return_value = 
+      return_value =
         (ACE_OS::strcmp ((const char*) *this, (const char*) rhs) >= 0);
       break;
     case TAO_ETCL_DOUBLE:
@@ -539,19 +539,19 @@ TAO_ETCL_Literal_Constraint::operator+ (const TAO_ETCL_Literal_Constraint & rhs)
     {
     case TAO_ETCL_DOUBLE:
       {
-	      CORBA::Double result = (CORBA::Double) *this + (CORBA::Double) rhs;
-	      return TAO_ETCL_Literal_Constraint ((CORBA::Double) result);
+              CORBA::Double result = (CORBA::Double) *this + (CORBA::Double) rhs;
+              return TAO_ETCL_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_ETCL_INTEGER:
     case TAO_ETCL_SIGNED:
       {
-	      CORBA::Long result = (CORBA::Long) *this + (CORBA::Long) rhs;
-	      return TAO_ETCL_Literal_Constraint ((CORBA::Long) result);
+              CORBA::Long result = (CORBA::Long) *this + (CORBA::Long) rhs;
+              return TAO_ETCL_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_ETCL_UNSIGNED:
       {
-	      CORBA::ULong result = (CORBA::ULong) *this + (CORBA::ULong) rhs;
-	      return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result);
+              CORBA::ULong result = (CORBA::ULong) *this + (CORBA::ULong) rhs;
+              return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
       return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0);
@@ -567,19 +567,19 @@ TAO_ETCL_Literal_Constraint::operator- (const TAO_ETCL_Literal_Constraint & rhs)
     {
     case TAO_ETCL_DOUBLE:
       {
-	      CORBA::Double result = (CORBA::Double) *this - (CORBA::Double) rhs;
-	      return TAO_ETCL_Literal_Constraint ((CORBA::Double) result);
+              CORBA::Double result = (CORBA::Double) *this - (CORBA::Double) rhs;
+              return TAO_ETCL_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_ETCL_INTEGER:
     case TAO_ETCL_SIGNED:
       {
-	      CORBA::Long result = (CORBA::Long) *this - (CORBA::Long) rhs;
-	      return TAO_ETCL_Literal_Constraint ((CORBA::Long) result);
+              CORBA::Long result = (CORBA::Long) *this - (CORBA::Long) rhs;
+              return TAO_ETCL_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_ETCL_UNSIGNED:
       {
-	      CORBA::ULong result = (CORBA::ULong) *this - (CORBA::ULong) rhs;
-	      return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result);
+              CORBA::ULong result = (CORBA::ULong) *this - (CORBA::ULong) rhs;
+              return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
       return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0);
@@ -595,19 +595,19 @@ TAO_ETCL_Literal_Constraint::operator* (const TAO_ETCL_Literal_Constraint & rhs)
     {
     case TAO_ETCL_DOUBLE:
       {
-	      CORBA::Double result = (CORBA::Double) *this * (CORBA::Double) rhs;
-	      return TAO_ETCL_Literal_Constraint ((CORBA::Double) result);
+              CORBA::Double result = (CORBA::Double) *this * (CORBA::Double) rhs;
+              return TAO_ETCL_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_ETCL_INTEGER:
     case TAO_ETCL_SIGNED:
       {
-	      CORBA::Long result = (CORBA::Long) *this * (CORBA::Long) rhs;
-	      return TAO_ETCL_Literal_Constraint ((CORBA::Long) result);
+              CORBA::Long result = (CORBA::Long) *this * (CORBA::Long) rhs;
+              return TAO_ETCL_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_ETCL_UNSIGNED:
       {
-	      CORBA::ULong result = (CORBA::ULong) *this * (CORBA::ULong) rhs;
-	      return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result);
+              CORBA::ULong result = (CORBA::ULong) *this * (CORBA::ULong) rhs;
+              return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
       return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0);
@@ -623,19 +623,19 @@ TAO_ETCL_Literal_Constraint::operator/ (const TAO_ETCL_Literal_Constraint & rhs)
     {
     case TAO_ETCL_DOUBLE:
       {
-	      CORBA::Double result = (CORBA::Double) *this / (CORBA::Double) rhs;
-	      return TAO_ETCL_Literal_Constraint ((CORBA::Double) result);
+              CORBA::Double result = (CORBA::Double) *this / (CORBA::Double) rhs;
+              return TAO_ETCL_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_ETCL_INTEGER:
     case TAO_ETCL_SIGNED:
       {
-	      CORBA::Long result = (CORBA::Long) *this / (CORBA::Long) rhs;
-	      return TAO_ETCL_Literal_Constraint ((CORBA::Long) result);
+              CORBA::Long result = (CORBA::Long) *this / (CORBA::Long) rhs;
+              return TAO_ETCL_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_ETCL_UNSIGNED:
       {
-	      CORBA::ULong result = (CORBA::ULong) *this / (CORBA::ULong) rhs;
-	      return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result);
+              CORBA::ULong result = (CORBA::ULong) *this / (CORBA::ULong) rhs;
+              return TAO_ETCL_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
       return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0);
@@ -648,12 +648,12 @@ TAO_ETCL_Literal_Constraint::operator- (void)
   switch (this->type_)
   {
     case TAO_ETCL_DOUBLE:
-	    return TAO_ETCL_Literal_Constraint (- this->op_.double_);
+            return TAO_ETCL_Literal_Constraint (- this->op_.double_);
     case TAO_ETCL_INTEGER:
     case TAO_ETCL_SIGNED:
-	    return TAO_ETCL_Literal_Constraint (- this->op_.integer_);
+            return TAO_ETCL_Literal_Constraint (- this->op_.integer_);
     case TAO_ETCL_UNSIGNED:
-	    return TAO_ETCL_Literal_Constraint (- (CORBA::Long) this->op_.uinteger_);
+            return TAO_ETCL_Literal_Constraint (- (CORBA::Long) this->op_.uinteger_);
     default:
       return TAO_ETCL_Literal_Constraint ((CORBA::Long) 0);
   }
@@ -661,7 +661,7 @@ TAO_ETCL_Literal_Constraint::operator- (void)
 
 TAO_Literal_Type
 TAO_ETCL_Literal_Constraint::widest_type (
-		const TAO_ETCL_Literal_Constraint & rhs
+                const TAO_ETCL_Literal_Constraint & rhs
   )
 {
   TAO_Literal_Type rhs_type = rhs.expr_type ();
@@ -676,11 +676,11 @@ TAO_ETCL_Literal_Constraint::widest_type (
     {
       if (rhs_type > this->type_)
         {
-	        return_value = rhs_type;
+                return_value = rhs_type;
         }
       else
         {
-	        return_value = this->type_;
+                return_value = this->type_;
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
index 62f0d7a8402..21d3100981f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
@@ -152,11 +152,11 @@ int
 ACE_ES_Dispatching_Base::dispatch_event (ACE_ES_Dispatch_Request *request,
                                          u_long &command_action)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Forward the request.
-      up_->push (request TAO_ENV_ARG_PARAMETER);
+      up_->push (request ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -241,9 +241,9 @@ ACE_ES_Priority_Dispatching::initialize_queues (void)
 
 void
 ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
-  down_->connected (consumer TAO_ENV_ARG_PARAMETER);
+  down_->connected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // This code does dynamic allocation of channel dispatch threads.
@@ -255,7 +255,7 @@ ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer
   // We have to tell the lower portions of the channel about the
   // consumer first.  This is so that any changes to the consumer's
   // qos will take effect when we get the dispatch priority.
-  down_->connected (consumer TAO_ENV_ARG_PARAMETER);
+  down_->connected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecScheduler::OS_Priority priority =
@@ -338,7 +338,7 @@ ACE_ES_Priority_Dispatching::disconnected (ACE_Push_Consumer_Proxy *consumer)
 // <request> has been dynamically allocated by the filtering module.
 void
 ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PUSH_SOURCE_TYPE_CORRELATION_MODULE);
 
@@ -355,14 +355,14 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request
          thread_priority,
          subpriority,
          preemption_priority
-          TAO_ENV_ARG_PARAMETER);
+          ACE_ENV_ARG_PARAMETER);
 #else
       ACE_Scheduler_Factory::server ()->priority
         (request->rt_info (),
          thread_priority,
          subpriority,
          preemption_priority
-          TAO_ENV_ARG_PARAMETER);
+          ACE_ENV_ARG_PARAMETER);
 #endif
       ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PRIORITY_DISPATCHING_PUSH_PRIORITY_OBTAINED);
       ACE_CHECK;
@@ -619,7 +619,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
                          "ACE_ES_Dispatch_Queue::open_queue"), -1);
     case 0:
       {
-        TAO_ENV_DECLARE_NEW_ENV;
+        ACE_DECLARE_NEW_CORBA_ENV;
         ACE_TRY
           {// @@ TODO: Handle exceptions...
 #if 1
@@ -634,7 +634,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
                ORBSVCS_Time::zero (),
                1,
                RtecScheduler::OPERATION
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
 #else
             ACE_Scheduler_Factory::server()->set (rt_info_,
                                                   RtecScheduler::VERY_HIGH_CRITICALITY,
@@ -646,7 +646,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
                                                   ORBSVCS_Time::zero (),
                                                   1,
                                                   RtecScheduler::OPERATION
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
 #endif
             ACE_TRY_CHECK;
           }
@@ -686,7 +686,7 @@ ACE_ES_EFD_Dispatching::ACE_ES_EFD_Dispatching (ACE_EventChannel *channel)
 
 void
 ACE_ES_EFD_Dispatching::push (ACE_ES_Dispatch_Request *request
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
 {
   // If it's a request to forward an event, it needs a reference to us
   // to call dispatch_event.
@@ -727,11 +727,11 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request,
   // Store the priority of the task currently running.
   channel_->rtu_manager ()->priority (request->priority ());
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Forward the request.
-      up_->push (request TAO_ENV_ARG_PARAMETER);
+      up_->push (request ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -759,10 +759,10 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request,
 
 void
 ACE_ES_RTU_Dispatching::push (ACE_ES_Dispatch_Request *request
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   // First enqueue the message in the proper queue.
-  ACE_ES_Priority_Dispatching::push (request TAO_ENV_ARG_PARAMETER);
+  ACE_ES_Priority_Dispatching::push (request ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // If the current event is higher priority (lower value) than the
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
index 30f14e7fd21..ab82394c9ec 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
@@ -64,11 +64,11 @@ public:
   // Link to adjacent modules.
 
   virtual void connected (ACE_Push_Consumer_Proxy *consumer
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   // Forward down_.
 
   virtual void disconnecting (ACE_Push_Consumer_Proxy *consumer
-                              TAO_ENV_ARG_DECL_NOT_USED);
+                              ACE_ENV_ARG_DECL_NOT_USED);
   // Forward down_.
 
   virtual void disconnected (ACE_Push_Consumer_Proxy *consumer);
@@ -79,7 +79,7 @@ public:
   // void disconnecting (ACE_Push_Supplier_Proxy *supplier);
 
   virtual void push (ACE_ES_Dispatch_Request *request
-                     TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                     ACE_ENV_ARG_DECL_NOT_USED) = 0;
   // Forward up_.
 
   virtual int dispatch_event (ACE_ES_Dispatch_Request *request,
@@ -386,7 +386,7 @@ public:
   // Delete queues.
 
   void connected (ACE_Push_Consumer_Proxy *consumer
-                  TAO_ENV_ARG_DECL_NOT_USED);
+                  ACE_ENV_ARG_DECL_NOT_USED);
   // Allocate any needed dispatching resources for this consumers
   // priority.
 
@@ -398,7 +398,7 @@ public:
   // void disconnecting (ACE_Push_Supplier_Proxy *supplier);
 
   virtual void push (ACE_ES_Dispatch_Request *request
-                     TAO_ENV_ARG_DECL_NOT_USED);
+                     ACE_ENV_ARG_DECL_NOT_USED);
   // Enqueues the request on the appropriate Dispatch Queue.
 
   virtual void activate (int threads_per_queue);
@@ -471,7 +471,7 @@ public:
   // the dispatching base constructor.
 
   virtual void push (ACE_ES_Dispatch_Request *request
-                     TAO_ENV_ARG_DECL_NOT_USED);
+                     ACE_ENV_ARG_DECL_NOT_USED);
   // Forward up_.
 };
 
@@ -495,7 +495,7 @@ public:
   // policy.
 
   virtual void push (ACE_ES_Dispatch_Request *request
-                     TAO_ENV_ARG_DECL_NOT_USED);
+                     ACE_ENV_ARG_DECL_NOT_USED);
   // Calls ACE_ES_Priority_Dispatching::push and then checks if
   // preemption is necessary.
 };
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
index cc6c5d64243..e2091091c6d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i
@@ -156,9 +156,9 @@ ACE_ES_Dispatching_Base::open (ACE_ES_Consumer_Module *up,
 
 ACE_INLINE void
 ACE_ES_Dispatching_Base::connected (ACE_Push_Consumer_Proxy *consumer
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  down_->connected (consumer TAO_ENV_ARG_PARAMETER);
+  down_->connected (consumer ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
@@ -170,9 +170,9 @@ ACE_ES_Dispatching_Base::disconnected (ACE_Push_Consumer_Proxy *consumer)
 
 ACE_INLINE void
 ACE_ES_Dispatching_Base::disconnecting (ACE_Push_Consumer_Proxy *consumer
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
-  down_->disconnecting (consumer TAO_ENV_ARG_PARAMETER);
+  down_->disconnecting (consumer ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 624920c3b4e..a22b6ca2963 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -29,7 +29,7 @@ TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void)
 
 int
 TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   // @@ TODO Think about the exception safety (or lack thereof) of
   // this code, what if the following operations fail?
@@ -44,13 +44,13 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec
   // its lifetime.
 
   RtecEventChannelAdmin::Observer_var obs =
-    this->observer_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->observer_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_TRY
     {
       this->handle_ =
-        this->ec_->append_observer (obs.in () TAO_ENV_ARG_PARAMETER);
+        this->ec_->append_observer (obs.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   ACE_CATCH(CORBA::SystemException, ex)
@@ -60,12 +60,12 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec
       // we should encapsulate it in a Deactivator.
 
       PortableServer::POA_var poa =
-        this->observer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->observer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (&this->observer_ TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (&this->observer_ ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       ACE_RE_THROW;
@@ -77,26 +77,26 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec
 }
 
 int
-TAO_ECG_Mcast_EH::close (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ECG_Mcast_EH::close (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->handle_ == 0)
     return 0;
 
   RtecEventChannelAdmin::Observer_Handle h = this->handle_;
   this->handle_ = 0;
-  this->ec_->remove_observer (h TAO_ENV_ARG_PARAMETER);
+  this->ec_->remove_observer (h ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // @@ TODO If the first operation raises an exception then the
   // second one never executes!!!
   {
     PortableServer::POA_var poa =
-      this->observer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->observer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
     PortableServer::ObjectId_var id =
-      poa->servant_to_id (&this->observer_ TAO_ENV_ARG_PARAMETER);
+      poa->servant_to_id (&this->observer_ ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
-    poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+    poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
   }
 
@@ -144,7 +144,7 @@ void
 TAO_ECG_Mcast_EH::compute_required_subscriptions (
     const RtecEventChannelAdmin::ConsumerQOS& sub,
     Address_Set& multicast_addresses
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong count = sub.dependencies.length ();
@@ -170,7 +170,7 @@ TAO_ECG_Mcast_EH::compute_required_subscriptions (
       //   opportunity to recover it.
       // + Close the MCast Event Handler completely, too much policy
       //   for this level.
-      this->receiver_->get_addr (header, addr TAO_ENV_ARG_PARAMETER);
+      this->receiver_->get_addr (header, addr ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_INET_Addr inet_addr (addr.port, addr.ipaddr);
@@ -299,7 +299,7 @@ TAO_ECG_Mcast_EH::add_new_subscriptions (
 void
 TAO_ECG_Mcast_EH::update_consumer (
     const RtecEventChannelAdmin::ConsumerQOS& sub
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ TODO This function turned out to be too long, we need to break
@@ -310,7 +310,7 @@ TAO_ECG_Mcast_EH::update_consumer (
 
   Address_Set multicast_addresses;
 
-  this->compute_required_subscriptions (sub, multicast_addresses TAO_ENV_ARG_PARAMETER);
+  this->compute_required_subscriptions (sub, multicast_addresses ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // 2) To conserve OS and network resources we first unsubscribe from
@@ -329,7 +329,7 @@ TAO_ECG_Mcast_EH::update_consumer (
 
 void
 TAO_ECG_Mcast_EH::update_supplier (const RtecEventChannelAdmin::SupplierQOS&
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
@@ -345,19 +345,19 @@ TAO_ECG_Mcast_EH::Observer::Observer (TAO_ECG_Mcast_EH* eh)
 void
 TAO_ECG_Mcast_EH::Observer::update_consumer (
     const RtecEventChannelAdmin::ConsumerQOS& sub
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->eh_->update_consumer (sub TAO_ENV_ARG_PARAMETER);
+  this->eh_->update_consumer (sub ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ECG_Mcast_EH::Observer::update_supplier (
     const RtecEventChannelAdmin::SupplierQOS& pub
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->eh_->update_supplier (pub TAO_ENV_ARG_PARAMETER);
+  this->eh_->update_supplier (pub ACE_ENV_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index a4f52be104d..fa9fc0dd703 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -59,24 +59,24 @@ public:
    * reactor.
    */
   int open (RtecEventChannelAdmin::EventChannel_ptr ec
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Remove ourselves from the event channel, unsubscribe from the
    * multicast groups, close the sockets and unsubscribe from the
    * reactor.
    */
-  int close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Reactor callbacks
   virtual int handle_input (ACE_HANDLE fd);
 
   /// The Observer methods
   void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
   void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -100,11 +100,11 @@ public:
     // The Observer methods
     virtual void update_consumer (
         const RtecEventChannelAdmin::ConsumerQOS& sub
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
     virtual void update_supplier (
         const RtecEventChannelAdmin::SupplierQOS& pub
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   private:
@@ -134,7 +134,7 @@ private:
   void compute_required_subscriptions (
         const RtecEventChannelAdmin::ConsumerQOS& sub,
               Address_Set& multicast_addresses
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
               ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Delete the list of multicast addresses that we need not
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index 33a372afecc..eac9230d22c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -61,7 +61,7 @@ void
 TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
                           RtecUDPAdmin::AddrServer_ptr addr_server,
                           TAO_ECG_UDP_Out_Endpoint* endpoint
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->lcl_ec_ =
     RtecEventChannelAdmin::EventChannel::_duplicate (lcl_ec);
@@ -83,23 +83,23 @@ TAO_ECG_UDP_Sender::mtu (CORBA::ULong new_mtu)
 }
 
 void
-TAO_ECG_UDP_Sender::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ECG_UDP_Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil ();
 }
 
 void
 TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Open gateway\n"));
   if (CORBA::is_nil (this->lcl_ec_.in ()))
     return;
 
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
-    this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (sub.dependencies.length () == 0)
@@ -109,15 +109,15 @@ TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub
   //ACE_SupplierQOS_Factory::debug (pub);
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->lcl_ec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->lcl_ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushConsumer_var consumer_ref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   //ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Consumer "));
@@ -125,35 +125,35 @@ TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub
 
   this->supplier_proxy_->connect_push_consumer (consumer_ref.in (),
                                                 sub
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_ECG_UDP_Sender::close (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ECG_UDP_Sender::close (ACE_ENV_SINGLE_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n"));
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_ECG_UDP_Sender::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ECG_UDP_Sender::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -163,7 +163,7 @@ TAO_ECG_UDP_Sender::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Sender::push - \n"));
@@ -192,11 +192,11 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events
 
       RtecUDPAdmin::UDP_Addr udp_addr;
       this->addr_server_->get_addr (header, udp_addr
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->send_event (udp_addr, e
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // That's it, no need to continue...
@@ -219,7 +219,7 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events
       // Grab the right mcast group for this event...
       RtecUDPAdmin::UDP_Addr udp_addr;
       this->addr_server_->get_addr (e.header, udp_addr
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       Destination_Map::ENTRY *entry;
@@ -249,11 +249,11 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events
                ++k)
             {
               this->marshal_one_event (events[(*k)], cdr
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           this->send_cdr_stream ((*j).ext_id_, cdr
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -269,7 +269,7 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events
 void
 TAO_ECG_UDP_Sender::marshal_one_event (const RtecEventComm::Event& e,
                                        TAO_OutputCDR &cdr
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   // We need to modify the TTL field, but copying the entire event
   // would be wasteful; instead we create a new header and only
@@ -285,7 +285,7 @@ TAO_ECG_UDP_Sender::marshal_one_event (const RtecEventComm::Event& e,
 void
 TAO_ECG_UDP_Sender::send_event (const RtecUDPAdmin::UDP_Addr& udp_addr,
                                 const RtecEventComm::Event& e
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   // This is the CDR stream used to marshal the event...
   TAO_OutputCDR cdr;
@@ -295,17 +295,17 @@ TAO_ECG_UDP_Sender::send_event (const RtecUDPAdmin::UDP_Addr& udp_addr,
   // marshal without any extra copies.
   cdr.write_ulong (1);
 
-  this->marshal_one_event (e, cdr TAO_ENV_ARG_PARAMETER);
+  this->marshal_one_event (e, cdr ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->send_cdr_stream (udp_addr, cdr
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr,
                                      TAO_OutputCDR &cdr
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   // @@ TODO precompute this when the MTU changes...
   CORBA::ULong max_fragment_payload = this->mtu () -
@@ -364,7 +364,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr,
                                fragment_count,
                                iov,
                                iovcnt
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           fragment_id++;
           fragment_offset += max_fragment_payload;
@@ -392,7 +392,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr,
                                fragment_count,
                                iov,
                                iovcnt
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           fragment_id++;
           fragment_offset += max_fragment_payload;
@@ -413,7 +413,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr,
                                fragment_count,
                                iov,
                                iovcnt
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           fragment_id++;
           fragment_offset += fragment_size;
@@ -437,7 +437,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr,
                            fragment_count,
                            iov,
                            iovcnt
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       fragment_id++;
       fragment_offset += fragment_size;
@@ -460,7 +460,7 @@ TAO_ECG_UDP_Sender::send_fragment (const RtecUDPAdmin::UDP_Addr& udp_addr,
                                    CORBA::ULong fragment_count,
                                    iovec iov[],
                                    int iovcnt
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   CORBA::ULong header[TAO_ECG_UDP_Protocol::ECG_HEADER_SIZE
                      / sizeof(CORBA::ULong)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 7757cbce581..a039adeb648 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -59,7 +59,7 @@ public:
   void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
              RtecUDPAdmin::AddrServer_ptr addr_server,
              TAO_ECG_UDP_Out_Endpoint *endpoint
-             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * The sender may need to fragment the message, otherwise the
@@ -72,20 +72,20 @@ public:
 
   /// Disconnect and shutdown the sender, no further connections will
   /// work unless init() is called again.
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Connect (or reconnect) to the EC with the given subscriptions.
   void open (RtecEventChannelAdmin::ConsumerQOS &sub
-             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Disconnect from the EC, but reconnection is still possible.
-  void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// The PushConsumer methods.
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void push (const RtecEventComm::EventSet &events
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -96,18 +96,18 @@ private:
    */
   void marshal_one_event (const RtecEventComm::Event& e,
                           TAO_OutputCDR &cdr
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
 
   /// Helper function to marshal and send a single event.
   void send_event (const RtecUDPAdmin::UDP_Addr& udp_addr,
                    const RtecEventComm::Event& e
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 
   /// Helper function to send one or more events once they have been
   /// marshaled into a CDR stream.
   void send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr,
                         TAO_OutputCDR &cdr
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
   /**
    * Send one fragment, the first entry in the iovec is used to send
@@ -123,7 +123,7 @@ private:
                       CORBA::ULong fragment_count,
                       iovec iov[],
                       int iovcnt
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Count the number of fragments that will be required to send the
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
index 7efa43f67b9..f9562d11194 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -59,12 +59,12 @@ TAO_EC_And_Filter::size (void) const
 int
 TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
                            TAO_EC_QOS_Info& qos_info
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
+      int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       if (n == 0)
         return 0;
@@ -73,7 +73,7 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
   // All children accepted the event, push up...
   if (this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -83,12 +83,12 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event,
 int
 TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
                                   TAO_EC_QOS_Info& qos_info
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      int n = (*i)->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+      int n = (*i)->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       if (n == 0)
         return 0;
@@ -97,7 +97,7 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
   // All children accepted the event, push up...
   if (this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -107,14 +107,14 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 void
 TAO_EC_And_Filter::push (const RtecEventComm::EventSet&,
                          TAO_EC_QOS_Info&
-                         TAO_ENV_ARG_DECL_NOT_USED)
+                         ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_And_Filter::push_nocopy (RtecEventComm::EventSet&,
                                 TAO_EC_QOS_Info&
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -165,7 +165,7 @@ int
 TAO_EC_And_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
       const TAO_EC_QOS_Info&
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
index cd510858f4e..631198f7014 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
@@ -51,22 +51,22 @@ public:
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
   typedef unsigned int Word;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index 5725d9bf671..b1b7b1ca222 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -25,7 +25,7 @@ TAO_EC_Filter*
 TAO_EC_Basic_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
     RtecEventChannelAdmin::ConsumerQOS& qos
-    TAO_ENV_ARG_DECL_NOT_USED) const
+    ACE_ENV_ARG_DECL_NOT_USED) const
 {
   CORBA::ULong pos = 0;
   return this->recursive_build (supplier, qos, pos);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
index 38d4c5fb386..ddbfcfe1bbd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -47,7 +47,7 @@ public:
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
                         RtecEventChannelAdmin::ConsumerQOS& qos
-                        TAO_ENV_ARG_DECL) const;
+                        ACE_ENV_ARG_DECL) const;
 
 private:
   /// Recursively build the filter tree.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
index c958f40e5e5..da2d0e66069 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
@@ -45,7 +45,7 @@ TAO_EC_Bitmask_Filter::size (void) const
 int
 TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event,
                                 TAO_EC_QOS_Info& qos_info
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   if (event.length () != 1)
     return 0;
@@ -54,13 +54,13 @@ TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event,
       || (event[0].header.source & this->source_mask_) == 0)
     return 0;
 
-  return this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
+  return this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 int
 TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event,
                                    TAO_EC_QOS_Info& qos_info
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   if (event.length () != 1)
     return 0;
@@ -69,25 +69,25 @@ TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event,
       || (event[0].header.source & this->source_mask_) == 0)
     return 0;
 
-  return this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+  return this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Bitmask_Filter::push (const RtecEventComm::EventSet &event,
                              TAO_EC_QOS_Info &qos_info
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
+    this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Bitmask_Filter::push_nocopy (RtecEventComm::EventSet &event,
                                     TAO_EC_QOS_Info &qos_info
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -117,7 +117,7 @@ int
 TAO_EC_Bitmask_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
       const TAO_EC_QOS_Info &
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
index 69984a309ef..f617b1a7f53 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
@@ -68,22 +68,22 @@ public:
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Bitmask_Filter
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index bc5b04a77c1..913e5ce35ce 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -83,14 +83,14 @@ TAO_EC_Conjunction_Filter::size (void) const
 int
 TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event,
                                    TAO_EC_QOS_Info& qos_info
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   ChildrenIterator end = this->end ();
   for (this->current_child_ = this->begin ();
        this->current_child_ != end;
        ++this->current_child_)
     {
-      int n = (*this->current_child_)->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
+      int n = (*this->current_child_)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       if (n != 0)
         return n;
@@ -101,14 +101,14 @@ TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event,
 int
 TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
                                           TAO_EC_QOS_Info& qos_info
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      int n = (*i)->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+      int n = (*i)->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       if (n != 0)
         return n;
@@ -119,7 +119,7 @@ TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 void
 TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event,
                                  TAO_EC_QOS_Info& qos_info
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   CORBA::Long pos = this->current_child_ - this->begin ();
   int w = pos / bits_per_word;
@@ -135,15 +135,15 @@ TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event,
       this->event_[l + i] = event[i];
     }
   if (this->all_received () && this->parent () != 0)
-    this->parent ()->push_nocopy (this->event_, qos_info TAO_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (this->event_, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Conjunction_Filter::push_nocopy (RtecEventComm::EventSet& event,
                                         TAO_EC_QOS_Info& qos_info
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
-  this->push (event, qos_info TAO_ENV_ARG_PARAMETER);
+  this->push (event, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -203,7 +203,7 @@ int
 TAO_EC_Conjunction_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
       const TAO_EC_QOS_Info&
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index bf49e8a52e3..b2788d196a2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -53,22 +53,22 @@ public:
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
   typedef unsigned int Word;
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index ddcfd4faa5f..90f84370770 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -26,14 +26,14 @@ TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void)
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_EC_ConsumerAdmin::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_EC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index cac71634fde..7914fc9f6c2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -38,7 +38,7 @@ class TAO_EC_ProxyPushConsumer;
  * <H2> Memory Management</H2>
  * It does not assume ownership of the TAO_EC_Event_Channel object;
  * but it *does* assume ownership of the TAO_EC_ProxyPushSupplier_Set
- * object. 
+ * object.
  *
  * <H2>Locking</H2>
  * No provisions for locking, access must be serialized externally.
@@ -60,11 +60,11 @@ public:
 
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// Store the default POA.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
index 654bb82e8e8..0d0a8be8ed3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -30,14 +30,14 @@ TAO_EC_ConsumerControl::shutdown (void)
 
 void
 TAO_EC_ConsumerControl::consumer_not_exist (TAO_EC_ProxyPushSupplier *
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_ConsumerControl::system_exception (TAO_EC_ProxyPushSupplier *,
                                           CORBA::SystemException &
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
index 1af9cbbfe63..1d39d13cf24 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -56,12 +56,12 @@ public:
    * reclaim all the resources attached to that object.
    */
   virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy
-                                   TAO_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Some system exception was rasied while trying to push an event.
   virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy,
                                  CORBA::SystemException &
-                                 TAO_ENV_ARG_DECL_NOT_USED);
+                                 ACE_ENV_ARG_DECL_NOT_USED);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index dce14cd6423..97b182299fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -59,14 +59,14 @@ TAO_EC_Disjunction_Filter::size (void) const
 int
 TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event,
                                    TAO_EC_QOS_Info& qos_info
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
+      int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       if (n != 0)
         return n;
@@ -77,14 +77,14 @@ TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event,
 int
 TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
                                    TAO_EC_QOS_Info& qos_info
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
+      int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       if (n != 0)
         return n;
@@ -95,19 +95,19 @@ TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 void
 TAO_EC_Disjunction_Filter::push (const RtecEventComm::EventSet& event,
                                  TAO_EC_QOS_Info& qos_info
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
+    this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Disjunction_Filter::push_nocopy (RtecEventComm::EventSet& event,
                                  TAO_EC_QOS_Info& qos_info
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -157,7 +157,7 @@ int
 TAO_EC_Disjunction_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
       const TAO_EC_QOS_Info &
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
index 02e2752af51..e450d1c4a8c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -52,22 +52,22 @@ public:
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Disjunction_Filter
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
index b1195799e0e..71f099ef2f3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -34,9 +34,9 @@ TAO_EC_Reactive_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                                    RtecEventComm::PushConsumer_ptr consumer,
                                    const RtecEventComm::EventSet& event,
                                    TAO_EC_QOS_Info&
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
-  proxy->reactive_push_to_consumer (consumer, event TAO_ENV_ARG_PARAMETER);
+  proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -44,7 +44,7 @@ TAO_EC_Reactive_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                           RtecEventComm::PushConsumer_ptr consumer,
                                           RtecEventComm::EventSet& event,
                                           TAO_EC_QOS_Info&
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
-  proxy->reactive_push_to_consumer (consumer, event TAO_ENV_ARG_PARAMETER);
+  proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index 9ed29c5a12d..3aa53499fd4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -64,12 +64,12 @@ public:
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet &event,
                      TAO_EC_QOS_Info &qos_info
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet &event,
                             TAO_EC_QOS_Info &qos_info
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 };
 
 // ****************************************************************
@@ -96,12 +96,12 @@ public:
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet &event,
                      TAO_EC_QOS_Info &qos_info
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet &event,
                             TAO_EC_QOS_Info &qos_info
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index 79303ce3ebb..cb0a9a28d24 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -42,7 +42,7 @@ TAO_EC_Dispatching_Task::svc (void)
               continue;
             }
 
-          int result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER);
+          int result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_Message_Block::release (mb);
@@ -64,7 +64,7 @@ void
 TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
                                RtecEventComm::PushConsumer_ptr consumer,
                                RtecEventComm::EventSet& event
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   if (this->allocator_ == 0)
     this->allocator_ = ACE_Allocator::instance ();
@@ -93,7 +93,7 @@ TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command (void)
 // ****************************************************************
 
 int
-TAO_EC_Shutdown_Task_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Shutdown_Task_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return -1;
 }
@@ -106,11 +106,11 @@ TAO_EC_Push_Command::~TAO_EC_Push_Command (void)
 }
 
 int
-TAO_EC_Push_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_->push_to_consumer (this->consumer_.in (),
                                   this->event_
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index dd2cd77fc51..21f03a332c4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -59,7 +59,7 @@ public:
   virtual void push (TAO_EC_ProxyPushSupplier *proxy,
                      RtecEventComm::PushConsumer_ptr consumer,
                      RtecEventComm::EventSet& event
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 private:
   /// An per-task allocator
@@ -88,7 +88,7 @@ public:
   virtual ~TAO_EC_Dispatch_Command (void);
 
   /// Command callback
-  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0;
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) = 0;
 };
 
 // ****************************************************************
@@ -100,7 +100,7 @@ public:
   TAO_EC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0);
 
   /// Command callback
-  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 };
 
 // ****************************************************************
@@ -119,7 +119,7 @@ public:
   virtual ~TAO_EC_Push_Command (void);
 
   /// Command callback
-  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   /// The proxy
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index 94e1737e919..24c4a9ab38a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -101,7 +101,7 @@ TAO_EC_Event_Channel::~TAO_EC_Event_Channel (void)
 }
 
 void
-TAO_EC_Event_Channel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Event_Channel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->dispatching_->activate ();
   this->timeout_generator_->activate ();
@@ -110,7 +110,7 @@ TAO_EC_Event_Channel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_EC_Event_Channel::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_Event_Channel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->dispatching_->shutdown ();
   this->timeout_generator_->shutdown ();
@@ -118,144 +118,144 @@ TAO_EC_Event_Channel::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   this->consumer_control_->shutdown ();
 
   PortableServer::POA_var consumer_poa =
-    this->consumer_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this->consumer_admin_ TAO_ENV_ARG_PARAMETER);
+    consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER);
+  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var supplier_poa =
-    this->supplier_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this->supplier_admin_ TAO_ENV_ARG_PARAMETER);
+    supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER);
+  supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->consumer_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 }
 
 void
 TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushConsumer* consumer
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
-  this->consumer_admin_->peer_connected (consumer TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->peer_connected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER);
+  this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->observer_strategy_->connected (consumer TAO_ENV_ARG_PARAMETER);
+  this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushConsumer* consumer
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
-  this->consumer_admin_->peer_reconnected (consumer TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->peer_reconnected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER);
+  this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->observer_strategy_->connected (consumer TAO_ENV_ARG_PARAMETER);
+  this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushConsumer* consumer
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  this->consumer_admin_->peer_disconnected (consumer TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->peer_disconnected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER);
+  this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->observer_strategy_->disconnected (consumer TAO_ENV_ARG_PARAMETER);
+  this->observer_strategy_->disconnected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushSupplier* supplier
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
-  this->supplier_admin_->peer_connected (supplier TAO_ENV_ARG_PARAMETER);
+  this->supplier_admin_->peer_connected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->observer_strategy_->connected (supplier TAO_ENV_ARG_PARAMETER);
+  this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushSupplier* supplier
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
-  this->supplier_admin_->peer_reconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->supplier_admin_->peer_reconnected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->observer_strategy_->connected (supplier TAO_ENV_ARG_PARAMETER);
+  this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushSupplier* supplier
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  this->supplier_admin_->peer_disconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->supplier_admin_->peer_disconnected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->observer_strategy_->disconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->observer_strategy_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
-TAO_EC_Event_Channel::for_consumers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_Event_Channel::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->consumer_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 RtecEventChannelAdmin::SupplierAdmin_ptr
-TAO_EC_Event_Channel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_Event_Channel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->supplier_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_EC_Event_Channel::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_Event_Channel::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Event_Channel::append_observer (
        RtecEventChannelAdmin::Observer_ptr observer
-       TAO_ENV_ARG_DECL)
+       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER))
 {
-  return this->observer_strategy_->append_observer (observer TAO_ENV_ARG_PARAMETER);
+  return this->observer_strategy_->append_observer (observer ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Event_Channel::remove_observer (
        RtecEventChannelAdmin::Observer_Handle handle
-       TAO_ENV_ARG_DECL)
+       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER))
 {
-  this->observer_strategy_->remove_observer (handle TAO_ENV_ARG_PARAMETER);
+  this->observer_strategy_->remove_observer (handle ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
index e731eb6fb4e..b095cfaebe9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -120,11 +120,11 @@ public:
 
   /// Start the internal threads (if any), etc.
   /// After this call the EC can be used.
-  virtual void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Shutdown any internal threads, cleanup all the internal
   /// structures, flush all the messages, etc.
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Access the dispatching module....
   TAO_EC_Dispatching* dispatching (void) const;
@@ -188,20 +188,20 @@ public:
   /// Used to inform the EC that a Consumer has connected or
   /// disconnected from it.
   virtual void connected (TAO_EC_ProxyPushConsumer*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void reconnected (TAO_EC_ProxyPushConsumer*
-                            TAO_ENV_ARG_DECL_NOT_USED);
+                            ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_EC_ProxyPushConsumer*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Used to inform the EC that a Supplier has connected or
   /// disconnected from it.
   virtual void connected (TAO_EC_ProxyPushSupplier*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void reconnected (TAO_EC_ProxyPushSupplier*
-                            TAO_ENV_ARG_DECL_NOT_USED);
+                            ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_EC_ProxyPushSupplier*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
 
   // Simple flags to control the EC behavior, set by the application
   // at construction time.
@@ -226,31 +226,31 @@ public:
 
   // = The RtecEventChannelAdmin::EventChannel methods...
   /// The default implementation is:
-  ///    this->consumer_admin ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ///    this->consumer_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-      for_consumers (TAO_ENV_SINGLE_ARG_DECL)
+      for_consumers (ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// The default implementation is:
-  ///    this->supplier_admin ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ///    this->supplier_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-      for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+      for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Commit suicide.
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
           RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void
       remove_observer (RtecEventChannelAdmin::Observer_Handle
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
           RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index f2e738b5b2b..aebd91da40b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -38,7 +38,7 @@ TAO_EC_Filter::size (void) const
 
 void
 TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info&
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                   CORBA::COMPLETED_NO));
@@ -49,11 +49,11 @@ TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info&
 int
 TAO_EC_Null_Filter::filter (const RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   // This is a leaf, no need to query any children, and we accept all
   // events, so push it.
-  this->push (event, qos_info TAO_ENV_ARG_PARAMETER);
+  this->push (event, qos_info ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return 1;
 }
@@ -61,11 +61,11 @@ TAO_EC_Null_Filter::filter (const RtecEventComm::EventSet& event,
 int
 TAO_EC_Null_Filter::filter_nocopy (RtecEventComm::EventSet& event,
                                    TAO_EC_QOS_Info& qos_info
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   // This is a leaf, no need to query any children, and we accept all
   // events, so push it.
-  this->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+  this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return 1;
 }
@@ -73,19 +73,19 @@ TAO_EC_Null_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 void
 TAO_EC_Null_Filter::push (const RtecEventComm::EventSet& event,
                           TAO_EC_QOS_Info& qos_info
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
+    this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Null_Filter::push_nocopy (RtecEventComm::EventSet& event,
                                  TAO_EC_QOS_Info& qos_info
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -113,7 +113,7 @@ int
 TAO_EC_Null_Filter::add_dependencies (
       const RtecEventComm::EventHeader &,
       const TAO_EC_QOS_Info &
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
 
 {
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index a9d6c03e718..a3cb7a22850 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -86,10 +86,10 @@ public:
    */
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info
-                      TAO_ENV_ARG_DECL) = 0;
+                      ACE_ENV_ARG_DECL) = 0;
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL) = 0;
+                             ACE_ENV_ARG_DECL) = 0;
 
   /**
    * This is called by the children when they accept an event and
@@ -99,10 +99,10 @@ public:
    */
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL) = 0;
+                     ACE_ENV_ARG_DECL) = 0;
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL) = 0;
+                            ACE_ENV_ARG_DECL) = 0;
 
   /// Clear any saved state, must reset and assume no events have been
   /// received.
@@ -134,7 +134,7 @@ public:
    */
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info& qos_info
-                                TAO_ENV_ARG_DECL) = 0;
+                                ACE_ENV_ARG_DECL) = 0;
 
   /**
    * Obtain the QOS information for this filter, the default
@@ -143,7 +143,7 @@ public:
    * Returns 0 on success and -1 on failure
    */
   virtual void get_qos_info (TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
 private:
   /// The parent...
@@ -175,22 +175,22 @@ public:
   // TAO_EC_Filter.
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
index fdb29f3ccbb..8b8cc5ddbe7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -23,7 +23,7 @@ TAO_EC_Filter*
 TAO_EC_Null_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *,
     RtecEventChannelAdmin::ConsumerQOS&
-    TAO_ENV_ARG_DECL_NOT_USED) const
+    ACE_ENV_ARG_DECL_NOT_USED) const
 {
   return new TAO_EC_Null_Filter;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index 7a81a583244..d267399000a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -47,7 +47,7 @@ public:
   virtual TAO_EC_Filter*
       build (TAO_EC_ProxyPushSupplier *supplier,
              RtecEventChannelAdmin::ConsumerQOS& qos
-             TAO_ENV_ARG_DECL) const = 0;
+             ACE_ENV_ARG_DECL) const = 0;
 
 };
 
@@ -72,7 +72,7 @@ public:
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
                         RtecEventChannelAdmin::ConsumerQOS& qos
-                        TAO_ENV_ARG_DECL) const;
+                        ACE_ENV_ARG_DECL) const;
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index 87f78dfc03f..ef141efbfb1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -70,17 +70,17 @@ TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP (void)
 void
 TAO_EC_Gateway_IIOP::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
                            RtecEventChannelAdmin::EventChannel_ptr lcl_ec
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  this->init_i (rmt_ec, lcl_ec TAO_ENV_ARG_PARAMETER);
+  this->init_i (rmt_ec, lcl_ec ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
                              RtecEventChannelAdmin::EventChannel_ptr lcl_ec
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (!CORBA::is_nil (this->rmt_ec_.in ()))
     return;
@@ -92,16 +92,16 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
 }
 
 void
-TAO_EC_Gateway_IIOP::close (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::close (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
 void
-TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::close_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n"));
 
@@ -116,7 +116,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL)
             continue;
           ACE_TRY
             {
-              consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+              consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY
@@ -132,7 +132,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL)
 
   if (!CORBA::is_nil (this->default_consumer_proxy_.in ()))
     {
-      this->default_consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->default_consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->default_consumer_proxy_ =
@@ -141,7 +141,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL)
 
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->supplier_proxy_ =
@@ -152,7 +152,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL)
 void
 TAO_EC_Gateway_IIOP::update_consumer (
     const RtecEventChannelAdmin::ConsumerQOS& c_qos
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (c_qos.dependencies.length () <= 1)
@@ -167,15 +167,15 @@ TAO_EC_Gateway_IIOP::update_consumer (
       return;
     }
 
-  this->update_consumer_i (c_qos TAO_ENV_ARG_PARAMETER);
+  this->update_consumer_i (c_qos ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Gateway_IIOP::update_consumer_i (
     const RtecEventChannelAdmin::ConsumerQOS& c_qos
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
-  this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->lcl_ec_.in ())
@@ -186,7 +186,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
 
   // = Connect as a supplier to the local EC
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->lcl_ec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->lcl_ec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Change the RT_Info in the consumer QoS.
@@ -222,7 +222,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
           //ACE_DEBUG ((LM_DEBUG,
           //            "ECG (%t)    binding source %d\n",
           //            sid));
-          proxy = supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+          proxy = supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
           this->consumer_proxy_map_.bind (sid, proxy);
         }
@@ -237,7 +237,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
 
       // Obtain a reference to our supplier personality...
       RtecEventComm::PushSupplier_var supplier_ref =
-        this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // For each subscription by source build the set of publications
@@ -281,7 +281,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
           // ACE_SupplierQOS_Factory::debug (pub);
           (*j).int_id_->connect_push_supplier (supplier_ref.in (),
                                                pub
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -316,12 +316,12 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
 
       // Obtain a reference to our supplier personality...
       RtecEventComm::PushSupplier_var supplier_ref =
-        this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Obtain the consumer....
       this->default_consumer_proxy_ =
-        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       pub.publications.length (c);
@@ -329,23 +329,23 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
       // ACE_SupplierQOS_Factory::debug (pub);
       this->default_consumer_proxy_->connect_push_supplier (supplier_ref.in (),
                                                             pub
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
 
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->rmt_ec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->rmt_ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_is_active_ = 1;
   RtecEventComm::PushConsumer_var consumer_ref =
-    this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->consumer_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Consumer "));
@@ -353,7 +353,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
 
   this->supplier_proxy_->connect_push_consumer (consumer_ref.in (),
                                                 sub
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
@@ -361,14 +361,14 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
 void
 TAO_EC_Gateway_IIOP::update_supplier (
     const RtecEventChannelAdmin::SupplierQOS&
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing...
 }
 
 void
-TAO_EC_Gateway_IIOP::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Gateway_IIOP::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // ACE_DEBUG ((LM_DEBUG,
   //             "ECG (%t): Supplier-consumer received "
@@ -376,7 +376,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_EC_Gateway_IIOP::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Gateway_IIOP::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // ACE_DEBUG ((LM_DEBUG,
   //            "ECG (%t): Supplier received "
@@ -385,7 +385,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push (%P|%t) - \n"));
 
@@ -429,7 +429,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
       out[0].header.ttl--;
 
       // ACE_DEBUG ((LM_DEBUG, "ECG: event sent to proxy\n"));
-      proxy->push (out TAO_ENV_ARG_PARAMETER);
+      proxy->push (out ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -441,7 +441,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
     if (this->busy_count_ == 0 && this->update_posted_ != 0)
       {
         this->update_posted_ = 0;
-        this->update_consumer_i (this->c_qos_ TAO_ENV_ARG_PARAMETER);
+        this->update_consumer_i (this->c_qos_ ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -449,22 +449,22 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events
 }
 
 int
-TAO_EC_Gateway_IIOP::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_Gateway_IIOP::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
-  this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->supplier_is_active_)
     {
       PortableServer::POA_var poa =
-        this->supplier_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->supplier_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (&this->supplier_ TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (&this->supplier_ ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       this->supplier_is_active_ = 0;
     }
@@ -472,12 +472,12 @@ TAO_EC_Gateway_IIOP::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   if (this->consumer_is_active_)
     {
       PortableServer::POA_var poa =
-        this->consumer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->consumer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (&this->consumer_ TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (&this->consumer_ ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       this->consumer_is_active_ = 0;
     }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 35f630050e1..19f97e9268e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -49,7 +49,7 @@ public:
 
   /// The gateway must disconnect from all the relevant event channels,
   /// or any other communication media (such as multicast groups).
-  virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
+  virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /// Obtain and modify the observer handle.
   void observer_handle (RtecEventChannelAdmin::Observer_Handle h);
@@ -100,42 +100,42 @@ public:
   /// ECs it will connect to,
   void init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
              RtecEventChannelAdmin::EventChannel_ptr lcl_ec
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
   /// The channel is disconnecting.
-  void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// The channel is disconnecting.
-  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// This is the Consumer side behavior, it pushes the events to the
   /// local event channel.
   void push (const RtecEventComm::EventSet &events
-             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Disconnect and shutdown the gateway
-  int shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   // The following methods are documented in the base class.
-  virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  void close_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void close_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
 
 protected:
   /// Do the real work in init()
   void init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
                RtecEventChannelAdmin::EventChannel_ptr lcl_ec
-               TAO_ENV_ARG_DECL);
+               ACE_ENV_ARG_DECL);
 
 protected:
   /// Lock to synchronize internal changes
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
index a4baa6b4b42..879701a3ee7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -21,11 +21,11 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
                            RtecScheduler::Scheduler_ptr lcl_sched,
                            const char* lcl_name,
                            const char* rmt_name
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
-  this->init_i (rmt_ec, lcl_ec TAO_ENV_ARG_PARAMETER);
+  this->init_i (rmt_ec, lcl_ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ Should we throw a system exception here?
@@ -36,7 +36,7 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
     ACE_THROW (CORBA::BAD_PARAM ());
 
   this->rmt_info_ =
-    rmt_sched->create (rmt_name TAO_ENV_ARG_PARAMETER);
+    rmt_sched->create (rmt_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ TODO Many things are hard-coded in the RT_Info here.
@@ -54,11 +54,11 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
                   time,
                   0,
                   RtecScheduler::OPERATION
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->lcl_info_ =
-    lcl_sched->create (lcl_name TAO_ENV_ARG_PARAMETER);
+    lcl_sched->create (lcl_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   tv = ACE_Time_Value (0, 500);
@@ -71,6 +71,6 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
                   time,
                   1,
                   RtecScheduler::REMOTE_DEPENDANT
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
index d93e98634de..2452c13b8b7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
@@ -48,7 +48,7 @@ public:
              RtecScheduler::Scheduler_ptr lcl_sched,
              const char* lcl_name,
              const char* rmt_name
-             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 };
 
 #include "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
index 7b447516105..544bf3a1891 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
@@ -197,7 +197,7 @@ TAO_ECG_UDP_Request_Entry::fragment_buffer (CORBA::ULong fragment_offset)
 
 void
 TAO_ECG_UDP_Request_Entry::decode (RtecEventComm::EventSet& event
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   TAO_InputCDR cdr (&this->payload_,
                     ACE_static_cast(int,this->byte_order_));
@@ -234,7 +234,7 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
                             ACE_Reactor *reactor,
                             const ACE_Time_Value &expire_interval,
                             int max_timeout
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->ignore_from_ = ignore_from;
 
@@ -258,13 +258,13 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
 
 void
 TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->lcl_ec_.in ()))
     return;
 
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
-    this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (pub.publications.length () == 0)
@@ -272,15 +272,15 @@ TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub
 
   // = Connect as a supplier to the local EC
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->lcl_ec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->lcl_ec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushSupplier_var supplier_ref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Receiver (%t) Gateway/Supplier "));
@@ -288,35 +288,35 @@ TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub
 
   this->consumer_proxy_->connect_push_supplier (supplier_ref.in (),
                                                 pub
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_ECG_UDP_Receiver::close (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ECG_UDP_Receiver::close (ACE_ENV_SINGLE_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n"));
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_ECG_UDP_Receiver::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ECG_UDP_Receiver::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -325,9 +325,9 @@ TAO_ECG_UDP_Receiver::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED
 }
 
 void
-TAO_ECG_UDP_Receiver::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ECG_UDP_Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil ();
@@ -511,14 +511,14 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
       return 0;
     }
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       RtecEventComm::EventSet event;
-      entry->int_id_->decode (event TAO_ENV_ARG_PARAMETER);
+      entry->int_id_->decode (event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER);
+      this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //      ACE_DEBUG ((LM_DEBUG,
@@ -539,9 +539,9 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
 void
 TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header,
                                 RtecUDPAdmin::UDP_Addr_out addr
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
-  this->addr_server_->get_addr (header, addr TAO_ENV_ARG_PARAMETER);
+  this->addr_server_->get_addr (header, addr ACE_ENV_ARG_PARAMETER);
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
index ca2b9d534a3..c854a6abbd5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
@@ -201,7 +201,7 @@ public:
 
   /// Decode the events, the message must be complete.
   void decode (RtecEventComm::EventSet& event
-               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Increment the timeout counter...
   void inc_timeout (void);
@@ -299,17 +299,17 @@ public:
              ACE_Reactor *reactor,
              const ACE_Time_Value &expire_interval,
              int max_timeout
-             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Disconnect and shutdown the gateway, no further connectsions
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Connect to the EC using the given publications lists.
   void open (RtecEventChannelAdmin::SupplierQOS& pub
-             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Disconnect to the EC.
-  virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * The Event_Handlers call this method when data is available at the
@@ -324,13 +324,13 @@ public:
                       const void* act);
 
   // The PushSupplier method.
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Call the RtecUDPAdmin::AddrServer
   void get_addr (const RtecEventComm::EventHeader& header,
                  RtecUDPAdmin::UDP_Addr_out addr
-                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 private:
   /// The remote and the local EC, so we can reconnect when the list changes.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
index 40323210aa1..5463f77f0c1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp
@@ -14,7 +14,7 @@ void
 TAO_EC_Group_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *,
       TAO_EC_ProxyPushConsumer *
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -22,12 +22,12 @@ void
 TAO_EC_Group_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
                                         TAO_EC_ProxyPushConsumer *,
                                         TAO_EC_Supplier_Filter *filter
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   TAO_EC_QOS_Info event_info;
   // @@ yuck...
   filter->push_scheduled_event (ACE_const_cast (RtecEventComm::EventSet&,
                                                 event),
                                 event_info
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
index dc2eeb96d49..0b7b6f318be 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h
@@ -37,11 +37,11 @@ public:
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
       TAO_EC_ProxyPushConsumer *consumer
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
                                TAO_EC_Supplier_Filter *filter
-                               TAO_ENV_ARG_DECL);
+                               ACE_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Group_Scheduling
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
index 9106c478843..a93cd3cf893 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -68,10 +68,10 @@ TAO_EC_MT_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                              RtecEventComm::PushConsumer_ptr consumer,
                              const RtecEventComm::EventSet& event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -79,11 +79,11 @@ TAO_EC_MT_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                     RtecEventComm::PushConsumer_ptr consumer,
                                     RtecEventComm::EventSet& event,
                                     TAO_EC_QOS_Info&
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   // Double checked locking....
   if (this->active_ == 0)
     this->activate ();
 
-  this->task_.push (proxy, consumer, event TAO_ENV_ARG_PARAMETER);
+  this->task_.push (proxy, consumer, event ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
index 97165aecb7b..43d1db1820d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -52,12 +52,12 @@ public:
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
 private:
   /// Use our own thread manager.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
index 627c32801f0..5b9cf65242b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -45,7 +45,7 @@ TAO_EC_Masked_Type_Filter::size (void) const
 int
 TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event,
                                    TAO_EC_QOS_Info& qos_info
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   if (event.length () != 1)
     return 0;
@@ -56,7 +56,7 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event,
 
   if (this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return 1;
@@ -65,7 +65,7 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event,
 int
 TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
                                           TAO_EC_QOS_Info& qos_info
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   if (event.length () != 1)
     return 0;
@@ -76,7 +76,7 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 
   if (this->parent () != 0)
     {
-      this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return 1;
@@ -85,14 +85,14 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 void
 TAO_EC_Masked_Type_Filter::push (const RtecEventComm::EventSet &,
                                  TAO_EC_QOS_Info &
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_Masked_Type_Filter::push_nocopy (RtecEventComm::EventSet &,
                                         TAO_EC_QOS_Info &
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -122,7 +122,7 @@ int
 TAO_EC_Masked_Type_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
       const TAO_EC_QOS_Info &
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
index 6a2b6d12317..d28bb93cdcb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
@@ -53,22 +53,22 @@ public:
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Masked_Type_Filter
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
index bed3ab7655b..eb79fe48cd5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -41,14 +41,14 @@ TAO_EC_Negation_Filter::size (void) const
 int
 TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event,
                                 TAO_EC_QOS_Info& qos_info
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   int n =
-    this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
+    this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   if (this->parent () != 0 && n == 0)
     {
-      this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return 1;
@@ -57,14 +57,14 @@ TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event,
 int
 TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event,
                                    TAO_EC_QOS_Info& qos_info
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   int n =
-    this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+    this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   if (this->parent () != 0 && n == 0)
     {
-      this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return 1;
@@ -73,14 +73,14 @@ TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 void
 TAO_EC_Negation_Filter::push (const RtecEventComm::EventSet&,
                                  TAO_EC_QOS_Info&
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_Negation_Filter::push_nocopy (RtecEventComm::EventSet&,
                                         TAO_EC_QOS_Info&
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -107,7 +107,7 @@ int
 TAO_EC_Negation_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
       const TAO_EC_QOS_Info &
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
index caee63f3b70..f23700ef739 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
@@ -51,22 +51,22 @@ public:
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Negation_Filter
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index 5c78bc13fbf..d99b8ae69ea 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -14,7 +14,7 @@ void
 TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *,
       TAO_EC_ProxyPushConsumer *
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -22,7 +22,7 @@ void
 TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
                                         TAO_EC_ProxyPushConsumer *,
                                         TAO_EC_Supplier_Filter *filter
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   for (CORBA::ULong j = 0; j < event.length (); ++j)
     {
@@ -33,7 +33,7 @@ TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
 
       TAO_EC_QOS_Info event_info;
       filter->push_scheduled_event (single_event, event_info
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
index afcb63f7a0b..6ea335511d0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
@@ -38,11 +38,11 @@ public:
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
       TAO_EC_ProxyPushConsumer *consumer
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
                                TAO_EC_Supplier_Filter *filter
-                               TAO_ENV_ARG_DECL);
+                               ACE_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Null_Scheduling
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 6ea6950d196..777b034a758 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -25,7 +25,7 @@ TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void)
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Null_ObserverStrategy::append_observer (
        RtecEventChannelAdmin::Observer_ptr
-       TAO_ENV_ARG_DECL)
+       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -39,7 +39,7 @@ TAO_EC_Null_ObserverStrategy::append_observer (
 void
 TAO_EC_Null_ObserverStrategy::remove_observer (
        RtecEventChannelAdmin::Observer_Handle
-       TAO_ENV_ARG_DECL)
+       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -50,25 +50,25 @@ TAO_EC_Null_ObserverStrategy::remove_observer (
 
 void
 TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer*
-                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer*
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier*
-                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -83,7 +83,7 @@ TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void)
 RtecEventChannelAdmin::Observer_Handle
 TAO_EC_Basic_ObserverStrategy::append_observer (
        RtecEventChannelAdmin::Observer_ptr obs
-       TAO_ENV_ARG_DECL)
+       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -106,15 +106,15 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
   }
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER);
+  this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  obs->update_consumer (c_qos TAO_ENV_ARG_PARAMETER);
+  obs->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER);
+  this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  obs->update_supplier (s_qos TAO_ENV_ARG_PARAMETER);
+  obs->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return this->handle_generator_;
@@ -124,7 +124,7 @@ TAO_EC_Basic_ObserverStrategy::append_observer (
 void
 TAO_EC_Basic_ObserverStrategy::remove_observer (
        RtecEventChannelAdmin::Observer_Handle handle
-       TAO_ENV_ARG_DECL)
+       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -142,13 +142,13 @@ TAO_EC_Basic_ObserverStrategy::remove_observer (
 void
 TAO_EC_Basic_ObserverStrategy::connected (
     TAO_EC_ProxyPushConsumer *consumer
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   if (consumer->publications ().is_gateway)
     return;
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER);
+  this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int size = 0;
@@ -176,7 +176,7 @@ TAO_EC_Basic_ObserverStrategy::connected (
 
   for (int i = 0; i != size; ++i)
     {
-      copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER);
+      copy[i]->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -184,13 +184,13 @@ TAO_EC_Basic_ObserverStrategy::connected (
 void
 TAO_EC_Basic_ObserverStrategy::disconnected (
     TAO_EC_ProxyPushConsumer* consumer
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   if (consumer->publications ().is_gateway)
     return;
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER);
+  this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int size = 0;
@@ -218,7 +218,7 @@ TAO_EC_Basic_ObserverStrategy::disconnected (
 
   for (int i = 0; i != size; ++i)
     {
-      copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER);
+      copy[i]->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -226,13 +226,13 @@ TAO_EC_Basic_ObserverStrategy::disconnected (
 void
 TAO_EC_Basic_ObserverStrategy::connected (
     TAO_EC_ProxyPushSupplier* supplier
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   if (supplier->subscriptions ().is_gateway)
     return;
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER);
+  this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int size = 0;
@@ -260,7 +260,7 @@ TAO_EC_Basic_ObserverStrategy::connected (
 
   for (int i = 0; i != size; ++i)
     {
-      copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER);
+      copy[i]->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -268,13 +268,13 @@ TAO_EC_Basic_ObserverStrategy::connected (
 void
 TAO_EC_Basic_ObserverStrategy::disconnected (
     TAO_EC_ProxyPushSupplier* supplier
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   if (supplier->subscriptions ().is_gateway)
     return;
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER);
+  this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int size = 0;
@@ -302,7 +302,7 @@ TAO_EC_Basic_ObserverStrategy::disconnected (
 
   for (int i = 0; i != size; ++i)
     {
-      copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER);
+      copy[i]->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -310,12 +310,12 @@ TAO_EC_Basic_ObserverStrategy::disconnected (
 void
 TAO_EC_Basic_ObserverStrategy::fill_qos (
       RtecEventChannelAdmin::ConsumerQOS &qos
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   Headers headers;
 
   TAO_EC_Accumulate_Supplier_Headers worker (headers);
-  this->event_channel_->consumer_admin ()->for_each (&worker TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->consumer_admin ()->for_each (&worker ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::DependencySet& dep = qos.dependencies;
@@ -337,13 +337,13 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
 void
 TAO_EC_Basic_ObserverStrategy::fill_qos (
       RtecEventChannelAdmin::SupplierQOS &qos
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   Headers headers;
 
   TAO_EC_Accumulate_Consumer_Headers worker (headers);
   this->event_channel_->supplier_admin ()->for_each (&worker
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   qos.publications.length (headers.current_size ());
@@ -359,7 +359,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos (
 
 void
 TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
 {
   const RtecEventChannelAdmin::ConsumerQOS& sub =
     supplier->subscriptions ();
@@ -381,7 +381,7 @@ TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier
 
 void
 TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
 {
   const RtecEventChannelAdmin::SupplierQOS& pub =
     consumer->publications ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 1949b1047e9..c36f80e24a0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -55,7 +55,7 @@ public:
   /// The basic methods to support the EC strategies.
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -63,7 +63,7 @@ public:
     = 0;
   virtual void remove_observer (
                         RtecEventChannelAdmin::Observer_Handle
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -73,16 +73,16 @@ public:
   /// Used by the EC to inform the ObserverStrategy that a Consumer has
   /// connected or disconnected from it.
   virtual void connected (TAO_EC_ProxyPushConsumer*
-                          TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                          ACE_ENV_ARG_DECL_NOT_USED) = 0;
   virtual void disconnected (TAO_EC_ProxyPushConsumer*
-                             TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                             ACE_ENV_ARG_DECL_NOT_USED) = 0;
 
   /// Used by the EC to inform the ObserverStrategy that a Consumer has
   /// connected or disconnected from it.
   virtual void connected (TAO_EC_ProxyPushSupplier*
-                          TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                          ACE_ENV_ARG_DECL_NOT_USED) = 0;
   virtual void disconnected (TAO_EC_ProxyPushSupplier*
-                             TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                             ACE_ENV_ARG_DECL_NOT_USED) = 0;
 };
 
 // ****************************************************************
@@ -104,26 +104,26 @@ public:
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void remove_observer (
                         RtecEventChannelAdmin::Observer_Handle
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
   virtual void connected (TAO_EC_ProxyPushConsumer*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_EC_ProxyPushConsumer*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
   virtual void connected (TAO_EC_ProxyPushSupplier*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_EC_ProxyPushSupplier*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
 };
 
 // ****************************************************************
@@ -156,26 +156,26 @@ public:
   // = The TAO_EC_ObserverStrategy methods.
   virtual RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void remove_observer (
                         RtecEventChannelAdmin::Observer_Handle
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER));
   virtual void connected (TAO_EC_ProxyPushConsumer*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_EC_ProxyPushConsumer*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
   virtual void connected (TAO_EC_ProxyPushSupplier*
-                          TAO_ENV_ARG_DECL_NOT_USED);
+                          ACE_ENV_ARG_DECL_NOT_USED);
   virtual void disconnected (TAO_EC_ProxyPushSupplier*
-                             TAO_ENV_ARG_DECL_NOT_USED);
+                             ACE_ENV_ARG_DECL_NOT_USED);
 
 
   struct Observer_Entry
@@ -223,9 +223,9 @@ public:
 protected:
   /// Helper functions to compute the consumer and supplier QOS.
   void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
   void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
 
 protected:
   /// The event channel.
@@ -251,7 +251,7 @@ public:
   TAO_EC_Accumulate_Supplier_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers);
 
   virtual void work (TAO_EC_ProxyPushSupplier *supplier
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 private:
   TAO_EC_Basic_ObserverStrategy::Headers &headers_;
@@ -266,7 +266,7 @@ public:
   TAO_EC_Accumulate_Consumer_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers);
 
   virtual void work (TAO_EC_ProxyPushConsumer *consumer
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 private:
   TAO_EC_Basic_ObserverStrategy::Headers &headers_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 59415cd120a..2b7fa9d3bba 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -60,7 +60,7 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer)
 
   ACE_TRY_NEW_ENV
     {
-      this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -72,7 +72,7 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer)
 
 void
 TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -98,7 +98,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier
 #if TAO_EC_ENABLE_DEBUG_MESSAGES
           ACE_DEBUG ((LM_DEBUG, "  matched\n"));
 #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */
-          this->collection_->connected (supplier TAO_ENV_ARG_PARAMETER);
+          this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           return;
         }
@@ -110,7 +110,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier
 
 void
 TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -131,47 +131,47 @@ TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier
       if (supplier->can_match (event.header))
         {
           //          ACE_DEBUG ((LM_DEBUG, "  matched %x\n", supplier));
-          this->collection_->connected (supplier TAO_ENV_ARG_PARAMETER);
+          this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           return;
         }
     }
-  this->collection_->disconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->collection_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
-  this->collection_->disconnected (supplier TAO_ENV_ARG_PARAMETER);
+  this->collection_->disconnected (supplier ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_EC_Per_Supplier_Filter::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_Per_Supplier_Filter::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->collection_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->collection_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event,
                                   TAO_EC_ProxyPushConsumer *consumer
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   TAO_EC_Scheduling_Strategy* scheduling_strategy =
     this->event_channel_->scheduling_strategy ();
   scheduling_strategy->schedule_event (event,
                                        consumer,
                                        this
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Per_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event,
                                                   const TAO_EC_QOS_Info &event_info
-                                                  TAO_ENV_ARG_DECL)
+                                                  ACE_ENV_ARG_DECL)
 {
   TAO_EC_Filter_Worker worker (event, event_info);
-  this->collection_->for_each (&worker TAO_ENV_ARG_PARAMETER);
+  this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
index 3c66a711b74..cc6d6f8f785 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -51,18 +51,18 @@ public:
   virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
   virtual void unbind (TAO_EC_ProxyPushConsumer* consumer);
   virtual void connected (TAO_EC_ProxyPushSupplier* supplier
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
-                             TAO_ENV_ARG_DECL);
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_ProxyPushConsumer *consumer
-                     TAO_ENV_ARG_DECL_NOT_USED);
+                     ACE_ENV_ARG_DECL_NOT_USED);
   virtual void push_scheduled_event (RtecEventComm::EventSet &event,
                                      const TAO_EC_QOS_Info &event_info
-                                     TAO_ENV_ARG_DECL);
+                                     ACE_ENV_ARG_DECL);
   virtual CORBA::ULong _decr_refcnt (void);
   virtual CORBA::ULong _incr_refcnt (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index 4a4296b9e19..ed97744f809 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -25,7 +25,7 @@ TAO_EC_Filter*
 TAO_EC_Prefix_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
     RtecEventChannelAdmin::ConsumerQOS& qos
-    TAO_ENV_ARG_DECL_NOT_USED) const
+    ACE_ENV_ARG_DECL_NOT_USED) const
 {
   CORBA::ULong pos = 0;
   return this->recursive_build (supplier, qos, pos);
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
index 9622fb15350..8532908b13b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
@@ -46,7 +46,7 @@ public:
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
                         RtecEventChannelAdmin::ConsumerQOS& qos
-                        TAO_ENV_ARG_DECL) const;
+                        ACE_ENV_ARG_DECL) const;
 
 private:
   /// Recursively build the filter tree.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 6f31edc67ae..2d7a359b555 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -40,7 +40,7 @@ TAO_EC_Priority_Dispatching::activate (void)
      ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   for (int i = 0; i < this->ntasks_; ++i)
     {
       ACE_TRY
@@ -51,7 +51,7 @@ TAO_EC_Priority_Dispatching::activate (void)
           ACE_OS::sprintf (buf, "Dispatching_Task-%d.us", period);
 
           RtecScheduler::handle_t rt_info =
-            this->scheduler_->create (buf TAO_ENV_ARG_PARAMETER);
+            this->scheduler_->create (buf ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->scheduler_->set (rt_info,
@@ -64,7 +64,7 @@ TAO_EC_Priority_Dispatching::activate (void)
                                  0, // quantum
                                  1, // threads
                                  RtecScheduler::OPERATION
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -113,10 +113,10 @@ TAO_EC_Priority_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                                    RtecEventComm::PushConsumer_ptr consumer,
                                    const RtecEventComm::EventSet& event,
                                    TAO_EC_QOS_Info& qos_info
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -124,7 +124,7 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                           RtecEventComm::PushConsumer_ptr consumer,
                                           RtecEventComm::EventSet& event,
                                           TAO_EC_QOS_Info& qos_info
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   if (this->tasks_ == 0)
     this->activate ();
@@ -137,5 +137,5 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
     }
 
 
-  this->tasks_[i]->push (proxy, consumer, event TAO_ENV_ARG_PARAMETER);
+  this->tasks_[i]->push (proxy, consumer, event ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index f8b78ed2c78..ab0b8acf7e0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -60,12 +60,12 @@ public:
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
 private:
   /// Use our own thread manager.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index 68aab6c9f9c..d57458dac62 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -20,7 +20,7 @@ void
 TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
       TAO_EC_ProxyPushConsumer *consumer
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "add_proxy_supplier_dependencies - %x %x\n",
               supplier, consumer));
@@ -40,11 +40,11 @@ TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies (
                                   os_priority,
                                   p_subpriority,
                                   p_priority
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       qos_info.preemption_priority = p_priority;
 
-      supplier->add_dependencies (header, qos_info TAO_ENV_ARG_PARAMETER);
+      supplier->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -53,7 +53,7 @@ void
 TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event,
                                             TAO_EC_ProxyPushConsumer *consumer,
                                             TAO_EC_Supplier_Filter *filter
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierQOS qos =
     consumer->publications ();
@@ -84,13 +84,13 @@ TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event
                                       os_priority,
                                       p_subpriority,
                                       p_priority
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           qos_info.preemption_priority = p_priority;
         }
 
       filter->push_scheduled_event (single_event, qos_info
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
index 1bce35148a8..c0ac5d9668d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -45,11 +45,11 @@ public:
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
       TAO_EC_ProxyPushConsumer *consumer
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
                                TAO_EC_Supplier_Filter *filter
-                               TAO_ENV_ARG_DECL);
+                               ACE_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Priority_Scheduling
@@ -58,7 +58,7 @@ private:
                               (const TAO_EC_Priority_Scheduling&))
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (TAO_ENV_SINGLE_ARG_DECL);
+  void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The scheduler we are going to use
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index e8ac866557a..15c63c16b4c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -39,7 +39,7 @@ TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void)
 CORBA::Boolean
 TAO_EC_ProxyPushConsumer::supplier_non_existent (
       CORBA::Boolean_out disconnected
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var supplier;
   {
@@ -62,7 +62,7 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent (
   }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return supplier->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
@@ -70,7 +70,7 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent (
 
 void
 TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                           this->refcount_,
@@ -79,12 +79,12 @@ TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->connected (supplier TAO_ENV_ARG_PARAMETER);
+  ace_mon.filter->connected (supplier ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                           this->refcount_,
@@ -93,12 +93,12 @@ TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->reconnected (supplier TAO_ENV_ARG_PARAMETER);
+  ace_mon.filter->reconnected (supplier ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
                                           this->refcount_,
@@ -107,29 +107,29 @@ TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier
   if (!ace_mon.locked ())
     return;
 
-  ace_mon.filter->disconnected (supplier TAO_ENV_ARG_PARAMETER);
+  ace_mon.filter->disconnected (supplier ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushConsumer*
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushConsumer*
-                                       TAO_ENV_ARG_DECL_NOT_USED)
+                                       ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer*
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventComm::PushSupplier_var supplier;
 
@@ -144,14 +144,14 @@ TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 
     if (this->filter_ != 0)
       {
-        this->filter_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->filter_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
 
         this->cleanup_i ();
       }
   }
 
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (supplier.in ()))
@@ -159,7 +159,7 @@ TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -186,14 +186,14 @@ TAO_EC_ProxyPushConsumer::cleanup_i (void)
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_EC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushConsumer::activate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var result;
   ACE_TRY
     {
       result =
-        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -205,17 +205,17 @@ TAO_EC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_EC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -254,7 +254,7 @@ void
 TAO_EC_ProxyPushConsumer::connect_push_supplier (
       RtecEventComm::PushSupplier_ptr push_supplier,
       const RtecEventChannelAdmin::SupplierQOS& qos
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecEventChannelAdmin::AlreadyConnected))
 {
@@ -285,7 +285,7 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier (
           // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER);
+          this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -311,12 +311,12 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier (
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_,
@@ -328,13 +328,13 @@ TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event
 
   // No need to keep the lock, the filter_ class is supposed to be
   // thread safe....
-  ace_mon.filter->push (event, this TAO_ENV_ARG_PARAMETER);
+  ace_mon.filter->push (event, this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_EC_ProxyPushConsumer::disconnect_push_consumer (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::PushSupplier_var supplier;
@@ -356,7 +356,7 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer (
   }
 
   // Notify the event channel...
-  this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (supplier.in ()))
@@ -368,7 +368,7 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer (
     {
       ACE_TRY
         {
-          supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+          supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -381,19 +381,19 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer (
 }
 
 PortableServer::POA_ptr
-TAO_EC_ProxyPushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_EC_ProxyPushConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_EC_ProxyPushConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 902912a2183..10159ac8bd6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -62,10 +62,10 @@ public:
   virtual ~TAO_EC_ProxyPushConsumer (void);
 
   /// Activate in the POA
-  virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Return 0 if no supplier is connected...
   CORBA::Boolean is_connected (void) const;
@@ -83,28 +83,28 @@ public:
    * <disconnected> flag.
    */
   CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected
-                                        TAO_ENV_ARG_DECL);
+                                        ACE_ENV_ARG_DECL);
 
   /// Concrete implementations can use this methods to keep track of
   /// the consumers interested in this events.
   virtual void connected (TAO_EC_ProxyPushSupplier* supplier
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /// Usually implemented as no-ops, but some configurations may
   /// require this methods.
   virtual void connected (TAO_EC_ProxyPushConsumer* consumer
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /// The event channel is shutting down
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// The QoS (subscription) used to connect to the EC, assumes the
   /// locks are held, use with care!
@@ -118,19 +118,19 @@ public:
   virtual void connect_push_supplier (
                 RtecEventComm::PushSupplier_ptr push_supplier,
                 const RtecEventChannelAdmin::SupplierQOS& qos
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected));
   virtual void push (const RtecEventComm::EventSet& event
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 protected:
   /// Set the supplier, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 6ceb4cf2028..be322c6c6a7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -39,54 +39,54 @@ TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void)
 
 void
 TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer* consumer
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   TAO_EC_Scheduling_Strategy *s =
     this->event_channel_->scheduling_strategy ();
 
   s->add_proxy_supplier_dependencies (this,
                                       consumer
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushConsumer* consumer
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   TAO_EC_Scheduling_Strategy *s =
     this->event_channel_->scheduling_strategy ();
 
   s->add_proxy_supplier_dependencies (this,
                                       consumer
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer*
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier*
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushSupplier*
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Save the consumer we where connected to, we need to send a
   // disconnect message to it.
@@ -106,7 +106,7 @@ TAO_EC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
       this->cleanup_i ();
   }
 
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (consumer.in ()))
@@ -114,7 +114,7 @@ TAO_EC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -138,14 +138,14 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void)
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_EC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushSupplier::activate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var result;
   ACE_TRY
     {
       result =
-        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -157,17 +157,17 @@ TAO_EC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_EC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (())
+TAO_EC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (())
 {
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -206,7 +206,7 @@ void
 TAO_EC_ProxyPushSupplier::connect_push_consumer (
       RtecEventComm::PushConsumer_ptr push_consumer,
       const RtecEventChannelAdmin::ConsumerQOS& qos
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecEventChannelAdmin::AlreadyConnected,
                      RtecEventChannelAdmin::TypeError))
@@ -236,7 +236,7 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
         this->child_ =
           this->event_channel_->filter_builder ()->build (this,
                                                           this->qos_
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         this->adopt_child (this->child_);
@@ -250,7 +250,7 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
           // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
-          this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER);
+          this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -272,19 +272,19 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
     this->child_ =
       this->event_channel_->filter_builder ()->build (this,
                                                       this->qos_
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     this->adopt_child (this->child_);
   }
 
   // Notify the event channel...
-  this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventComm::PushConsumer_var consumer;
@@ -305,7 +305,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
   }
 
   // Notify the event channel....
-  this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!connected)
@@ -317,7 +317,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
     {
       ACE_TRY
         {
-          consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+          consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -332,7 +332,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
 }
 
 void
-TAO_EC_ProxyPushSupplier::suspend_connection (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (
@@ -345,7 +345,7 @@ TAO_EC_ProxyPushSupplier::suspend_connection (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_EC_ProxyPushSupplier::resume_connection (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (
@@ -362,7 +362,7 @@ typedef TAO_ESF_Proxy_RefCount_Guard<TAO_EC_Event_Channel,TAO_EC_ProxyPushSuppli
 int
 TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
                                   TAO_EC_QOS_Info& qos_info
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -379,7 +379,7 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
       return 0;
 
     result =
-      this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
   }
   return result;
@@ -388,7 +388,7 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
 int
 TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
                                          TAO_EC_QOS_Info& qos_info
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
 {
   Destroy_Guard auto_destroy (this->refcount_,
                               this->event_channel_,
@@ -405,7 +405,7 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
       return 0;
 
     result =
-      this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
   }
   return result;
@@ -414,7 +414,7 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
 void
 TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
                                 TAO_EC_QOS_Info& qos_info
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   // The mutex is already held by the caller (usually the filter()
   // method)
@@ -450,7 +450,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
                                                 consumer.in (),
                                                 event,
                                                 qos_info
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -461,7 +461,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
 void
 TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
                                        TAO_EC_QOS_Info& qos_info
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   // The mutex is already held by the caller (usually the filter()
   // method)
@@ -496,7 +496,7 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
                                                        consumer.in (),
                                                        event,
                                                        qos_info
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -508,7 +508,7 @@ void
 TAO_EC_ProxyPushSupplier::push_to_consumer (
     RtecEventComm::PushConsumer_ptr consumer,
     const RtecEventComm::EventSet& event
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   {
     ACE_GUARD_THROW_EX (
@@ -525,7 +525,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
 
   ACE_TRY
     {
-      consumer->push (event TAO_ENV_ARG_PARAMETER);
+      consumer->push (event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
@@ -542,7 +542,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
           TAO_EC_ConsumerControl *control =
             this->event_channel_->consumer_control ();
 
-          control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER);
+          control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -562,7 +562,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer (
 
           control->system_exception (this,
                                      sysex
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -577,11 +577,11 @@ void
 TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
     RtecEventComm::PushConsumer_ptr consumer,
     const RtecEventComm::EventSet& event
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      consumer->push (event TAO_ENV_ARG_PARAMETER);
+      consumer->push (event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used)
@@ -589,7 +589,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
       TAO_EC_ConsumerControl *control =
         this->event_channel_->consumer_control ();
 
-      control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER);
+      control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -599,7 +599,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
 
       control->system_exception (this,
                                  sysex
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   ACE_CATCHANY
@@ -612,7 +612,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
 CORBA::Boolean
 TAO_EC_ProxyPushSupplier::consumer_non_existent (
       CORBA::Boolean_out disconnected
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var consumer;
   {
@@ -632,7 +632,7 @@ TAO_EC_ProxyPushSupplier::consumer_non_existent (
   }
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  return consumer->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return consumer->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
 #else
   return 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
@@ -670,7 +670,7 @@ int
 TAO_EC_ProxyPushSupplier::add_dependencies (
       const RtecEventComm::EventHeader &header,
       const TAO_EC_QOS_Info &qos_info
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (
           ACE_Lock, ace_mon, *this->lock_,
@@ -679,23 +679,23 @@ TAO_EC_ProxyPushSupplier::add_dependencies (
 
   return this->child_->add_dependencies (header,
                                          qos_info
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_EC_ProxyPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_EC_ProxyPushSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_EC_ProxyPushSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->_decr_refcnt ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index 7a74c6c5c83..13c6b12a2d5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -62,10 +62,10 @@ public:
   virtual ~TAO_EC_ProxyPushSupplier (void);
 
   /// Activate in the POA
-  virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Deactivate from the POA
-  virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (());
+  virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (());
 
   /// Return 0 if no consumer is connected...
   CORBA::Boolean is_connected (void) const;
@@ -85,32 +85,32 @@ public:
   /// Concrete implementations can use this methods to keep track of
   /// the suppliers that publish its events.
   virtual void connected (TAO_EC_ProxyPushConsumer *consumer
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (TAO_EC_ProxyPushConsumer *consumer
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (TAO_EC_ProxyPushConsumer *consumer
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
   /// Usually implemented as no-ops, but some configurations may
   /// require this methods.
   virtual void connected (TAO_EC_ProxyPushSupplier *supplier
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /// The event channel is shutting down
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Pushes to the consumer, verifies that it is connected and that it
   /// is not suspended.
   void push_to_consumer (RtecEventComm::PushConsumer_ptr consumer,
                          const RtecEventComm::EventSet &event
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   void reactive_push_to_consumer (RtecEventComm::PushConsumer_ptr consumer,
                                   const RtecEventComm::EventSet &event
-                                  TAO_ENV_ARG_DECL);
+                                  ACE_ENV_ARG_DECL);
 
   /**
    * Invoke the _non_existent() pseudo-operation on the consumer. If
@@ -118,21 +118,21 @@ public:
    * <disconnected> flag.
    */
   CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected
-                                        TAO_ENV_ARG_DECL);
+                                        ACE_ENV_ARG_DECL);
 
   // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
                 RtecEventComm::PushConsumer_ptr push_consumer,
                 const RtecEventChannelAdmin::ConsumerQOS &qos
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError));
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Increment and decrement the reference count.
@@ -142,27 +142,27 @@ public:
   // = The TAO_EC_Filter methods, only push() is implemented...
   virtual int filter (const RtecEventComm::EventSet &event,
                       TAO_EC_QOS_Info& qos_info
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet &event,
                              TAO_EC_QOS_Info &qos_info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet &event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet &event,
                             TAO_EC_QOS_Info &qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader &header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader &header,
                                 const TAO_EC_QOS_Info &qos_info
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
   // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
   /// Set the consumer, used by some implementations to change the
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
index 8599a2632bc..7ab7c5e6e20 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -72,10 +72,10 @@ TAO_EC_RTCORBA_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
                              RtecEventComm::PushConsumer_ptr consumer,
                              const RtecEventComm::EventSet& event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER);
+  this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -83,10 +83,10 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                                          RtecEventComm::PushConsumer_ptr consumer,
                                          RtecEventComm::EventSet& event,
                                          TAO_EC_QOS_Info&
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
 {
   RTCORBA::Priority current_priority =
-    this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i != this->lanes_.length (); ++i)
@@ -98,7 +98,7 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
       // some...
 
       this->tasks_[i].push (proxy, consumer, event
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       break;
     }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
index ab75cb13e33..e5d4508c2b6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h
@@ -51,12 +51,12 @@ public:
                      RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
                             RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
 private:
   /// The thread pools...
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
index ffeaf1d754f..28e88b335ec 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -49,17 +49,17 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel *)
       int argc = 0;
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, 0, ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       CORBA::Object_var obj =
         orb->resolve_initial_references ("PriorityMappingManager"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMappingManager_var priority_mapping_manager =
         RTCORBA::PriorityMappingManager::_narrow (obj.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMapping *priority_mapping =
@@ -67,10 +67,10 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel *)
 
       obj =
         orb->resolve_initial_references ("RTCurrent"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       RTCORBA::Current_var current =
         RTCORBA::Current::_narrow (obj.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_NEW_RETURN (dispatching,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index f7e4467928a..659e6f0250b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -36,11 +36,11 @@ TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl (void)
 
 void
 TAO_EC_Reactive_ConsumerControl::query_consumers (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_EC_Ping_Consumer worker (this);
   this->event_channel_->consumer_admin ()->for_each (&worker
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -56,26 +56,26 @@ TAO_EC_Reactive_ConsumerControl::handle_timeout (
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
         this->policy_current_->get_policy_overrides (types
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
                                                    CORBA::ADD_OVERRIDE
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Query the state of the consumers...
-      this->query_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
                                                    CORBA::SET_OVERRIDE
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -102,12 +102,12 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
         this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_ =
         CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Pre-compute the policy list to the set the right timeout
@@ -122,7 +122,7 @@ TAO_EC_Reactive_ConsumerControl::activate (void)
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                any
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -145,14 +145,14 @@ TAO_EC_Reactive_ConsumerControl::shutdown (void)
 void
 TAO_EC_Reactive_ConsumerControl::consumer_not_exist (
       TAO_EC_ProxyPushSupplier *proxy
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       //ACE_DEBUG ((LM_DEBUG,
       //            "EC_Reactive_ConsumerControl(%P|%t) - "
       //            "Consumer %x does not exists\n", long(proxy)));
-      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -168,7 +168,7 @@ void
 TAO_EC_Reactive_ConsumerControl::system_exception (
       TAO_EC_ProxyPushSupplier *proxy,
       CORBA::SystemException & /* exception */
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -182,7 +182,7 @@ TAO_EC_Reactive_ConsumerControl::system_exception (
       //   return;
 
       // Anything else is serious, including timeouts...
-      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -213,24 +213,24 @@ TAO_EC_ConsumerControl_Adapter::handle_timeout (
 
 void
 TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
         supplier->consumer_non_existent (disconnected
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (non_existent && !disconnected)
         {
-          this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
+          this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
+      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
@@ -238,7 +238,7 @@ TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier
       // This is TAO's minor code for a failed connection, we may
       // want to be more lenient in the future..
       // if (transient.minor () == 0x54410085)
-      this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER);
+      this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index eddff6b86c9..7c363bf9876 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -81,15 +81,15 @@ public:
   virtual int activate (void);
   virtual int shutdown (void);
   virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy
-                                   TAO_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL_NOT_USED);
   virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy,
                                  CORBA::SystemException &
-                                 TAO_ENV_ARG_DECL_NOT_USED);
+                                 ACE_ENV_ARG_DECL_NOT_USED);
 
 private:
   /// Check if the consumers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_consumers (TAO_ENV_SINGLE_ARG_DECL);
+  void query_consumers (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The polling rate
@@ -122,7 +122,7 @@ public:
   TAO_EC_Ping_Consumer (TAO_EC_ConsumerControl *control);
 
   virtual void work (TAO_EC_ProxyPushSupplier *supplier
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 private:
   TAO_EC_ConsumerControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index 4104bcca997..bfb106ef3e3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -36,11 +36,11 @@ TAO_EC_Reactive_SupplierControl::~TAO_EC_Reactive_SupplierControl (void)
 
 void
 TAO_EC_Reactive_SupplierControl::query_suppliers (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_EC_Ping_Supplier worker (this);
   this->event_channel_->supplier_admin ()->for_each (&worker
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -56,26 +56,26 @@ TAO_EC_Reactive_SupplierControl::handle_timeout (
       CORBA::PolicyTypeSeq types;
       CORBA::PolicyList_var policies =
         this->policy_current_->get_policy_overrides (types
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Change the timeout
       this->policy_current_->set_policy_overrides (this->policy_list_,
                                                    CORBA::ADD_OVERRIDE
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Query the state of the suppliers...
-      this->query_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_->set_policy_overrides (policies.in (),
                                                    CORBA::SET_OVERRIDE
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       for (CORBA::ULong i = 0; i != policies->length (); ++i)
         {
-          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -102,12 +102,12 @@ TAO_EC_Reactive_SupplierControl::activate (void)
       // Get the PolicyCurrent object
       CORBA::Object_var tmp =
         this->orb_->resolve_initial_references ("PolicyCurrent"
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->policy_current_ =
         CORBA::PolicyCurrent::_narrow (tmp.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Pre-compute the policy list to the set the right timeout
@@ -122,7 +122,7 @@ TAO_EC_Reactive_SupplierControl::activate (void)
         this->orb_->create_policy (
                Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                any
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -145,14 +145,14 @@ TAO_EC_Reactive_SupplierControl::shutdown (void)
 void
 TAO_EC_Reactive_SupplierControl::supplier_not_exist (
       TAO_EC_ProxyPushConsumer *proxy
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       //ACE_DEBUG ((LM_DEBUG,
       //            "EC_Reactive_SupplierControl(%P|%t) - "
       //            "Consumer %x does not exists\n", long(proxy)));
-      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -166,7 +166,7 @@ void
 TAO_EC_Reactive_SupplierControl::system_exception (
       TAO_EC_ProxyPushConsumer *proxy,
       CORBA::SystemException & /* exception */
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -180,7 +180,7 @@ TAO_EC_Reactive_SupplierControl::system_exception (
       //   return;
 
       // Anything else is serious, including timeouts...
-      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -211,24 +211,24 @@ TAO_EC_SupplierControl_Adapter::handle_timeout (
 
 void
 TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::Boolean disconnected;
       CORBA::Boolean non_existent =
         consumer->supplier_non_existent (disconnected
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (non_existent && !disconnected)
         {
-          this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
+          this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
+      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TRANSIENT, transient)
@@ -236,7 +236,7 @@ TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer
       // This is TAO's minor code for a failed connection, we may
       // want to be more lenient in the future..
       // if (transient.minor () == 0x54410085)
-      this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER);
+      this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index ef97e4677df..3eafb702595 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -81,15 +81,15 @@ public:
   virtual int activate (void);
   virtual int shutdown (void);
   virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy
-                                   TAO_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL_NOT_USED);
   virtual void system_exception (TAO_EC_ProxyPushConsumer *proxy,
                                  CORBA::SystemException &
-                                 TAO_ENV_ARG_DECL_NOT_USED);
+                                 ACE_ENV_ARG_DECL_NOT_USED);
 
 private:
   /// Check if the suppliers still exists.  It is a helper method for
   /// handle_timeout() to isolate the exceptions.
-  void query_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+  void query_suppliers (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The polling rate
@@ -122,7 +122,7 @@ public:
   TAO_EC_Ping_Supplier (TAO_EC_SupplierControl *control);
 
   virtual void work (TAO_EC_ProxyPushConsumer *consumer
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 private:
   TAO_EC_SupplierControl *control_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
index 6306943ef3f..7391d41bd8c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -56,25 +56,25 @@ TAO_EC_Sched_Filter::size (void) const
 int
 TAO_EC_Sched_Filter::filter (const RtecEventComm::EventSet &event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
-  return this->body_->filter (event, qos_info TAO_ENV_ARG_PARAMETER);
+  return this->body_->filter (event, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 int
 TAO_EC_Sched_Filter::filter_nocopy (RtecEventComm::EventSet &event,
                                     TAO_EC_QOS_Info& qos_info
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  return this->body_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+  return this->body_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 // This is private, so we can make it inline in the .cpp file...
 void
 TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
-  this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   qos_info.rt_info = this->rt_info_;
@@ -94,7 +94,7 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
                                     os_priority,
                                     p_subpriority,
                                     p_priority
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
         qos_info.preemption_priority = p_priority;
       }
@@ -104,14 +104,14 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info
 void
 TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event,
                            TAO_EC_QOS_Info& qos_info
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
     {
-      this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER);
+      this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -119,14 +119,14 @@ TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event,
 void
 TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event,
                                   TAO_EC_QOS_Info& qos_info
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
     {
-      this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER);
+      this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -152,25 +152,25 @@ TAO_EC_Sched_Filter::can_match (const RtecEventComm::EventHeader& header) const
 int
 TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
                                        const TAO_EC_QOS_Info &qos_info
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
-  this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   int matches = this->body_->add_dependencies (header,
                                                qos_info
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (matches != 0)
     {
       this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1,
                                         RtecBase::TWO_WAY_CALL
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (qos_info.rt_info TAO_ENV_ARG_PARAMETER);
+        this->scheduler_->get (qos_info.rt_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   this->name_.c_str (),
@@ -180,7 +180,7 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin (); i != end; ++i)
     {
-      (*i)->add_dependencies (header, qos_info TAO_ENV_ARG_PARAMETER);
+      (*i)->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return 0;
@@ -188,16 +188,16 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
 
 void
 TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
-  this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   qos_info.rt_info = this->rt_info_;
 }
 
 void
-TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->rt_info_computed_)
     return;
@@ -214,7 +214,7 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL)
                          0, // quantum
                          0, // threads
                          this->info_type_
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #if 0
@@ -224,17 +224,17 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL)
       TAO_EC_Filter* filter = *i;
 
       TAO_EC_QOS_Info child;
-      filter->get_qos_info (child TAO_ENV_ARG_PARAMETER);
+      filter->get_qos_info (child ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->scheduler_->add_dependency (this->rt_info_,
                                         child.rt_info, 1,
                                         RtecBase::TWO_WAY_CALL
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (child.rt_info TAO_ENV_ARG_PARAMETER);
+        this->scheduler_->get (child.rt_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   info->entry_point.in (),
@@ -250,11 +250,11 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL)
                                         this->body_info_,
                                         1,
                                         RtecBase::TWO_WAY_CALL
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       RtecScheduler::RT_Info_var info =
-        this->scheduler_->get (this->body_info_ TAO_ENV_ARG_PARAMETER);
+        this->scheduler_->get (this->body_info_ ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
                   info->entry_point.in (),
@@ -267,11 +267,11 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL)
                                     this->rt_info_,
                                     1,
                                     RtecBase::TWO_WAY_CALL
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecScheduler::RT_Info_var info =
-    this->scheduler_->get (this->parent_info_ TAO_ENV_ARG_PARAMETER);
+    this->scheduler_->get (this->parent_info_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n",
               this->name_.c_str (),
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index 69accbb1460..79c214263cf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -64,24 +64,24 @@ public:
   virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
   virtual void get_qos_info (TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Sched_Filter
@@ -90,11 +90,11 @@ private:
                               (const TAO_EC_Sched_Filter&))
 
   /// Initialize our RT_Info handle and dependencies
-  void init_rt_info (TAO_ENV_SINGLE_ARG_DECL);
+  void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Compute a new qos_info to push up.
   void compute_qos_info (TAO_EC_QOS_Info& qos_info
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
 
 private:
   /// The RT_Info handle for this object
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 5f81a9b265a..593fdc01afd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -23,25 +23,25 @@ TAO_EC_Filter*
 TAO_EC_Sched_Filter_Builder::build (
     TAO_EC_ProxyPushSupplier *supplier,
     RtecEventChannelAdmin::ConsumerQOS& qos
-    TAO_ENV_ARG_DECL) const
+    ACE_ENV_ARG_DECL) const
 {
   CORBA::ULong pos = 0;
   CORBA::Object_var tmp =
     this->event_channel_->scheduler ();
 
   RtecScheduler::Scheduler_var scheduler =
-    RtecScheduler::Scheduler::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER);
+    RtecScheduler::Scheduler::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // @@ How do we figure out which parent???
   RtecScheduler::handle_t parent_info =
-    scheduler->lookup ("Dispatching_Task-250000.us" TAO_ENV_ARG_PARAMETER);
+    scheduler->lookup ("Dispatching_Task-250000.us" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return this->recursive_build (supplier, qos, pos,
                                 scheduler.in (),
                                 parent_info
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_EC_Filter*
@@ -51,7 +51,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
     CORBA::ULong& pos,
     RtecScheduler::Scheduler_ptr scheduler,
     RtecScheduler::handle_t parent_info
-    TAO_ENV_ARG_DECL) const
+    ACE_ENV_ARG_DECL) const
 {
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
 
@@ -61,11 +61,11 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
       ACE_CString name;
       this->recursive_name (qos, npos,
                             scheduler, name
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       RtecScheduler::handle_t rt_info =
-        scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER);
+        scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       pos++; // Consume the designator
@@ -78,7 +78,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
           children[i] = this->recursive_build (supplier, qos, pos,
                                                scheduler,
                                                rt_info
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
 
@@ -94,7 +94,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                                            RtecScheduler::CONJUNCTION),
                       0);
       TAO_EC_QOS_Info qos_info;
-      filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER);
+      filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
       // @@
       ACE_CHECK_RETURN (0);
       return filter;
@@ -106,11 +106,11 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
       ACE_CString name;
       this->recursive_name (qos, npos,
                             scheduler, name
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       RtecScheduler::handle_t rt_info =
-        scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER);
+        scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       pos++; // Consume the designator
@@ -123,7 +123,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
           children[i] = this->recursive_build (supplier, qos, pos,
                                                scheduler,
                                                rt_info
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
       TAO_EC_Sched_Filter *filter;
@@ -139,7 +139,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                       0);
 
       TAO_EC_QOS_Info qos_info;
-      filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER);
+      filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
       // @@
       ACE_CHECK_RETURN (0);
       return filter;
@@ -161,7 +161,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
 
       TAO_EC_QOS_Info qos_info;
       qos_info.rt_info =
-        scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER);
+        scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Convert the time to the proper units....
@@ -179,14 +179,14 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                       0, // quantum
                       1, // threads
                       RtecScheduler::OPERATION
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       scheduler->add_dependency (qos_info.rt_info,
                                  parent_info,
                                  1,
                                  RtecBase::TWO_WAY_CALL
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       return new TAO_EC_Timeout_Filter (this->event_channel_,
@@ -199,14 +199,14 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
   RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info;
 
   RtecScheduler::RT_Info_var info =
-    scheduler->get (body_info TAO_ENV_ARG_PARAMETER);
+    scheduler->get (body_info ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_CString name = info->entry_point.in ();
   name += "#rep";
 
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER);
+    scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   pos++;
@@ -222,7 +222,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build (
                   0);
 
   TAO_EC_QOS_Info qos_info;
-  filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER);
+  filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER);
   // @@
   ACE_CHECK_RETURN (0);
   return filter;
@@ -234,7 +234,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
     CORBA::ULong& pos,
     RtecScheduler::Scheduler_ptr scheduler,
     ACE_CString& name
-    TAO_ENV_ARG_DECL) const
+    ACE_ENV_ARG_DECL) const
 {
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
 
@@ -249,7 +249,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
           this->recursive_name (qos, pos,
                                 scheduler,
                                 child_name
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           if (i == 0)
@@ -274,7 +274,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
           this->recursive_name (qos, pos,
                                 scheduler,
                                 child_name
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           if (i == 0)
@@ -305,7 +305,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name (
   RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info;
 
   RtecScheduler::RT_Info_var info =
-    scheduler->get (body_info TAO_ENV_ARG_PARAMETER);
+    scheduler->get (body_info ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   name = info->entry_point.in ();
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
index 138c02e7d04..6a3f89b5922 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
@@ -48,7 +48,7 @@ public:
   // = The TAO_EC_Filter_Builder methods...
   TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
                         RtecEventChannelAdmin::ConsumerQOS& qos
-                        TAO_ENV_ARG_DECL) const;
+                        ACE_ENV_ARG_DECL) const;
 
 private:
   /// Recursively build the filter tree.
@@ -57,14 +57,14 @@ private:
                                   CORBA::ULong& pos,
                                   RtecScheduler::Scheduler_ptr scheduler,
                                   RtecScheduler::handle_t parent_info
-                                  TAO_ENV_ARG_DECL) const;
+                                  ACE_ENV_ARG_DECL) const;
 
   /// Build the name recursively...
   void recursive_name (RtecEventChannelAdmin::ConsumerQOS& qos,
                        CORBA::ULong& pos,
                        RtecScheduler::Scheduler_ptr scheduler,
                        ACE_CString &name
-                       TAO_ENV_ARG_DECL) const;
+                       ACE_ENV_ARG_DECL) const;
 
   /// Count the number of children of the current node, i.e. until a
   /// conjunction or disjunction starts.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index 041b592542c..6cf200b1d79 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -49,14 +49,14 @@ public:
   virtual void add_proxy_supplier_dependencies (
       TAO_EC_ProxyPushSupplier *supplier,
       TAO_EC_ProxyPushConsumer *consumer
-      TAO_ENV_ARG_DECL) = 0;
+      ACE_ENV_ARG_DECL) = 0;
 
   /// Schedule an event set and deliver them to the filter in the
   /// desired order and grouping.
   virtual void schedule_event (const RtecEventComm::EventSet &event,
                                TAO_EC_ProxyPushConsumer *consumer,
                                TAO_EC_Supplier_Filter *filter
-                               TAO_ENV_ARG_DECL) = 0;
+                               ACE_ENV_ARG_DECL) = 0;
 
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index b58780478d0..f01244e6b09 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -26,14 +26,14 @@ TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void)
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_EC_SupplierAdmin::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->obtain (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_EC_SupplierAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index 73e32e18315..a2258add619 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -50,11 +50,11 @@ public:
 
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
           ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// Store the default POA.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
index f80673b22f0..5e93d9f680b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -30,7 +30,7 @@ TAO_EC_SupplierControl::shutdown (void)
 
 void
 TAO_EC_SupplierControl::supplier_not_exist (TAO_EC_ProxyPushConsumer *
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
index 8c1594f11c5..67ee778ea2f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
@@ -56,7 +56,7 @@ public:
    * CORBA::OBJECT_NOT_EXIST exception has been raised).
    */
   virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy
-                                   TAO_ENV_ARG_DECL_NOT_USED);
+                                   ACE_ENV_ARG_DECL_NOT_USED);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
index 180cf20432c..9267b8c4bbd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -18,8 +18,8 @@ TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void)
 
 void
 TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   TAO_EC_QOS_Info qos_info = this->event_info_;
-  supplier->filter (this->event_, qos_info TAO_ENV_ARG_PARAMETER);
+  supplier->filter (this->event_, qos_info ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index 890f916d85d..0454161f24d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -90,26 +90,26 @@ public:
   /// Concrete implementations can use this methods to keep track of
   /// the consumers interested in this events.
   virtual void connected (TAO_EC_ProxyPushSupplier *supplier
-                          TAO_ENV_ARG_DECL) = 0;
+                          ACE_ENV_ARG_DECL) = 0;
   virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier
-                          TAO_ENV_ARG_DECL) = 0;
+                          ACE_ENV_ARG_DECL) = 0;
   virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier
-                             TAO_ENV_ARG_DECL) = 0;
+                             ACE_ENV_ARG_DECL) = 0;
 
   /// The event channel is shutting down.
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
   /// The ProxyPushConsumer delegates on this class to actually send
   /// the event.
   virtual void push (const RtecEventComm::EventSet &event,
                      TAO_EC_ProxyPushConsumer *consumer
-                     TAO_ENV_ARG_DECL) = 0;
+                     ACE_ENV_ARG_DECL) = 0;
 
   /// Events are first scheduled by the TAO_EC_Scheduling_Strategy,
   /// and then pushed through this class again.
   virtual void push_scheduled_event (RtecEventComm::EventSet &event,
                                      const TAO_EC_QOS_Info &event_info
-                                     TAO_ENV_ARG_DECL) = 0;
+                                     ACE_ENV_ARG_DECL) = 0;
 
   /// Increment and decrement the reference count, locking must be
   /// provided by the user.
@@ -126,7 +126,7 @@ public:
                         const TAO_EC_QOS_Info &event_info);
 
   virtual void work (TAO_EC_ProxyPushSupplier *supplier
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 private:
   /// The event we push on each case, use a reference to avoid copies.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index 0753bd74bcc..1a356171387 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -66,25 +66,25 @@ TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter (void)
 void
 TAO_EC_Timeout_Filter::push_to_proxy (const RtecEventComm::EventSet& event,
                                       TAO_EC_QOS_Info& qos_info
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   qos_info.timer_id_ = this->id_;
 
   if (this->supplier_ != 0)
     this->supplier_->filter (event,
                              qos_info
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 int
 TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event,
                                TAO_EC_QOS_Info &qos_info
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   if (qos_info.timer_id_ == this->id_
       && this->parent () != 0)
     {
-      this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       return 1;
     }
@@ -94,12 +94,12 @@ TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event,
 int
 TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event,
                                       TAO_EC_QOS_Info &qos_info
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   if (qos_info.timer_id_ == this->id_
       && this->parent () != 0)
     {
-      this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       return 1;
     }
@@ -109,14 +109,14 @@ TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event,
 void
 TAO_EC_Timeout_Filter::push (const RtecEventComm::EventSet&,
                           TAO_EC_QOS_Info&
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_Timeout_Filter::push_nocopy (RtecEventComm::EventSet&,
                                     TAO_EC_QOS_Info&
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -159,7 +159,7 @@ int
 TAO_EC_Timeout_Filter::add_dependencies (
       const RtecEventComm::EventHeader&,
       const TAO_EC_QOS_Info &
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
index a0cb386b195..9240db0d29b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
@@ -57,28 +57,28 @@ public:
   /// Callback from the Timeout_Generator
   void push_to_proxy (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Timeout_Filter
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index 8ee6be22be4..40552d214d2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -42,7 +42,7 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */,
       TAO_EC_QOS_Info qos_info = filter->qos_info ();
       filter->push_to_proxy (single_event,
                              qos_info
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
index f4182620759..5e8f5a789bb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -34,48 +34,48 @@ TAO_EC_Trivial_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer*)
 
 void
 TAO_EC_Trivial_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier*
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_Trivial_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier*
-                                             TAO_ENV_ARG_DECL_NOT_USED)
+                                             ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier*
-                                              TAO_ENV_ARG_DECL_NOT_USED)
+                                              ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_EC_Trivial_Supplier_Filter::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EC_Trivial_Supplier_Filter::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
 void
 TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event,
                                       TAO_EC_ProxyPushConsumer *consumer
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   TAO_EC_Scheduling_Strategy* scheduling_strategy =
     this->event_channel_->scheduling_strategy ();
   scheduling_strategy->schedule_event (event,
                                        consumer,
                                        this
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Trivial_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event,
                                                       const TAO_EC_QOS_Info &event_info
-                                                      TAO_ENV_ARG_DECL)
+                                                      ACE_ENV_ARG_DECL)
 {
   TAO_EC_Filter_Worker worker (event, event_info);
   this->event_channel_->consumer_admin ()->for_each (&worker
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
index b39fe982298..e0534b2f37a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -48,18 +48,18 @@ public:
   virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
   virtual void unbind (TAO_EC_ProxyPushConsumer* consumer);
   virtual void connected (TAO_EC_ProxyPushSupplier* supplier
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier
-                             TAO_ENV_ARG_DECL);
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_ProxyPushConsumer *consumer
-                     TAO_ENV_ARG_DECL_NOT_USED);
+                     ACE_ENV_ARG_DECL_NOT_USED);
   virtual void push_scheduled_event (RtecEventComm::EventSet &event,
                                      const TAO_EC_QOS_Info &event_info
-                                     TAO_ENV_ARG_DECL);
+                                     ACE_ENV_ARG_DECL);
   virtual CORBA::ULong _decr_refcnt (void);
   virtual CORBA::ULong _incr_refcnt (void);
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index 5ea4a8cd2b2..04db9a3eb61 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -16,14 +16,14 @@ TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header
 int
 TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   if (event.length () != 1)
-    return this->filter_set (event, qos_info TAO_ENV_ARG_PARAMETER);
+    return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER);
 
   if (this->can_match (event[0].header))
     {
-      this->push (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->push (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       return 1;
     }
@@ -33,14 +33,14 @@ TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event,
 int
 TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
                                    TAO_EC_QOS_Info& qos_info
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   if (event.length () != 1)
-    return this->filter_set (event, qos_info TAO_ENV_ARG_PARAMETER);
+    return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER);
 
   if (this->can_match (event[0].header))
     {
-      this->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+      this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       return 1;
     }
@@ -50,19 +50,19 @@ TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
 void
 TAO_EC_Type_Filter::push (const RtecEventComm::EventSet& event,
                           TAO_EC_QOS_Info& qos_info
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER);
+    this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_EC_Type_Filter::push_nocopy (RtecEventComm::EventSet& event,
                                  TAO_EC_QOS_Info& qos_info
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER);
+    this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -116,7 +116,7 @@ int
 TAO_EC_Type_Filter::add_dependencies (
       const RtecEventComm::EventHeader& header,
       const TAO_EC_QOS_Info &
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
 {
   return this->can_match (header);
 }
@@ -124,7 +124,7 @@ TAO_EC_Type_Filter::add_dependencies (
 int
 TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event,
                                 TAO_EC_QOS_Info& qos_info
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   CORBA::ULong maximum = event.length ();
   if (event.maximum () == 0)
@@ -143,7 +143,7 @@ TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event,
   if (matched.length () == 0)
     return 0;
 
-  this->push (matched, qos_info TAO_ENV_ARG_PARAMETER);
+  this->push (matched, qos_info ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return 1;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index 9780fab0fd6..cde1c5a8326 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -41,22 +41,22 @@ public:
   // TAO_EC_Filter.
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   virtual int filter_nocopy (RtecEventComm::EventSet& event,
                              TAO_EC_QOS_Info& qos_info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   virtual void push (const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void push_nocopy (RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
   virtual int can_match (const RtecEventComm::EventHeader& header) const;
   virtual int add_dependencies (const RtecEventComm::EventHeader& header,
                                 const TAO_EC_QOS_Info &qos_info
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Type_Filter
@@ -67,7 +67,7 @@ private:
   /// Filter an EventSet that contains more than one event.
   int filter_set (const RtecEventComm::EventSet& event,
                   TAO_EC_QOS_Info& qos_info
-                  TAO_ENV_ARG_DECL);
+                  ACE_ENV_ARG_DECL);
 
 private:
   /// Encapsulate the type/source that we must match.
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index 06f5cf18acb..ad193b971af 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -16,7 +16,7 @@ TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer (void)
 void
 TAO_EC_Simple_AddrServer::get_addr (const RtecEventComm::EventHeader& header,
                                     RtecUDPAdmin::UDP_Addr_out addr
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   addr.ipaddr = header.type;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index e59d2951f33..b272d2218ab 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -44,7 +44,7 @@ public:
   // = The RtecUDPAdmin::AddrServer methods
   virtual void get_addr (const RtecEventComm::EventHeader& header,
                          RtecUDPAdmin::UDP_Addr_out addr
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 4d3a5f3bdde..b8a4f3184a8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -160,7 +160,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Event_Channel_Timeprobe_Description,
 static RtecScheduler::Preemption_Priority_t
 Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler,
                      RtecScheduler::handle_t rtinfo
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   RtecScheduler::OS_Priority thread_priority;
   RtecScheduler::Preemption_Subpriority_t subpriority;
@@ -174,14 +174,14 @@ Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler,
      thread_priority,
      subpriority,
      preemption_priority
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
 #else
   ACE_Scheduler_Factory::server ()->priority
     (rtinfo,
      thread_priority,
      subpriority,
      preemption_priority
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
 #endif
   ACE_CHECK_RETURN (0);
   return preemption_priority;
@@ -231,7 +231,7 @@ public:
       ACE_Scheduler_MIN_PREEMPTION_PRIORITY;
     while (iter.advance_dependency () == 0)
       {
-        TAO_ENV_DECLARE_NEW_ENV;
+        ACE_DECLARE_NEW_CORBA_ENV;
         ACE_TRY
           {
             RtecEventComm::EventType &type = (*iter).event.header.type;
@@ -242,7 +242,7 @@ public:
               {
                 RtecScheduler::Preemption_Priority_t q =
                   ::Preemption_Priority (scheduler, (*iter).rt_info
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
                 ACE_TRY_CHECK;
                 if (rt_info_ == 0 || q < p)
                   {
@@ -324,11 +324,11 @@ public:
 
   virtual int execute (void* /* arg = 0 */)
   {
-    TAO_ENV_DECLARE_NEW_ENV;
+    ACE_DECLARE_NEW_CORBA_ENV;
     ACE_TRY
       {
         ACE_ES_Dispatch_Request *request = request_;
-        dispatching_module_->push (request TAO_ENV_ARG_PARAMETER);
+        dispatching_module_->push (request ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
         delete this;
       }
@@ -368,7 +368,7 @@ void
 ACE_Push_Supplier_Proxy::connect_push_supplier (
     RtecEventComm::PushSupplier_ptr push_supplier,
     const RtecEventChannelAdmin::SupplierQOS &qos
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          RtecEventChannelAdmin::AlreadyConnected))
 {
@@ -391,12 +391,12 @@ ACE_Push_Supplier_Proxy::connect_push_supplier (
   // not work: it usually results in some form of dead-lock.
   this->source_id_ = qos_.publications[0].event.header.source;
 
-  supplier_module_->connected (this TAO_ENV_ARG_PARAMETER);
+  supplier_module_->connected (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
 ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_ENTER_PUSH_SUPPLIER_PROXY_PUSH);
@@ -413,14 +413,14 @@ ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event
         ACE_const_cast (RtecEventComm::EventSet&, event);
 
       this->time_stamp (copy);
-      this->supplier_module_->push (this, copy TAO_ENV_ARG_PARAMETER);
+      this->supplier_module_->push (this, copy ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       RtecEventComm::EventSet copy = event;
       this->time_stamp (copy);
-      this->supplier_module_->push (this, copy TAO_ENV_ARG_PARAMETER);
+      this->supplier_module_->push (this, copy ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -442,14 +442,14 @@ ACE_Push_Supplier_Proxy::time_stamp (RtecEventComm::EventSet& event)
 
 void
 ACE_Push_Supplier_Proxy::disconnect_push_consumer (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TIMEPROBE_PRINT;
   if (this->connected ())
     {
       this->push_supplier_ = 0;
-      this->supplier_module_->disconnecting (this TAO_ENV_ARG_PARAMETER);
+      this->supplier_module_->disconnecting (this ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -457,10 +457,10 @@ ACE_Push_Supplier_Proxy::disconnect_push_consumer (
 void
 ACE_Push_Supplier_Proxy::shutdown (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      push_supplier_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      push_supplier_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -483,7 +483,7 @@ ACE_Push_Consumer_Proxy::~ACE_Push_Consumer_Proxy (void)
 
 void
 ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_EVENT_TO_CONSUMER_PROXY);
 
@@ -494,7 +494,7 @@ ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events
       return;
     }
 
-  push_consumer_->push (events TAO_ENV_ARG_PARAMETER);
+  push_consumer_->push (events ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -502,7 +502,7 @@ void
 ACE_Push_Consumer_Proxy::connect_push_consumer (
     RtecEventComm::PushConsumer_ptr push_consumer,
     const RtecEventChannelAdmin::ConsumerQOS &qos
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        RtecEventChannelAdmin::AlreadyConnected,
                        RtecEventChannelAdmin::TypeError))
@@ -523,28 +523,28 @@ ACE_Push_Consumer_Proxy::connect_push_consumer (
 
   // ACE_ConsumerQOS_Factory::debug (qos_);
 
-  this->consumer_module_->connected (this TAO_ENV_ARG_PARAMETER);
+  this->consumer_module_->connected (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
 ACE_Push_Consumer_Proxy::disconnect_push_supplier (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TIMEPROBE_PRINT;
   this->push_consumer_ = RtecEventComm::PushConsumer::_nil ();
-  this->consumer_module_->disconnecting (this TAO_ENV_ARG_PARAMETER);
+  this->consumer_module_->disconnecting (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
-ACE_Push_Consumer_Proxy::suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ACE_Push_Consumer_Proxy::suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   correlation_.suspend ();
 }
 
 void
-ACE_Push_Consumer_Proxy::resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ACE_Push_Consumer_Proxy::resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   correlation_.resume ();
@@ -553,10 +553,10 @@ ACE_Push_Consumer_Proxy::resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 ACE_Push_Consumer_Proxy::shutdown (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->push_consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->push_consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -644,10 +644,10 @@ ACE_EventChannel::~ACE_EventChannel (void)
   // @@ This should go away, it is too late to raise a CORBA
   // exception, at this point we should only be cleaning up memory,
   // not sending messages.
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -674,7 +674,7 @@ ACE_EventChannel::~ACE_EventChannel (void)
 }
 
 void
-ACE_EventChannel::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ACE_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
@@ -767,27 +767,27 @@ ACE_EventChannel::report_disconnect_i (u_long event)
 
 void
 ACE_EventChannel::add_gateway (TAO_EC_Gateway* gw
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
-  RtecEventChannelAdmin::Observer_var observer = gw->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  RtecEventChannelAdmin::Observer_var observer = gw->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  gw->observer_handle (this->append_observer (observer.in () TAO_ENV_ARG_PARAMETER));
+  gw->observer_handle (this->append_observer (observer.in () ACE_ENV_ARG_PARAMETER));
   ACE_CHECK;
 }
 
 void
 ACE_EventChannel::del_gateway (TAO_EC_Gateway* gw
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
-  this->remove_observer (gw->observer_handle () TAO_ENV_ARG_PARAMETER);
+  this->remove_observer (gw->observer_handle () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   gw->observer_handle (0);
 }
 
 void
-ACE_EventChannel::update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL)
+ACE_EventChannel::update_consumer_gwys (ACE_ENV_SINGLE_ARG_DECL)
 {
   Observer_Map observers;
   {
@@ -818,13 +818,13 @@ ACE_EventChannel::update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL)
        i != observers.end ();
        ++i)
     {
-      (*i).int_id_.observer->update_consumer (c_qos TAO_ENV_ARG_PARAMETER);
+      (*i).int_id_.observer->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ACE_EventChannel::update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL)
+ACE_EventChannel::update_supplier_gwys (ACE_ENV_SINGLE_ARG_DECL)
 {
   Observer_Map observers;
   {
@@ -854,14 +854,14 @@ ACE_EventChannel::update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL)
        i != observers.end ();
        ++i)
     {
-      (*i).int_id_.observer->update_supplier (s_qos TAO_ENV_ARG_PARAMETER);
+      (*i).int_id_.observer->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 RtecEventChannelAdmin::Observer_Handle
 ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -882,12 +882,12 @@ ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs
 
   RtecEventChannelAdmin::ConsumerQOS c_qos;
   this->consumer_module_->fill_qos (c_qos);
-  obs->update_consumer (c_qos TAO_ENV_ARG_PARAMETER);
+  obs->update_consumer (c_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   RtecEventChannelAdmin::SupplierQOS s_qos;
   this->supplier_module_->fill_qos (s_qos);
-  obs->update_supplier (s_qos TAO_ENV_ARG_PARAMETER);
+  obs->update_supplier (s_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return entry.handle;
@@ -895,7 +895,7 @@ ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs
 
 void
 ACE_EventChannel::remove_observer (RtecEventChannelAdmin::Observer_Handle h
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -932,7 +932,7 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info,
       RtecScheduler::handle_t timer_rtinfo =
         this->timer_module ()->rt_info (preemption_priority);
 
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
 #if 1
@@ -940,14 +940,14 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info,
                                             timer_rtinfo,
                                             1,
                                             RtecBase::ONE_WAY_CALL
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
 #else
           ACE_Scheduler_Factory::server()->add_dependency
             (rt_info,
              timer_rtinfo,
              1,
              RtecBase::ONE_WAY_CALL
-              TAO_ENV_ARG_PARAMETER);
+              ACE_ENV_ARG_PARAMETER);
 #endif
           ACE_TRY_CHECK;
         }
@@ -1252,18 +1252,18 @@ ACE_ES_Consumer_Module::open (ACE_ES_Dispatching_Module *down)
 
 void
 ACE_ES_Consumer_Module::connected (ACE_Push_Consumer_Proxy *consumer
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG,
   //             "EC (%t) Consumer_Module - connecting consumer %x\n",
   //  consumer));
 
   this->channel_->report_connect (ACE_EventChannel::CONSUMER);
-  this->down_->connected (consumer TAO_ENV_ARG_PARAMETER);
+  this->down_->connected (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!consumer->qos ().is_gateway)
-    this->channel_->update_consumer_gwys (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->channel_->update_consumer_gwys (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -1286,12 +1286,12 @@ ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request)
 
       // Deactivate the consumer proxy
       PortableServer::POA_var poa =
-        sc->consumer ()->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        sc->consumer ()->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (sc->consumer () TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (sc->consumer () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Delete the consumer proxy, no need to delete it, is is owned
@@ -1299,7 +1299,7 @@ ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request)
       // delete sc->consumer ();
 
       if (!dont_update)
-        this->channel_->update_consumer_gwys (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->channel_->update_consumer_gwys (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_GUARD_THROW_EX (
@@ -1347,7 +1347,7 @@ ACE_ES_Consumer_Module::shutdown (void)
   {
     Consumer_Iterator iter (copy);
 
-    TAO_ENV_DECLARE_NEW_ENV;
+    ACE_DECLARE_NEW_CORBA_ENV;
     ACE_TRY
       {
         for (ACE_Push_Consumer_Proxy **proxy = 0;
@@ -1359,12 +1359,12 @@ ACE_ES_Consumer_Module::shutdown (void)
             // servant.
             // Deactivate the proxy...
             PortableServer::POA_var poa =
-              (*proxy)->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+              (*proxy)->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             PortableServer::ObjectId_var id =
-              poa->servant_to_id (*proxy TAO_ENV_ARG_PARAMETER);
+              poa->servant_to_id (*proxy ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+            poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             // Remove the consumer from our list.
@@ -1394,7 +1394,7 @@ DONE:
 
 void
 ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   {
     ACE_GUARD_THROW_EX (
@@ -1411,7 +1411,7 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer
   // etc.  However, messages may still be queued in the ReactorEx or
   // in the Dispatching Module for this consumer, so no queues or
   // proxies can be deleted just yet.
-  down_->disconnecting (consumer TAO_ENV_ARG_PARAMETER);
+  down_->disconnecting (consumer ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Send a shutdown message through the system.  When this is
@@ -1459,7 +1459,7 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer
 // can read the set we allocated off the stack.
 void
 ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Consumer_Module::push\n"));
 
@@ -1478,12 +1478,12 @@ ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request
       ORBSVCS_Time::hrtime_to_TimeT (ev.header.ec_send_time, ec_send);
     }
 #endif /* TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS */
-  request->consumer ()->push (event_set TAO_ENV_ARG_PARAMETER);
+  request->consumer ()->push (event_set ACE_ENV_ARG_PARAMETER);
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 ACE_ES_Consumer_Module::obtain_push_supplier (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushSupplier_ptr proxy =
@@ -1510,7 +1510,7 @@ ACE_ES_Consumer_Module::obtain_push_supplier (
       ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Module insert failed.\n"));
   }
 
-  proxy = new_consumer->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  proxy = new_consumer->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxy);
 
   // Give away ownership to the POA....
@@ -1622,7 +1622,7 @@ ACE_ES_Correlation_Module::open (ACE_ES_Dispatching_Module *up,
 
 void
 ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   // Initialize the consumer correlation filter.
   if (consumer->correlation ().connected (consumer, this) == -1)
@@ -1631,7 +1631,7 @@ ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer
 
 void
 ACE_ES_Correlation_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (consumer->correlation ().disconnecting () == -1)
     ACE_ERROR ((LM_ERROR,
@@ -1653,7 +1653,7 @@ ACE_ES_Correlation_Module::unsubscribe (ACE_ES_Consumer_Rep *cr)
 void
 ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer,
                                  const TAO_EC_Event& event
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Correlation_Module::push\n"));
 
@@ -1666,7 +1666,7 @@ ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer,
   // we need to push the event now.
   if (request != 0)
     {
-      up_->push (request TAO_ENV_ARG_PARAMETER);
+      up_->push (request ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -1814,7 +1814,7 @@ ACE_ES_Consumer_Correlation::~ACE_ES_Consumer_Correlation (void)
 }
 
 void
-ACE_ES_Consumer_Correlation::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ACE_ES_Consumer_Correlation::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->connected_ = 0;
@@ -2169,10 +2169,10 @@ ACE_ES_Consumer_Correlation::disconnecting (void)
   // If we were forwarding events, disconnect as a supplier.
   if (connected_)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
-          channel_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+          channel_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -2336,14 +2336,14 @@ ACE_ES_Consumer_Rep_Timeout::execute (void* /* arg */)
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_CONSUMER_REP_TIMEOUT_EXECUTE);
   if (this->receiving_events ())
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
           ACE_Time_Value tv = ACE_OS::gettimeofday ();
           ORBSVCS_Time::Time_Value_to_TimeT (this->timeout_event_.header ().creation_time, tv);
           correlation_->correlation_module_->push (this,
                                                    this->timeout_event_
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -2385,7 +2385,7 @@ ACE_ES_Subscription_Module::~ACE_ES_Subscription_Module (void)
 // global type collection.
 void
 ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   RtecEventComm::EventSourceID sid = 0;
   // We will record the source_id for later usage.
@@ -2463,14 +2463,14 @@ ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier
                    new_subscribers->dependency_info_->rt_info,
                    new_subscribers->dependency_info_->number_of_calls,
                    RtecBase::ONE_WAY_CALL
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
 #else
                 ACE_Scheduler_Factory::server()->add_dependency
                   ((*proxy)->dependency()->rt_info,
                    new_subscribers->dependency_info_->rt_info,
                    new_subscribers->dependency_info_->number_of_calls,
                    RtecBase::ONE_WAY_CALL
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
 #endif
                 ACE_CHECK;
 
@@ -2538,7 +2538,7 @@ ACE_ES_Subscription_Module::reregister_consumers (RtecEventComm::EventSourceID s
 
 void
 ACE_ES_Subscription_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
 {
   ACE_WRITE_GUARD_THROW_EX (
       ACE_ES_RW_LOCK, ace_mon, this->lock_,
@@ -2592,7 +2592,7 @@ ACE_ES_Subscription_Module::subscribe_all (ACE_ES_Consumer_Rep *)
 int
 ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source,
                                          const TAO_EC_Event &event
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::push_source\n"));
 
@@ -2626,7 +2626,7 @@ ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source,
         // and not disconnected.
         if ((*consumer)->receiving_events ())
           {
-            up_->push (*consumer, event TAO_ENV_ARG_PARAMETER);
+            up_->push (*consumer, event ACE_ENV_ARG_PARAMETER);
             ACE_CHECK_RETURN (-1);
           }
         // If the consumer has disconnected, schedule it for
@@ -2675,7 +2675,7 @@ ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source,
 int
 ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source,
                                               const TAO_EC_Event &event
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG,
   // "EC (%t) Subscription_Module::push_source_type: \n"));
@@ -2742,7 +2742,7 @@ ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source,
       {
         if ((*consumer)->receiving_events ())
           {
-            up_->push (*consumer, event TAO_ENV_ARG_PARAMETER);
+            up_->push (*consumer, event ACE_ENV_ARG_PARAMETER);
             ACE_CHECK_RETURN (-1);
           }
         if ((*consumer)->disconnected ())
@@ -2837,7 +2837,7 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer,
                  iter2.next (temp) != 0;
                  iter2.advance ())
               {
-                TAO_ENV_DECLARE_NEW_ENV;
+                ACE_DECLARE_NEW_CORBA_ENV;
                 ACE_TRY
                   {
 #if 1
@@ -2846,14 +2846,14 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer,
                        temp->int_id_->dependency_info_->rt_info,
                        temp->int_id_->dependency_info_->number_of_calls,
                        RtecBase::ONE_WAY_CALL
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
 #else
                     ACE_Scheduler_Factory::server()->add_dependency
                       (consumer->dependency()->rt_info,
                        temp->int_id_->dependency_info_->rt_info,
                        temp->int_id_->dependency_info_->number_of_calls,
                        RtecBase::ONE_WAY_CALL
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
 #endif
                     ACE_TRY_CHECK;
                   }
@@ -2916,7 +2916,7 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer,
           // Success.  Add the supplier dependency info to the
           // consumer's dependency list.
           // @@ TODO handle exceptions.
-          TAO_ENV_DECLARE_NEW_ENV;
+          ACE_DECLARE_NEW_CORBA_ENV;
           ACE_TRY
             {
 #if 1
@@ -2925,14 +2925,14 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer,
                  dependency_info->rt_info,
                  dependency_info->number_of_calls,
                  RtecBase::ONE_WAY_CALL
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
 #else
               ACE_Scheduler_Factory::server()->add_dependency
                 (consumer->dependency ()->rt_info,
                  dependency_info->rt_info,
                  dependency_info->number_of_calls,
                  RtecBase::ONE_WAY_CALL
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
 #endif
               ACE_TRY_CHECK;
             }
@@ -2989,7 +2989,7 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer
                 // Success.
                 // Add the supplier to the consumer's dependency list.
                 // @@ TODO handle exceptions.
-                TAO_ENV_DECLARE_NEW_ENV;
+                ACE_DECLARE_NEW_CORBA_ENV;
                 ACE_TRY
                   {
 #if 1
@@ -2998,14 +2998,14 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer
                        dependency_info->rt_info,
                        dependency_info->number_of_calls,
                        RtecBase::ONE_WAY_CALL
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
 #else
                     ACE_Scheduler_Factory::server()->add_dependency
                       (consumer->dependency ()->rt_info,
                        dependency_info->rt_info,
                        dependency_info->number_of_calls,
                        RtecBase::ONE_WAY_CALL
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
 #endif
                     ACE_TRY_CHECK;
                   }
@@ -3232,13 +3232,13 @@ ACE_ES_Subscription_Module::unsubscribe_source_type (ACE_ES_Consumer_Rep *consum
 void
 ACE_ES_Subscription_Module::push (ACE_Push_Supplier_Proxy *source,
                                   const TAO_EC_Event &event
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::push\n"));
 
   ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_TO_SUBSCRIPTION_MODULE);
   // These are all inline function calls.
-  int result = this->push_source (source, event TAO_ENV_ARG_PARAMETER);
+  int result = this->push_source (source, event ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (result == -1)
@@ -3247,7 +3247,7 @@ ACE_ES_Subscription_Module::push (ACE_Push_Supplier_Proxy *source,
   {
     ACE_FUNCTION_TIMEPROBE (TAO_EVENT_CHANNEL_BEGIN_PUSH_SOURCE_TYPE);
 
-    result = this->push_source_type (source, event TAO_ENV_ARG_PARAMETER);
+    result = this->push_source_type (source, event ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (result == -1)
@@ -3321,19 +3321,19 @@ ACE_ES_Supplier_Module::open (ACE_ES_Subscription_Module *up)
 
 void
 ACE_ES_Supplier_Module::connected (ACE_Push_Supplier_Proxy *supplier
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   channel_->report_connect (ACE_EventChannel::SUPPLIER);
-  up_->connected (supplier TAO_ENV_ARG_PARAMETER);
+  up_->connected (supplier ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!supplier->qos ().is_gateway)
-    this->channel_->update_supplier_gwys (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->channel_->update_supplier_gwys (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean need_update = 0;
   {
@@ -3345,7 +3345,7 @@ ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier
     if (all_suppliers_.remove (supplier) == -1)
       ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR());
 
-    up_->disconnecting (supplier TAO_ENV_ARG_PARAMETER);
+    up_->disconnecting (supplier ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (this->all_suppliers_.size () <= 0)
@@ -3363,7 +3363,7 @@ ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier
     // CORBA::release (supplier);
   }
   if (need_update)
-    this->channel_->update_supplier_gwys (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->channel_->update_supplier_gwys (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -3381,14 +3381,14 @@ ACE_ES_Supplier_Module::shutdown (void)
     {
       Supplier_Iterator iter (copy);
 
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
 
       for (ACE_Push_Supplier_Proxy **proxy = 0;
            iter.next (proxy) != 0;
            iter.advance ())
         {
           (*proxy)->shutdown ();
-          this->disconnecting (*proxy TAO_ENV_ARG_PARAMETER);
+          this->disconnecting (*proxy ACE_ENV_ARG_PARAMETER);
         }
     }
 
@@ -3396,7 +3396,7 @@ ACE_ES_Supplier_Module::shutdown (void)
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+ACE_ES_Supplier_Module::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy =
@@ -3418,7 +3418,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
       ACE_ERROR ((LM_ERROR, "ACE_ES_Supplier_Module insert failed.\n"));
   }
 
-  proxy = new_supplier->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  proxy = new_supplier->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxy);
 
   // Give ownership to the POA
@@ -3430,7 +3430,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
 void
 ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy,
                               RtecEventComm::EventSet &event_set
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   // Steal the events from the EventSet and put them into a reference
   // counted event set.
@@ -3447,7 +3447,7 @@ ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy,
       // the scope.
       TAO_EC_Event event_copy (event, i);
       ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_TO_SUPPLIER_MODULE_THRU_SUPPLIER_PROXY);
-      up_->push (proxy, event_copy TAO_ENV_ARG_PARAMETER);
+      up_->push (proxy, event_copy ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   TAO_EC_Event_Set::_release (event);
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 955838fae77..efd24b5d442 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -201,7 +201,7 @@ public:
   virtual ~ACE_EventChannel (void);
   // Calls destroy.
 
-  RtecEventChannelAdmin::EventChannel_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  RtecEventChannelAdmin::EventChannel_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Allow transformations to RtecEventChannelAdmin::EventChannel.
 
   ACE_RTU_Manager *rtu_manager (void);
@@ -232,12 +232,12 @@ public:
   void report_disconnect_i (u_long);
   // Consumer or supplier disconnected.
 
-  void add_gateway (TAO_EC_Gateway* gw TAO_ENV_ARG_DECL);
-  void del_gateway (TAO_EC_Gateway* gw TAO_ENV_ARG_DECL);
+  void add_gateway (TAO_EC_Gateway* gw ACE_ENV_ARG_DECL);
+  void del_gateway (TAO_EC_Gateway* gw ACE_ENV_ARG_DECL);
   // Add and remove gateways from the EC.
 
-  void update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL);
-  void update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL);
+  void update_consumer_gwys (ACE_ENV_SINGLE_ARG_DECL);
+  void update_supplier_gwys (ACE_ENV_SINGLE_ARG_DECL);
   // The consumer (or supplier) list has changed, thus the EC has to
   // inform any gateways it has.
 
@@ -247,30 +247,30 @@ public:
   // = The RtecEventChannelAdmin::EventChannel methods.
 
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // In this implementation of the EC this returns the interface for
   // the Consumer_Module.
 
   virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Return an interface to the Supplier_Module.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown the EC, free all resources, stop all threads and then
   // shutdown the server where the Servant is running.
 
   virtual RtecEventChannelAdmin::Observer_Handle
     append_observer (RtecEventChannelAdmin::Observer_ptr observer
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
         RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER));
   virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR,
@@ -840,7 +840,7 @@ public:
   // that ACE_ES_Consumer_Rep_Timeout::execute can access it.
 
 private:
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Called when the channel disconnects us.
 
@@ -943,23 +943,23 @@ public:
   // Link to the next module.
 
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
         ACE_THROW_SPEC ((CORBA::SystemException));
   // Factory method for push consumer proxies.
 
   void connected (ACE_Push_Consumer_Proxy *consumer
-                  TAO_ENV_ARG_DECL_NOT_USED);
+                  ACE_ENV_ARG_DECL_NOT_USED);
   // Register the consumer with the Event Service.  This handles all
   // the details regarding Correlation_Module and Subscription_Module.
 
   void disconnecting (ACE_Push_Consumer_Proxy *consumer
-                      TAO_ENV_ARG_DECL_NOT_USED);
+                      ACE_ENV_ARG_DECL_NOT_USED);
   // Unregister the consumer from the Event Service.
 
   virtual void push (const ACE_ES_Dispatch_Request *request
-                     TAO_ENV_ARG_DECL_NOT_USED);
+                     ACE_ENV_ARG_DECL_NOT_USED);
 
-  RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Allow transformations to RtecEventChannelAdmin::ConsumerAdmin.
 
   void shutdown_request (ACE_ES_Dispatch_Request *request);
@@ -1011,16 +1011,16 @@ public:
   // Link to adjacent modules.
 
   void connected (ACE_Push_Consumer_Proxy *consumer
-                  TAO_ENV_ARG_DECL_NOT_USED);
+                  ACE_ENV_ARG_DECL_NOT_USED);
   // Create the consumers filter object.
 
   void disconnecting (ACE_Push_Consumer_Proxy *consumer
-                      TAO_ENV_ARG_DECL_NOT_USED);
+                      ACE_ENV_ARG_DECL_NOT_USED);
   // Release the consumers filter object.
 
   void push (ACE_ES_Consumer_Rep *consumer,
              const TAO_EC_Event &event
-             TAO_ENV_ARG_DECL_NOT_USED);
+             ACE_ENV_ARG_DECL_NOT_USED);
   // Take in an event and its subscriber.  Apply consumer-specific
   // filters to each event and forward any dispatch requests to the
   // Dispatching Module.
@@ -1099,13 +1099,13 @@ public:
   // Removes the -consumer- from any subscription lists.
 
   void connected (ACE_Push_Supplier_Proxy *supplier
-                  TAO_ENV_ARG_DECL_NOT_USED);
+                  ACE_ENV_ARG_DECL_NOT_USED);
   void disconnecting (ACE_Push_Supplier_Proxy *supplier
-                      TAO_ENV_ARG_DECL_NOT_USED);
+                      ACE_ENV_ARG_DECL_NOT_USED);
 
   void push (ACE_Push_Supplier_Proxy *source,
              const TAO_EC_Event &event
-             TAO_ENV_ARG_DECL_NOT_USED);
+             ACE_ENV_ARG_DECL_NOT_USED);
   // Takes in an event and pushes subscriber sets to the
   // Correlation Module.
 
@@ -1160,18 +1160,18 @@ private:
 
   int push_source (ACE_Push_Supplier_Proxy *source,
                    const TAO_EC_Event &event
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
   // Push <event> to all consumers subscribed to all events from
   // <source>.  Returns 0 on success, -1 on failure.
 
   int push_source_type (ACE_Push_Supplier_Proxy *source,
                         const TAO_EC_Event &event
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   // Push <event> to all consumers subscribed to <event>.type_ from
   // <source>.  Returns 0 on success, -1 on failure.
 
   void push_all (const TAO_EC_Event &event
-                 TAO_ENV_ARG_DECL_NOT_USED);
+                 ACE_ENV_ARG_DECL_NOT_USED);
   // Push <event> to all_suppliers_.
 
   ACE_ES_Correlation_Module *up_;
@@ -1216,26 +1216,26 @@ public:
   // Associate the module to a channel.
 
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+      obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
         ACE_THROW_SPEC ((CORBA::SystemException));
   // Factory method for push supplier proxies.
 
   virtual void push (ACE_Push_Supplier_Proxy *proxy,
                      RtecEventComm::EventSet &event
-                     TAO_ENV_ARG_DECL_NOT_USED);
+                     ACE_ENV_ARG_DECL_NOT_USED);
   // The supplier module acts on behalf of the supplier proxy to
   // forward events through the channel.
 
   void connected (ACE_Push_Supplier_Proxy *supplier
-                  TAO_ENV_ARG_DECL_NOT_USED);
+                  ACE_ENV_ARG_DECL_NOT_USED);
   // Register the consumer with the Event Service.  This handles all
   // the details regarding Correlation_Module and Subscription_Module.
 
   void disconnecting (ACE_Push_Supplier_Proxy *supplier
-                      TAO_ENV_ARG_DECL_NOT_USED);
+                      ACE_ENV_ARG_DECL_NOT_USED);
   // Unregister the consumer from the Event Service.
 
-  RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Allow transformations to RtecEventComm::PushConsumer.
 
   void shutdown (void);
@@ -1290,7 +1290,7 @@ public:
   virtual void connect_push_supplier (
       RtecEventComm::PushSupplier_ptr push_supplier,
       const RtecEventChannelAdmin::SupplierQOS& qos
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          RtecEventChannelAdmin::AlreadyConnected));
   // Suppliers connect via this interface.  <push_supplier> is a
@@ -1298,12 +1298,12 @@ public:
   // the supplier.
 
   virtual void push (const RtecEventComm::EventSet &event
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Data arriving from a PushSupplier that must be sent to
   // consumers.  This is the entry point of all events.
 
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnect the supplier from the channel.
 
@@ -1374,29 +1374,29 @@ public:
   virtual void connect_push_consumer (
        RtecEventComm::PushConsumer_ptr push_consumer,
        const RtecEventChannelAdmin::ConsumerQOS& qos
-       TAO_ENV_ARG_DECL_NOT_USED)
+       ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecEventChannelAdmin::AlreadyConnected,
                      RtecEventChannelAdmin::TypeError));
   // A push consumer is connecting.  <push_consumer> is a reference to
   // the consumer.  <qos> is the subscription types for the consumer.
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The consumer is disconnecting.
 
-  virtual void suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Stop forwarding events to the calling consumer.
 
-  virtual void resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Resume forwarding events to the calling consumer.
 
   // = Event Channel operations.
 
   void push (const RtecEventComm::EventSet &events
-             TAO_ENV_ARG_DECL_NOT_USED);
+             ACE_ENV_ARG_DECL_NOT_USED);
   // Push <events> to push_consumer_.
 
   int connected (void);
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
index 395b70bc70b..d0fbf3acda3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
@@ -69,37 +69,37 @@ ACE_Push_Consumer_Proxy::correlation (void)
 }
 
 ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr
-ACE_ES_Consumer_Module::get_ref (TAO_ENV_SINGLE_ARG_DECL)
+ACE_ES_Consumer_Module::get_ref (ACE_ENV_SINGLE_ARG_DECL)
 {
-  return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr
-ACE_ES_Supplier_Module::get_ref (TAO_ENV_SINGLE_ARG_DECL)
+ACE_ES_Supplier_Module::get_ref (ACE_ENV_SINGLE_ARG_DECL)
 {
-  return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // **************************************************
 
 ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr
-ACE_EventChannel::get_ref (TAO_ENV_SINGLE_ARG_DECL)
+ACE_EventChannel::get_ref (ACE_ENV_SINGLE_ARG_DECL)
 {
-  return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr
-ACE_EventChannel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+ACE_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return supplier_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return supplier_module_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr
-ACE_EventChannel::for_consumers (TAO_ENV_SINGLE_ARG_DECL)
+ACE_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return consumer_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return consumer_module_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_EC_Timer_Module*
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
index 2582e74ee2e..a312c4302f1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
@@ -96,7 +96,7 @@ ACE_RT_Task::~ACE_RT_Task (void)
 int
 ACE_RT_Task::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // @@ TODO It may be necessary to pass the options to this class
@@ -107,7 +107,7 @@ ACE_RT_Task::svc (void)
       };
       int argc = sizeof (argv)/sizeof (argv[0]);
       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;
 #endif
 
@@ -120,14 +120,14 @@ ACE_RT_Task::svc (void)
         (this->rt_info_,
          thread_priority,
          subpriority,
-         preemption_priority TAO_ENV_ARG_PARAMETER);
+         preemption_priority ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       ACE_Scheduler_Factory::server ()->priority
         (this->rt_info_,
          thread_priority,
          subpriority,
-         preemption_priority TAO_ENV_ARG_PARAMETER);
+         preemption_priority ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif
       if (ACE_OS::thr_setprio (thread_priority) == -1)
@@ -257,17 +257,17 @@ ACE_RT_Task::open_task (const char* name)
       tempname = tempbuffer;
     }
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 #if 1
       rt_info_ =
-        this->scheduler_->create (tempname TAO_ENV_ARG_PARAMETER);
+        this->scheduler_->create (tempname ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       rt_info_ =
         ACE_Scheduler_Factory::server()->create (tempname
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif
       // @@ TODO: We do no initialization of the new rt_info, the
@@ -314,7 +314,7 @@ ACE_RT_Task::synch_threads (size_t threads)
       RtecScheduler::Preemption_Subpriority_t subpriority;
       RtecScheduler::Preemption_Priority_t preemption_priority;
 
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
           {
@@ -325,14 +325,14 @@ ACE_RT_Task::synch_threads (size_t threads)
               (rt_info_,
                thread_priority,
                subpriority,
-               preemption_priority TAO_ENV_ARG_PARAMETER);
+               preemption_priority ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 #else
             ACE_Scheduler_Factory::server ()->priority
               (rt_info_,
                thread_priority,
                subpriority,
-               preemption_priority TAO_ENV_ARG_PARAMETER);
+               preemption_priority ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 #endif
           }
diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
index 826009f8d12..8ea1e243627 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
@@ -75,7 +75,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period)
     case 0:
       // @@ TODO handle exceptions
       {
-        TAO_ENV_DECLARE_NEW_ENV;
+        ACE_DECLARE_NEW_CORBA_ENV;
         ACE_TRY
           {
 #if 1
@@ -90,7 +90,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period)
                ORBSVCS_Time::zero (),
                1,
                RtecScheduler::OPERATION
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
 #else
             ACE_Scheduler_Factory::server()->set
               (rt_info_,
@@ -103,7 +103,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period)
                ORBSVCS_Time::zero (),
                1,
                RtecScheduler::OPERATION
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
 #endif
             ACE_TRY_CHECK;
           }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
index 7363d0956f9..1ea17bc1001 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.cpp
@@ -20,7 +20,7 @@ TAO_FT_Endpoint_Selector_Factory::~TAO_FT_Endpoint_Selector_Factory (void)
 
 TAO_Invocation_Endpoint_Selector *
 TAO_FT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *
-                                                TAO_ENV_ARG_DECL)
+                                                ACE_ENV_ARG_DECL)
 {
   if (this->ft_endpoint_selector_ == 0)
     {
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
index 6cb35899442..e178d6a9661 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h
@@ -53,7 +53,7 @@ public:
   /// initialize the endpoint selection state instance.
   virtual TAO_Invocation_Endpoint_Selector *get_selector (
       TAO_GIOP_Invocation *
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
index ec979f5a1cb..aaed1b9240a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -14,7 +14,7 @@ ACE_RCSID(FaultTolerance, TAO_FT_IOGR_Property, "$Id$")
 CORBA::Boolean
 TAO_FT_IOGR_Property::set_property (
     CORBA::Object_ptr ior
-    TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+    ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    TAO_IOP::Invalid_IOR))
 {
@@ -63,7 +63,7 @@ TAO_FT_IOGR_Property::set_property (
 CORBA::Boolean
 TAO_FT_IOGR_Property::is_primary_set (
     CORBA::Object_ptr ior
-    TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+    ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
@@ -78,7 +78,7 @@ TAO_FT_IOGR_Property::is_primary_set (
 CORBA::Object_ptr
 TAO_FT_IOGR_Property::get_primary (
     CORBA::Object_ptr ior
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
@@ -151,7 +151,7 @@ CORBA::Boolean
 TAO_FT_IOGR_Property::set_primary (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
index eb94a073989..3fe6434051e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -76,7 +76,7 @@ public:
 
   virtual CORBA::Boolean set_property (
       CORBA::Object_ptr ior
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -87,7 +87,7 @@ public:
   virtual CORBA::Boolean set_primary (
       CORBA::Object_ptr ior1,
       CORBA::Object_ptr ior2
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -98,7 +98,7 @@ public:
 
   virtual CORBA::Object_ptr get_primary (
       CORBA::Object_ptr ior
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -108,7 +108,7 @@ public:
 
   virtual CORBA::Boolean is_primary_set (
       CORBA::Object_ptr ior
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
index 2f07b99f486..a45f0cf0efd 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.cpp
@@ -32,11 +32,11 @@ TAO_FT_Invocation_Endpoint_Selector::~TAO_FT_Invocation_Endpoint_Selector (void)
 void
 TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
   TAO_GIOP_Invocation *invocation
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
 
   int retval = this->select_endpoint_i (invocation
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (retval == 0)
@@ -47,7 +47,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
                     "Falling back on the default selection routines \n"));
 
       TAO_Default_Endpoint_Selector::select_endpoint (invocation
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -57,7 +57,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint (
 // @@ RTCORBA_Subsetting - next should be deprecated...
 void
 TAO_FT_Invocation_Endpoint_Selector::next (TAO_GIOP_Invocation *
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("This method is DEPRECATED!\n")));
   // if (invocation->stub_->next_profile_retry () == 0)
@@ -69,7 +69,7 @@ void
 TAO_FT_Invocation_Endpoint_Selector::forward (TAO_GIOP_Invocation
                                         *invocation,
                                         const TAO_MProfile &mprofile
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   invocation->stub ()->add_forward_profiles (mprofile);
   // This has to be and is thread safe.
@@ -106,11 +106,11 @@ TAO_FT_Invocation_Endpoint_Selector::close_connection (TAO_GIOP_Invocation *invo
 int
 TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i(
     TAO_GIOP_Invocation *invocation
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   int retval =
     this->select_primary (invocation
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
@@ -166,7 +166,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i(
 
           int status =
             this->endpoint_from_profile (invocation
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           if (status == 1)
@@ -185,7 +185,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_endpoint_i(
 int
 TAO_FT_Invocation_Endpoint_Selector::select_primary (
     TAO_GIOP_Invocation *invoc
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   // Get the current profile
   TAO_Profile *temp_profile =
@@ -199,7 +199,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
       retval =
         this->check_profile_for_primary (invoc,
                                          temp_profile
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   else
@@ -255,7 +255,7 @@ TAO_FT_Invocation_Endpoint_Selector::select_primary (
       retval =
         this->check_profile_for_primary (invoc,
                                          temp_profile
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (retval == 1 || retval == -1)
@@ -287,7 +287,7 @@ int
 TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary (
     TAO_GIOP_Invocation *invocation,
     TAO_Profile*pfile
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   IOP::TaggedComponent tagged_component;
   tagged_component.tag = IOP::TAG_FT_PRIMARY;
@@ -310,7 +310,7 @@ TAO_FT_Invocation_Endpoint_Selector::check_profile_for_primary (
 
       int status =
         this->endpoint_from_profile (invocation
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (status == 1)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
index 62e82e2a09e..805921e967e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h
@@ -55,27 +55,27 @@ public:
   /// $TAO_ROOT/tao/Invocation_Endpoint_Selectors.h  for details of
   /// documentation.
   virtual void select_endpoint (TAO_GIOP_Invocation *invocation
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
   virtual void next (TAO_GIOP_Invocation *invocation
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual void forward (TAO_GIOP_Invocation *invocation,
                         const TAO_MProfile &mprofile
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual void success (TAO_GIOP_Invocation *invocation);
   virtual void close_connection (TAO_GIOP_Invocation *invocation);
 
 protected:
 
   int select_endpoint_i (TAO_GIOP_Invocation *invoc
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
 
   int select_primary (TAO_GIOP_Invocation *invocation
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
   int check_profile_for_primary (TAO_GIOP_Invocation *,
                                  TAO_Profile *
-                                 TAO_ENV_ARG_DECL);
+                                 ACE_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
index 02570b50932..51a9d535a22 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (FaultTolerance, FT_ORBInitializer, "$Id$")
 void
 TAO_FT_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -21,18 +21,18 @@ TAO_FT_ORBInitializer::pre_init (
 void
 TAO_FT_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_FT_ORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   // Register the FTCORBA policy factories.
 
@@ -60,19 +60,19 @@ TAO_FT_ORBInitializer::register_policy_factories (
   CORBA::PolicyType type = FT::REQUEST_DURATION_POLICY;
   info->register_policy_factory (type,
                                  policy_factory.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = FT::HEARTBEAT_POLICY;
   info->register_policy_factory (type,
                                  policy_factory.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = FT::HEARTBEAT_ENABLED_POLICY;
   info->register_policy_factory (type,
                                  policy_factory.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Transfer ownership of the policy factory to the registry.
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
index eba0417afd6..3918193b6f3 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h
@@ -47,18 +47,18 @@ class TAO_FT_Export TAO_FT_ORBInitializer :
 public:
 
   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));
 
 private:
 
   void register_policy_factories (
          PortableInterceptor::ORBInitInfo_ptr info
-         TAO_ENV_ARG_DECL);
+         ACE_ENV_ARG_DECL);
   ///< Register FTCORBA policy factories.
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
index 534e396bfc9..2072fe7bbd1 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
@@ -17,20 +17,20 @@ CORBA::Policy_ptr
 TAO_FT_PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &val
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
 
   if (type ==  FT::REQUEST_DURATION_POLICY)
     return  TAO_FT_Request_Duration_Policy::create (val
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   else if (type == FT::HEARTBEAT_POLICY)
     return TAO_FT_Heart_Beat_Policy::create (val
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   else if (type == FT::HEARTBEAT_ENABLED_POLICY)
     return TAO_FT_Heart_Beat_Enabled_Policy::create (val
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
 
   ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
                     CORBA::Policy::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
index f96d8dc4617..f8dae1bc5cb 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
@@ -50,7 +50,7 @@ public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                            const CORBA::Any &value
-                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
index 0fe68876e0e..3328034a0cb 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
@@ -10,14 +10,14 @@
 ACE_RCSID(FaultTolerance, FT_Policy_i, "$Id$")
 
 TimeBase::TimeT
-TAO_FT_Request_Duration_Policy::request_duration_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::request_duration_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_duration_;
 }
 
 CORBA::PolicyType
-TAO_FT_Request_Duration_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::REQUEST_DURATION_POLICY;
@@ -25,7 +25,7 @@ TAO_FT_Request_Duration_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Policy_ptr
 TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   TimeBase::TimeT value;
   if ((val >>= value) == 0)
@@ -53,7 +53,7 @@ TAO_FT_Request_Duration_Policy::clone (void) const
 }
 
 CORBA::Policy_ptr
-TAO_FT_Request_Duration_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FT_Request_Duration_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Request_Duration_Policy* tmp;
@@ -66,7 +66,7 @@ TAO_FT_Request_Duration_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_FT_Request_Duration_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Request_Duration_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -94,7 +94,7 @@ TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value)
 /*****************************************************************/
 
 FT::HeartbeatPolicyValue
-TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FT::HeartbeatPolicyValue val;
@@ -108,7 +108,7 @@ TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (TAO_ENV_SINGLE_ARG_DECL_NOT_US
 
 CORBA::Policy_ptr
 TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   FT::HeartbeatPolicyValue *value;
   if ((val >>= value) == 0)
@@ -129,7 +129,7 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val
 
 
 CORBA::PolicyType
-TAO_FT_Heart_Beat_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::HEARTBEAT_POLICY;
@@ -137,7 +137,7 @@ TAO_FT_Heart_Beat_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FT_Heart_Beat_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Heart_Beat_Policy * tmp;
@@ -160,7 +160,7 @@ TAO_FT_Heart_Beat_Policy::clone (void) const
 }
 
 void
-TAO_FT_Heart_Beat_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -189,7 +189,7 @@ TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value,
 
 CORBA::Boolean
 TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->heartbeat_enabled_value_;
@@ -198,7 +198,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value (
 
 CORBA::Policy_ptr
 TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean value;
 
@@ -217,7 +217,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val
 }
 
 CORBA::PolicyType
-TAO_FT_Heart_Beat_Enabled_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return FT::HEARTBEAT_ENABLED_POLICY;
@@ -225,7 +225,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 CORBA::Policy_ptr
-TAO_FT_Heart_Beat_Enabled_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_FT_Heart_Beat_Enabled_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FT_Heart_Beat_Enabled_Policy * tmp;
@@ -249,7 +249,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const
 
 
 void
-TAO_FT_Heart_Beat_Enabled_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_FT_Heart_Beat_Enabled_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
index be1e5de9406..fe9a8bebd12 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
@@ -61,7 +61,7 @@ public:
   // Copy constructor.
 
   static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Helper method for the implementation of
   // CORBA::ORB::create_policy.
 
@@ -69,19 +69,19 @@ public:
   // Returns a copy of <this>.
 
   // = The FT::RequestDurationPolicy methods
-  virtual TimeBase::TimeT request_duration_value (TAO_ENV_SINGLE_ARG_DECL)
+  virtual TimeBase::TimeT request_duration_value (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PolicyType policy_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Policy_ptr copy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void set_time_value (ACE_Time_Value &time_value);
@@ -115,7 +115,7 @@ public:
   // Copy constructor.
 
   static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // Helper method for the implementation of
   // CORBA::ORB::create_policy.
@@ -124,19 +124,19 @@ public:
   // Returns a copy of <this>.
 
   // = The FT::HeartBeatPolicy methods
-  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (TAO_ENV_SINGLE_ARG_DECL)
+  virtual FT::HeartbeatPolicyValue heartbeat_policy_value (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PolicyType policy_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Policy_ptr copy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void set_time_value (ACE_Time_Value &time_value,
@@ -179,7 +179,7 @@ public:
   // Copy constructor.
 
   static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // Helper method for the implementation of
   // CORBA::ORB::create_policy.
@@ -189,19 +189,19 @@ public:
 
   // = The FT::HeartBeatPolicy methods
   virtual CORBA::Boolean heartbeat_enabled_policy_value (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PolicyType policy_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Policy_ptr copy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
index 7d75ef8a98b..07a925ee980 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -159,7 +159,7 @@ TAO_FT_Service_Callbacks::service_context_list (
     TAO_Stub *&stub,
     IOP::ServiceContextList &service_list,
     CORBA::Boolean restart
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -171,13 +171,13 @@ TAO_FT_Service_Callbacks::service_context_list (
       // Pack the group version service context
       this->group_version_service_context (stub,
                                            service_list
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Pack the request service context
       this->request_service_context (stub,
                                      service_list
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -188,7 +188,7 @@ void
 TAO_FT_Service_Callbacks::request_service_context (
     TAO_Stub *&stub,
     IOP::ServiceContextList &service_list
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_OutputCDR cdr;
@@ -211,7 +211,7 @@ TAO_FT_Service_Callbacks::request_service_context (
   // Check whether the FT::RequestDurationPolicy has been set
   CORBA::Policy_var policy =
     stub->get_policy (FT::REQUEST_DURATION_POLICY
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ There are two possibilities a) Duration policy has not been
@@ -231,7 +231,7 @@ TAO_FT_Service_Callbacks::request_service_context (
         FT::RequestDurationPolicy::_narrow (policy.in ());
 
       exp_time =
-        duration_policy->request_duration_value (TAO_ENV_SINGLE_ARG_PARAMETER);
+        duration_policy->request_duration_value (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -289,7 +289,7 @@ void
 TAO_FT_Service_Callbacks::group_version_service_context (
     TAO_Stub *&stub,
     IOP::ServiceContextList &service_list
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_OutputCDR cdr;
@@ -369,7 +369,7 @@ int
 TAO_FT_Service_Callbacks::raise_comm_failure (
     TAO_GIOP_Invocation *invoke,
     TAO_Profile *profile
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   if (this->restart_policy_check (
           invoke->request_service_context ().service_info (),
@@ -403,7 +403,7 @@ int
 TAO_FT_Service_Callbacks::raise_transient_failure (
     TAO_GIOP_Invocation *invoke,
     TAO_Profile *profile
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   if (restart_policy_check (
         invoke->request_service_context ().service_info (),
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index 9254b4e8482..a984f5368ed 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -76,7 +76,7 @@ public:
   virtual void service_context_list (TAO_Stub *&stub,
                                      IOP::ServiceContextList &service_list,
                                      CORBA::Boolean restart
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Add relevant stuff to the service context list
@@ -84,14 +84,14 @@ public:
   virtual int raise_comm_failure (
       TAO_GIOP_Invocation *invoke,
       TAO_Profile *profile
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
   // Check whether we need to raise an exception or go for a
   // reinvocaton.
 
   virtual int raise_transient_failure (
       TAO_GIOP_Invocation *invoke,
       TAO_Profile *profile
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
   // Check whether we need to raise an exception or go for a
   // reinvocaton.
 
@@ -110,13 +110,13 @@ private:
 
   void request_service_context (TAO_Stub *&stub,
                                 IOP::ServiceContextList &service_list
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Makes  the  request service_context list
 
   void group_version_service_context (TAO_Stub *&stub,
                                       IOP::ServiceContextList &service_list
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Make the group version service context list
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp
index af98cb7e372..66515a35186 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.cpp
@@ -30,7 +30,7 @@ TAO_LB_LoadBalancer::~TAO_LB_LoadBalancer (void)
 LoadBalancing::ReplicaProxy_ptr
 TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control,
                               CORBA::Object_ptr replica
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                    LoadBalancing::ReplicaProxy::NilReplica,
                    CORBA::SystemException))
@@ -47,7 +47,7 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control,
 
   PortableServer::ServantBase_var proxy_servant = proxy;
 
-  proxy->connect (this, control, replica TAO_ENV_ARG_PARAMETER);
+  proxy->connect (this, control, replica ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (LoadBalancing::ReplicaProxy::_nil ());
 
   if (this->strategy_->insert (proxy) == -1)
@@ -56,11 +56,11 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control,
                         LoadBalancing::ReplicaProxy::_nil ());
     }
 
-  return proxy->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return proxy->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadBalancer::group_identity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Object::_duplicate (this->group_identity_.in ());
@@ -68,9 +68,9 @@ TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
-  this->strategy_->load_changed (proxy TAO_ENV_ARG_PARAMETER);
+  this->strategy_->load_changed (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 int
@@ -85,13 +85,13 @@ TAO_LB_LoadBalancer::init (const char * repository_id,
       PortableServer::RequestProcessingPolicy_var request =
         root_poa->create_request_processing_policy (
           PortableServer::USE_SERVANT_MANAGER
-          TAO_ENV_ARG_PARAMETER);
+          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ServantRetentionPolicy_var retention =
         root_poa->create_servant_retention_policy (
           PortableServer::NON_RETAIN
-          TAO_ENV_ARG_PARAMETER);
+          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the PolicyList.
@@ -107,28 +107,28 @@ TAO_LB_LoadBalancer::init (const char * repository_id,
       // Create the child POA with the ServantManager (ReplicaLocator)
       // above policies.
       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;
       this->poa_ = root_poa->create_POA ("TAO_LB_ReplicaLocator_POA",
                                          poa_manager.in (),
                                          policy_list
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the child POA.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      request->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      request->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      retention->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      retention->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now set the ReplicaLocator as the child POA's Servant
       // Manager.
       this->poa_->set_servant_manager (&this->locator_
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // @@ What ObjectId should be used?
@@ -138,7 +138,7 @@ TAO_LB_LoadBalancer::init (const char * repository_id,
       this->group_identity_ =
         this->poa_->create_reference_with_id (oid.in (),
                                               repository_id
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h
index a410c01cdec..7437c529fab 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.h
@@ -59,17 +59,17 @@ public:
   // things) pre-computed.
   //
   void load_changed (TAO_LB_ReplicaProxy *proxy
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   // The load for <proxy> has changed, the LoadBalancer can use this
   // opportunity to determine if the load on one of the services is
   // too high.
 
   void disconnect (TAO_LB_ReplicaProxy *proxy
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnect proxy from the Load Balancer.
 
-  CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return a reference to the Replica to which client requests should
   // be redirected next.
@@ -78,11 +78,11 @@ public:
   virtual LoadBalancing::ReplicaProxy_ptr connect (
         LoadBalancing::ReplicaControl_ptr control,
         CORBA::Object_ptr replica
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                      LoadBalancing::ReplicaProxy::NilReplica,
                      CORBA::SystemException));
-  virtual CORBA::Object_ptr group_identity (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Object_ptr group_identity (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i
index f667e95a552..a806f7dfead 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i
@@ -5,7 +5,7 @@
 
 ACE_INLINE void
 TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Ossama, what is the we cannot raise that exception here!
@@ -22,8 +22,8 @@ TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy
 
 
 ACE_INLINE CORBA::Object_ptr
-TAO_LB_LoadBalancer::replica (TAO_ENV_SINGLE_ARG_DECL)
+TAO_LB_LoadBalancer::replica (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->strategy_->replica (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->strategy_->replica (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp
index af98cb7e372..66515a35186 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.cpp
@@ -30,7 +30,7 @@ TAO_LB_LoadBalancer::~TAO_LB_LoadBalancer (void)
 LoadBalancing::ReplicaProxy_ptr
 TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control,
                               CORBA::Object_ptr replica
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                    LoadBalancing::ReplicaProxy::NilReplica,
                    CORBA::SystemException))
@@ -47,7 +47,7 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control,
 
   PortableServer::ServantBase_var proxy_servant = proxy;
 
-  proxy->connect (this, control, replica TAO_ENV_ARG_PARAMETER);
+  proxy->connect (this, control, replica ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (LoadBalancing::ReplicaProxy::_nil ());
 
   if (this->strategy_->insert (proxy) == -1)
@@ -56,11 +56,11 @@ TAO_LB_LoadBalancer::connect (LoadBalancing::ReplicaControl_ptr control,
                         LoadBalancing::ReplicaProxy::_nil ());
     }
 
-  return proxy->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return proxy->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_LB_LoadBalancer::group_identity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Object::_duplicate (this->group_identity_.in ());
@@ -68,9 +68,9 @@ TAO_LB_LoadBalancer::group_identity (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_LB_LoadBalancer::load_changed (TAO_LB_ReplicaProxy *proxy
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
-  this->strategy_->load_changed (proxy TAO_ENV_ARG_PARAMETER);
+  this->strategy_->load_changed (proxy ACE_ENV_ARG_PARAMETER);
 }
 
 int
@@ -85,13 +85,13 @@ TAO_LB_LoadBalancer::init (const char * repository_id,
       PortableServer::RequestProcessingPolicy_var request =
         root_poa->create_request_processing_policy (
           PortableServer::USE_SERVANT_MANAGER
-          TAO_ENV_ARG_PARAMETER);
+          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ServantRetentionPolicy_var retention =
         root_poa->create_servant_retention_policy (
           PortableServer::NON_RETAIN
-          TAO_ENV_ARG_PARAMETER);
+          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the PolicyList.
@@ -107,28 +107,28 @@ TAO_LB_LoadBalancer::init (const char * repository_id,
       // Create the child POA with the ServantManager (ReplicaLocator)
       // above policies.
       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;
       this->poa_ = root_poa->create_POA ("TAO_LB_ReplicaLocator_POA",
                                          poa_manager.in (),
                                          policy_list
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the child POA.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      request->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      request->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      retention->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      retention->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now set the ReplicaLocator as the child POA's Servant
       // Manager.
       this->poa_->set_servant_manager (&this->locator_
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // @@ What ObjectId should be used?
@@ -138,7 +138,7 @@ TAO_LB_LoadBalancer::init (const char * repository_id,
       this->group_identity_ =
         this->poa_->create_reference_with_id (oid.in (),
                                               repository_id
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h
index a410c01cdec..7437c529fab 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.h
@@ -59,17 +59,17 @@ public:
   // things) pre-computed.
   //
   void load_changed (TAO_LB_ReplicaProxy *proxy
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   // The load for <proxy> has changed, the LoadBalancer can use this
   // opportunity to determine if the load on one of the services is
   // too high.
 
   void disconnect (TAO_LB_ReplicaProxy *proxy
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnect proxy from the Load Balancer.
 
-  CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return a reference to the Replica to which client requests should
   // be redirected next.
@@ -78,11 +78,11 @@ public:
   virtual LoadBalancing::ReplicaProxy_ptr connect (
         LoadBalancing::ReplicaControl_ptr control,
         CORBA::Object_ptr replica
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                      LoadBalancing::ReplicaProxy::NilReplica,
                      CORBA::SystemException));
-  virtual CORBA::Object_ptr group_identity (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Object_ptr group_identity (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i
index f667e95a552..a806f7dfead 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i
@@ -5,7 +5,7 @@
 
 ACE_INLINE void
 TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Ossama, what is the we cannot raise that exception here!
@@ -22,8 +22,8 @@ TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy
 
 
 ACE_INLINE CORBA::Object_ptr
-TAO_LB_LoadBalancer::replica (TAO_ENV_SINGLE_ARG_DECL)
+TAO_LB_LoadBalancer::replica (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->strategy_->replica (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->strategy_->replica (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp
index f0b9d4f00f7..55d9e4ae6fb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.cpp
@@ -18,7 +18,7 @@ TAO_LB_LoadBalancing_Strategy::~TAO_LB_LoadBalancing_Strategy (void)
 
 void
 TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy *
-                                              TAO_ENV_ARG_DECL_NOT_USED)
+                                              ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h
index 946325788d9..0e197de508f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_Strategy.h
@@ -47,7 +47,7 @@ public:
   // @@ The name of the method should be more meaningful, what about:
   //    select_replica(), select_unloaded_replica() or something like
   //    that?
-  virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Return the object reference to the Replica to which requests should
   // be redirected.
@@ -60,7 +60,7 @@ public:
   // Remove ReplicaProxy servant from the set of replica proxies.
 
   virtual void load_changed (TAO_LB_ReplicaProxy *proxy
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   // The load on one proxy has changed.
   // @@ Ossama: see my comments on LoadBalancing_i about changing the
   // signature of this method.
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp
index 06d74819fb2..c3e9ae40930 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.cpp
@@ -36,7 +36,7 @@ TAO_LB_Minimum_Dispersion_Strategy::~TAO_LB_Minimum_Dispersion_Strategy (void)
 }
 
 CORBA::Object_ptr
-TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL)
+TAO_LB_Minimum_Dispersion_Strategy::replica (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for ( ; ; )
@@ -84,7 +84,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL)
         ACE_TRY
           {
             CORBA::Boolean non_existent =
-              object->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+              object->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             if (!non_existent)
               {
@@ -130,7 +130,7 @@ TAO_LB_Minimum_Dispersion_Strategy::remove (TAO_LB_ReplicaProxy *proxy)
 
 void
 TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
 {
   int send_load_advisory = 0;
 
@@ -185,7 +185,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy
   // dispersion we tolerate before starting to send advisories.
   if (send_load_advisory == 2)
     {
-      proxy->control_->high_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->control_->high_load_advisory (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;  // We may not throw an exception, so explicitly return.
@@ -199,7 +199,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy
   // construction time...
   if (send_load_advisory == 1)
     {
-      proxy->control_->nominal_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->control_->nominal_load_advisory (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h
index df4e679543c..938b7ba0ecc 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Minimum_Dispersion.h
@@ -56,12 +56,12 @@ public:
   // Destructor
 
   // = The TAO_LB_LoadBalancing_Strategy methods
-  virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual int insert (TAO_LB_ReplicaProxy *);
   virtual int remove (TAO_LB_ReplicaProxy *);
   virtual void load_changed (TAO_LB_ReplicaProxy *
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
 private:
   TAO_LB_ReplicaProxySet proxies_;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp
index 66a03582d03..e42168ee991 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp
@@ -19,7 +19,7 @@ TAO_LB_ReplicaLocator::preinvoke (
       PortableServer::POA_ptr /* adapter */,
       const char * /* operation */,
       PortableServer::ServantLocator::Cookie & /* the_cookie */
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -27,7 +27,7 @@ TAO_LB_ReplicaLocator::preinvoke (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   CORBA::Object_var replica =
-    this->load_balancer_->replica (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->load_balancer_->replica (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Throw a forward exception to force the client to redirect its
@@ -44,7 +44,7 @@ TAO_LB_ReplicaLocator::postinvoke (
     const char * /* operation */,
     PortableServer::ServantLocator::Cookie /* the_cookie */,
     PortableServer::Servant /* the_servant */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No-op
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h
index 9031dbb51fc..0507fd23d50 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h
@@ -50,7 +50,7 @@ public:
       PortableServer::POA_ptr adapter,
       const char *operation,
       PortableServer::ServantLocator::Cookie & the_cookie
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
 
@@ -60,7 +60,7 @@ public:
       const char *operation,
       PortableServer::ServantLocator::Cookie the_cookie,
       PortableServer::Servant the_servant
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp
index bfc9d025ba7..f111819e7f8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.cpp
@@ -23,7 +23,7 @@ TAO_LB_ReplicaProxy::TAO_LB_ReplicaProxy (void)
 
 void
 TAO_LB_ReplicaProxy::current_load (CORBA::Float load
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Ossama: this is the point were the load dampening should
@@ -35,11 +35,11 @@ TAO_LB_ReplicaProxy::current_load (CORBA::Float load
   this->current_load_ = load;
   // ACE_DEBUG ((LM_DEBUG, "Load[%x] = %f\n", long(this), load));
 
-  this->balancer_->load_changed (this TAO_ENV_ARG_PARAMETER);
+  this->balancer_->load_changed (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+TAO_LB_ReplicaProxy::disconnect (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected,
                    CORBA::SystemException))
 {
@@ -49,7 +49,7 @@ TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->connected_)
     {
-      this->balancer_->disconnect (this TAO_ENV_ARG_PARAMETER);
+      this->balancer_->disconnect (this ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->connected_ = 0;
@@ -64,7 +64,7 @@ void
 TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer,
                               LoadBalancing::ReplicaControl_ptr control,
                               CORBA::Object_ptr replica
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                    LoadBalancing::ReplicaProxy::NilReplica,
                    CORBA::SystemException))
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h
index 9eb629ea29f..8f29e644a6d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaProxy.h
@@ -55,7 +55,7 @@ public:
   // Return a reference to the Replica.
 
   virtual void current_load (CORBA::Float load
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Send the value of the current load on the Object being load
   // balanced, where the definition of "load" is load balancing
@@ -69,7 +69,7 @@ public:
   // without affecting the client, or detect rapid raises in load and
   // react proactively to those...
 
-  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected,
                      CORBA::SystemException));
   // Send a request to disconnect from the LoadBalancer.
@@ -93,7 +93,7 @@ private:
   void connect (TAO_LB_LoadBalancer *balancer,
                 LoadBalancing::ReplicaControl_ptr control,
                 CORBA::Object_ptr replica
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                      LoadBalancing::ReplicaProxy::NilReplica,
                      CORBA::SystemException));
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp
index 4da47b060d7..d587a309dfa 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp
@@ -39,7 +39,7 @@ TAO_LB_Round_Robin_Strategy::~TAO_LB_Round_Robin_Strategy (void)
 }
 
 CORBA::Object_ptr
-TAO_LB_Round_Robin_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL)
+TAO_LB_Round_Robin_Strategy::replica (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h
index 93887fc6ac0..988e18ea25e 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h
@@ -60,7 +60,7 @@ public:
   // Destructor
 
   // = The Load_Balancing_Strategy methods
-  virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual int insert (TAO_LB_ReplicaProxy *);
   virtual int remove (TAO_LB_ReplicaProxy *);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp
index f0b9d4f00f7..55d9e4ae6fb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.cpp
@@ -18,7 +18,7 @@ TAO_LB_LoadBalancing_Strategy::~TAO_LB_LoadBalancing_Strategy (void)
 
 void
 TAO_LB_LoadBalancing_Strategy::load_changed (TAO_LB_ReplicaProxy *
-                                              TAO_ENV_ARG_DECL_NOT_USED)
+                                              ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h
index 946325788d9..0e197de508f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing_Strategy.h
@@ -47,7 +47,7 @@ public:
   // @@ The name of the method should be more meaningful, what about:
   //    select_replica(), select_unloaded_replica() or something like
   //    that?
-  virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Return the object reference to the Replica to which requests should
   // be redirected.
@@ -60,7 +60,7 @@ public:
   // Remove ReplicaProxy servant from the set of replica proxies.
 
   virtual void load_changed (TAO_LB_ReplicaProxy *proxy
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   // The load on one proxy has changed.
   // @@ Ossama: see my comments on LoadBalancing_i about changing the
   // signature of this method.
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index f121cfc75f3..bad0af39eea 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -15,29 +15,29 @@ BasicLogFactory_i::~BasicLogFactory_i()
 
 DsLogAdmin::BasicLogFactory_ptr
 BasicLogFactory_i::activate (PortableServer::POA_ptr poa
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   DsLogAdmin::BasicLogFactory_var v_return;
 
   PortableServer::ObjectId_var oid =
     poa->activate_object (this
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (v_return._retn ());
 
   CORBA::Object_var obj =
     poa->id_to_reference (oid.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (v_return._retn ());
 
   // narrow and store the result..
   this->log_mgr_ =
     DsLogAdmin::LogMgr::_narrow (obj.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (v_return._retn ());
 
   v_return =
     DsLogAdmin::BasicLogFactory::_narrow (obj.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::BasicLogFactory::_nil ());
 
   return v_return._retn ();
@@ -47,7 +47,7 @@ DsLogAdmin::BasicLog_ptr
 BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action,
                            CORBA::ULongLong max_rec_size,
                            DsLogAdmin::LogId_out id
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::NoResources
                    ))
@@ -59,7 +59,7 @@ BasicLogFactory_i::create (DsLogAdmin::LogFullAction full_action,
     this->create_with_id (this->max_id_,
                           full_action,
                           max_rec_size
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
 
   // Set the id to return..
@@ -71,7 +71,7 @@ DsLogAdmin::BasicLog_ptr
 BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id,
                                    DsLogAdmin::LogFullAction full_action,
                                    CORBA::ULongLong max_size
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    DsLogAdmin::NoResources,
@@ -101,14 +101,14 @@ BasicLogFactory_i::create_with_id (DsLogAdmin::LogId id,
   auto_ptr<BasicLog_i> basic_log_auto (basic_log_i);
   // just in case the activation fails.
 
-  basic_log_i->init (TAO_ENV_SINGLE_ARG_PARAMETER);
+  basic_log_i->init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (basic_log._retn ());
 
   // Register with the poa
-  basic_log = basic_log_i->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  basic_log = basic_log_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (basic_log._retn ());
 
-  basic_log_i->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  basic_log_i->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (DsLogAdmin::BasicLog::_nil ());
 
   // Add to the Hash table..
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
index 58c6c556192..355c599ae36 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
@@ -51,14 +51,14 @@ public:
 
   DsLogAdmin::BasicLogFactory_ptr
     activate (PortableServer::POA_ptr poa
-              TAO_ENV_ARG_DECL);
+              ACE_ENV_ARG_DECL);
   // Activate this servant with the POA passed in.
 
   DsLogAdmin::BasicLog_ptr
     create (DsLogAdmin::LogFullAction full_action,
             CORBA::ULongLong max_size,
             DsLogAdmin::LogId_out id
-            TAO_ENV_ARG_DECL)
+            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::NoResources
                      ));
@@ -69,7 +69,7 @@ public:
     create_with_id (DsLogAdmin::LogId id,
                     DsLogAdmin::LogFullAction full_action,
                     CORBA::ULongLong max_size
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      DsLogAdmin::NoResources,
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index 4c242a8c376..d5cb57712cd 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -21,7 +21,7 @@ BasicLog_i::~BasicLog_i ()
 }
 
 void
-BasicLog_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+BasicLog_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove ourselves from the list of logs.
@@ -29,15 +29,15 @@ BasicLog_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
 
   // Deregister with POA.
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index 483db1f88c6..3ac2e12b5f7 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -65,7 +65,7 @@ public:
   // Destructor.
 
   void
-  destroy (TAO_ENV_SINGLE_ARG_DECL)
+  destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the log object and all contained records.
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index 8483089c925..6dcc28fc61c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -31,21 +31,21 @@ Iterator_i::~Iterator_i (void)
 }
 
 void
-Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Iterator_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_ptr poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_ptr poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var oid =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Goodbye cruel world...
   // deactivate from the poa.
   poa->deactivate_object (oid.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   return;
 }
@@ -53,7 +53,7 @@ Iterator_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
 DsLogAdmin::RecordList*
 Iterator_i::get (CORBA::ULong position,
                  CORBA::ULong how_many
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidParam))
 {
@@ -73,7 +73,7 @@ Iterator_i::get (CORBA::ULong position,
 
   // Use an Interpreter to build an expression tree.
   TAO_Log_Constraint_Interpreter interpreter (constraint_
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Sequentially iterate over all the records and pick the ones that
@@ -122,7 +122,7 @@ Iterator_i::get (CORBA::ULong position,
   if (done == 1)
     {
       // destroy this object..
-      this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (rec_list);
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index f20c1e7980b..4655da02a4d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -58,12 +58,12 @@ public:
 
   DsLogAdmin::RecordList* get (CORBA::ULong position,
                                CORBA::ULong how_many
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidParam));
   // Gets a list of LogRecords.
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This destroys the iterator.
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index eef4349d9ff..fae15c930bd 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -13,7 +13,7 @@ LogMgr_i::~LogMgr_i ()
 }
 
 DsLogAdmin::LogList*
-LogMgr_i::list_logs (TAO_ENV_SINGLE_ARG_DECL)
+LogMgr_i::list_logs (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -51,7 +51,7 @@ LogMgr_i::list_logs (TAO_ENV_SINGLE_ARG_DECL)
 
 DsLogAdmin::Log_ptr
 LogMgr_i::find_log (DsLogAdmin::LogId id
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -82,7 +82,7 @@ LogMgr_i::find_log (DsLogAdmin::LogId id
 }
 
 DsLogAdmin::LogIdList*
-LogMgr_i::list_logs_by_id (TAO_ENV_SINGLE_ARG_DECL)
+LogMgr_i::list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index 8b6455b0fef..537e794f3b3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -40,7 +40,7 @@ public:
   // Destructor.
 
   DsLogAdmin::LogList *
-    list_logs (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    list_logs (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
@@ -48,14 +48,14 @@ public:
 
   DsLogAdmin::Log_ptr
     find_log (DsLogAdmin::LogId id
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
   // Returns a reference to the log with the supplied id
 
   DsLogAdmin::LogIdList *
-  list_logs_by_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  list_logs_by_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
index d87f5406087..fab4cc4fd1c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
@@ -5,7 +5,7 @@
 
 TAO_Log_Constraint_Interpreter::
 TAO_Log_Constraint_Interpreter(const char* constraints
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint,
                    CORBA::NO_MEMORY))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
index a68ab3deedb..40d89d023cd 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
@@ -37,7 +37,7 @@ class TAO_Log_Export TAO_Log_Constraint_Interpreter : public TAO_Interpreter
 public:
   // = Initialization and termination methods.
   TAO_Log_Constraint_Interpreter (const char* constraints
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((DsLogAdmin::InvalidConstraint,
                      CORBA::NO_MEMORY));
   // This constructor builds an expression tree representing the
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index c9c9aeae5a0..eb42cad258d 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -29,13 +29,13 @@ visit_property (TAO_Property_Constraint* literal)
 
   if (this->props_.find (prop_name, prop_index) == 0)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
 
       CORBA::Any *value = 0;
       // Retrieve the value of the property from the Property_Evaluator
       ACE_TRY
         {
-          // value = this->prop_eval_.property_value (prop_index TAO_ENV_ARG_PARAMETER);
+          // value = this->prop_eval_.property_value (prop_index ACE_ENV_ARG_PARAMETER);
           ACE_NEW_THROW_EX (value,
                             CORBA::Any,
                             CORBA::NO_MEMORY ());
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 8136149246a..439e0ed46c5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -29,7 +29,7 @@ Log_i::Log_i (DsLogAdmin::LogMgr_ptr factory,
 }
 
 void
-Log_i::init (TAO_ENV_SINGLE_ARG_DECL)
+Log_i::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (recordstore_.open () ==-1)
     ACE_THROW (CORBA::UNKNOWN ());
@@ -46,21 +46,21 @@ Log_i::~Log_i (void)
 }
 
 DsLogAdmin::LogMgr_ptr
-Log_i::my_factory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_i::my_factory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return DsLogAdmin::LogMgr::_duplicate (factory_.in ());
 }
 
 DsLogAdmin::LogId
-Log_i::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_i::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return logid_;
 }
 
 DsLogAdmin::QoSList*
-Log_i::get_qos (TAO_ENV_SINGLE_ARG_DECL)
+Log_i::get_qos (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::QoSList* ret_val;
@@ -73,7 +73,7 @@ Log_i::get_qos (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Log_i::set_qos (const DsLogAdmin::QoSList &qos
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::UnsupportedQoS))
 {
@@ -100,7 +100,7 @@ Log_i::set_qos (const DsLogAdmin::QoSList &qos
 }
 
 CORBA::ULong
-Log_i::get_max_record_life (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_i::get_max_record_life (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return max_record_life_;
@@ -108,7 +108,7 @@ Log_i::get_max_record_life (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Log_i::set_max_record_life (CORBA::ULong life
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // life is in seconds.
@@ -119,7 +119,7 @@ Log_i::set_max_record_life (CORBA::ULong life
 }
 
 CORBA::ULongLong
-Log_i::get_max_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_i::get_max_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return recordstore_.get_max_size ();
@@ -127,7 +127,7 @@ Log_i::get_max_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Log_i::set_max_size (CORBA::ULongLong size
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidParam))
 {
@@ -146,21 +146,21 @@ Log_i::set_max_size (CORBA::ULongLong size
 }
 
 CORBA::ULongLong
-Log_i::get_current_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_i::get_current_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recordstore_.get_current_size ();
 }
 
 CORBA::ULongLong
-Log_i::get_n_records (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_i::get_n_records (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recordstore_.get_n_records ();
 }
 
 DsLogAdmin::LogFullAction
-Log_i::get_log_full_action (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_i::get_log_full_action (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return log_full_action_;
@@ -168,14 +168,14 @@ Log_i::get_log_full_action (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Log_i::set_log_full_action (DsLogAdmin::LogFullAction action
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   log_full_action_ = action;
 }
 
 DsLogAdmin::AdministrativeState
-Log_i::get_administrative_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_i::get_administrative_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return admin_state_;
@@ -183,14 +183,14 @@ Log_i::get_administrative_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->admin_state_ = state;
 }
 
 DsLogAdmin::ForwardingState
-Log_i::get_forwarding_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_i::get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->forward_state_;
@@ -198,21 +198,21 @@ Log_i::get_forwarding_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->forward_state_ = state;
 }
 
 DsLogAdmin::OperationalState
-Log_i::get_operational_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_i::get_operational_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->op_state_;
 }
 
 DsLogAdmin::TimeInterval
-Log_i::get_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_i::get_interval (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->interval_;
@@ -220,7 +220,7 @@ Log_i::get_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidTime,
                    DsLogAdmin::InvalidTimeInterval))
@@ -232,7 +232,7 @@ Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
 }
 
 DsLogAdmin::AvailabilityStatus
-Log_i::get_availability_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Log_i::get_availability_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO:
@@ -249,7 +249,7 @@ Log_i::get_availability_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 DsLogAdmin::CapacityAlarmThresholdList*
-Log_i::get_capacity_alarm_thresholds (TAO_ENV_SINGLE_ARG_DECL)
+Log_i::get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::CapacityAlarmThresholdList* ret_val;
@@ -265,7 +265,7 @@ void
 Log_i::set_capacity_alarm_thresholds (const
                                       DsLogAdmin::CapacityAlarmThresholdList
                                       &threshs
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidThreshold))
 {
@@ -277,7 +277,7 @@ Log_i::set_capacity_alarm_thresholds (const
 }
 
 DsLogAdmin::WeekMask*
-Log_i::get_week_mask (TAO_ENV_SINGLE_ARG_DECL)
+Log_i::get_week_mask (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::WeekMask* ret_val;
@@ -291,7 +291,7 @@ Log_i::get_week_mask (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidTime,
                    DsLogAdmin::InvalidTimeInterval,
@@ -306,13 +306,13 @@ DsLogAdmin::RecordList*
 Log_i::query_i (const char *constraint,
                 DsLogAdmin::Iterator_out &iter_out,
                 CORBA::ULong how_many
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidConstraint))
 {
   // Use an Interpreter to build an expression tree.
   TAO_Log_Constraint_Interpreter interpreter (constraint
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Sequentially iterate over all the records and pick the ones that
@@ -393,11 +393,11 @@ Log_i::query_i (const char *constraint,
       ACE_CHECK_RETURN (rec_list);
 
       // Activate it.
-      iter_out = iter_query->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      iter_out = iter_query->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (rec_list);
 
       // Give ownership to the POA.
-      this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (rec_list);
     }
 
@@ -408,19 +408,19 @@ DsLogAdmin::RecordList*
 Log_i::query (const char *grammar,
               const char *constraint,
               DsLogAdmin::Iterator_out iter_out
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
 {
-  this->check_grammar (grammar TAO_ENV_ARG_PARAMETER);
+  this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   DsLogAdmin::RecordList* rec_list =
     this->query_i (constraint,
                    iter_out,
                    this->max_rec_list_len_
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (rec_list);
 
   return rec_list;
@@ -430,7 +430,7 @@ DsLogAdmin::RecordList*
 Log_i::retrieve (DsLogAdmin::TimeT from_time,
                  CORBA::Long how_many,
                  DsLogAdmin::Iterator_out iter_out
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Decide between forward vs backward retrieval.
@@ -454,7 +454,7 @@ Log_i::retrieve (DsLogAdmin::TimeT from_time,
     this->query_i (constraint,
                    iter_out,
                    how_many
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (rec_list);
 
   return rec_list;
@@ -463,13 +463,13 @@ Log_i::retrieve (DsLogAdmin::TimeT from_time,
 CORBA::ULong
 Log_i::match_i (const char *constraint,
                 CORBA::Boolean delete_rec
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidConstraint))
 {
   // Use an Interpreter to build an expression tree.
   TAO_Log_Constraint_Interpreter interpreter (constraint
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Get the underlying storage.
@@ -515,16 +515,16 @@ Log_i::match_i (const char *constraint,
 CORBA::ULong
 Log_i::match (const char* grammar,
               const char *constraint
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar,
                    DsLogAdmin::InvalidConstraint))
 {
-  this->check_grammar (grammar TAO_ENV_ARG_PARAMETER);
+  this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong count =
-    this->match_i (constraint, 0 TAO_ENV_ARG_PARAMETER);
+    this->match_i (constraint, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (count);
 
   return count;
@@ -533,16 +533,16 @@ Log_i::match (const char* grammar,
 CORBA::ULong
 Log_i::delete_records (const char *grammar,
                        const char *constraint
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint))
 {
-  this->check_grammar (grammar TAO_ENV_ARG_PARAMETER);
+  this->check_grammar (grammar ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong count =
-    this->match_i (constraint, 1 TAO_ENV_ARG_PARAMETER);
+    this->match_i (constraint, 1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (count);
 
   return count;
@@ -551,7 +551,7 @@ Log_i::delete_records (const char *grammar,
 CORBA::ULong
 Log_i::delete_records_by_id (const
                              DsLogAdmin::RecordIdList &ids
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong numdone (0);
@@ -569,7 +569,7 @@ Log_i::delete_records_by_id (const
 
 void
 Log_i::write_records (const DsLogAdmin::Anys &records
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::LogFull,
                    DsLogAdmin::LogLocked))
@@ -583,13 +583,13 @@ Log_i::write_records (const DsLogAdmin::Anys &records
       reclist [i].info = records[i];
     }
 
-  this->write_recordlist (reclist TAO_ENV_ARG_PARAMETER);
+  this->write_recordlist (reclist ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::LogFull,
                      DsLogAdmin::LogLocked))
@@ -601,7 +601,7 @@ Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
   // Check if the log is on duty
   // @@ Wait for Comittee ruling on the proper behavior
   DsLogAdmin::AvailabilityStatus avail_stat =
-    this->get_availability_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->get_availability_status (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (avail_stat.off_duty == 1)
@@ -661,7 +661,7 @@ Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist
 void
 Log_i::set_record_attribute (DsLogAdmin::RecordId id,
                              const DsLogAdmin::NVList &attr_list
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidRecordId,
                    DsLogAdmin::InvalidAttribute))
@@ -686,7 +686,7 @@ CORBA::ULong
 Log_i::set_records_attribute (const char *grammar,
                               const char *constraint,
                               const DsLogAdmin::NVList
-                              &attr_list TAO_ENV_ARG_DECL)
+                              &attr_list ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint,
@@ -701,7 +701,7 @@ Log_i::set_records_attribute (const char *grammar,
 
 DsLogAdmin::NVList*
 Log_i::get_record_attribute (DsLogAdmin::RecordId id
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidRecordId))
 {
@@ -724,7 +724,7 @@ Log_i::get_record_attribute (DsLogAdmin::RecordId id
 // @@ These two methods are non-trivial. Let's hold off on them for a while
 DsLogAdmin::Log_ptr
 Log_i::copy (DsLogAdmin::LogId_out id
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_UNUSED_ARG (id);
@@ -733,7 +733,7 @@ Log_i::copy (DsLogAdmin::LogId_out id
 
 DsLogAdmin::Log_ptr
 Log_i::copy_with_id (DsLogAdmin::LogId id
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::LogIdAlreadyExists))
 {
@@ -743,7 +743,7 @@ Log_i::copy_with_id (DsLogAdmin::LogId id
 
 // @@ Should I just raise the exception?
 void
-Log_i::flush (TAO_ENV_SINGLE_ARG_DECL)
+Log_i::flush (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::UnsupportedQoS))
 {
@@ -769,7 +769,7 @@ Log_i::scheduled (void)
 
 void
 Log_i::check_grammar (const char* grammar
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidGrammar))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index 79c5a90aae1..8bc620fc876 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -55,130 +55,130 @@ public:
   ~Log_i ();
   // Destructor.
 
-  void init (TAO_ENV_SINGLE_ARG_DECL);
+  void init (ACE_ENV_SINGLE_ARG_DECL);
   // Initlialize the Log.
 
   // = DsLogAdmin::Log methods
-  DsLogAdmin::LogMgr_ptr my_factory (TAO_ENV_SINGLE_ARG_DECL)
+  DsLogAdmin::LogMgr_ptr my_factory (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the factory of the log
 
-  DsLogAdmin::LogId id (TAO_ENV_SINGLE_ARG_DECL)
+  DsLogAdmin::LogId id (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the id of the log
 
   DsLogAdmin::QoSList*
-  get_qos (TAO_ENV_SINGLE_ARG_DECL)
+  get_qos (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Get the list of the QoS properties supported by the log
 
   void set_qos (const DsLogAdmin::QoSList & qos
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::UnsupportedQoS));
   // Set the list of the QoS properties supported by the log.
 
   CORBA::ULong
-  get_max_record_life (TAO_ENV_SINGLE_ARG_DECL)
+  get_max_record_life (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the record life in seconds (0 infinite)
 
   void
   set_max_record_life (CORBA::ULong life
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Set the record life in seconds (0 infinite)
 
   CORBA::ULongLong
-  get_max_size (TAO_ENV_SINGLE_ARG_DECL)
+  get_max_size (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the maximum size in octets
 
   void
   set_max_size (CORBA::ULongLong size
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidParam));
   // Set the maximum size in octets.
 
   CORBA::ULongLong
-  get_current_size (TAO_ENV_SINGLE_ARG_DECL)
+  get_current_size (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the current size of the log in octets.
 
   CORBA::ULongLong
-  get_n_records (TAO_ENV_SINGLE_ARG_DECL)
+  get_n_records (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the number of records in the log
 
   DsLogAdmin::LogFullAction
-  get_log_full_action (TAO_ENV_SINGLE_ARG_DECL)
+  get_log_full_action (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the action to be taken when the log reaches its maximum size
 
   void
   set_log_full_action (DsLogAdmin::LogFullAction action
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Set the action to be taken when the log reaches its maximum size
 
   DsLogAdmin::AdministrativeState
-  get_administrative_state (TAO_ENV_SINGLE_ARG_DECL)
+  get_administrative_state (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the administrative state of the log.
 
   void
   set_administrative_state (DsLogAdmin::AdministrativeState state
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Set the administrative state of the log.
 
   virtual DsLogAdmin::ForwardingState
-  get_forwarding_state (TAO_ENV_SINGLE_ARG_DECL)
+  get_forwarding_state (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the forwarding state of the log.
   // @@ Note: is it ok to make this method virtual?
 
   void
     set_forwarding_state (DsLogAdmin::ForwardingState state
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Set the forwarding state of the log.
   // @@ Note: is it ok to make this method virtual?
 
   DsLogAdmin::OperationalState
-  get_operational_state (TAO_ENV_SINGLE_ARG_DECL)
+  get_operational_state (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the operational state of the log.
 
   DsLogAdmin::TimeInterval
-  get_interval (TAO_ENV_SINGLE_ARG_DECL)
+  get_interval (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the log duration
 
   void
   set_interval (const DsLogAdmin::TimeInterval & interval
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidTime,
                      DsLogAdmin::InvalidTimeInterval));
   // Set the log duration.
 
   DsLogAdmin::AvailabilityStatus
-  get_availability_status (TAO_ENV_SINGLE_ARG_DECL)
+  get_availability_status (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the availability status
 
   DsLogAdmin::CapacityAlarmThresholdList*
-    get_capacity_alarm_thresholds (TAO_ENV_SINGLE_ARG_DECL)
+    get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the capacity alarm threshold
 
   void
     set_capacity_alarm_thresholds
   (const DsLogAdmin::CapacityAlarmThresholdList & threshs
-   TAO_ENV_ARG_DECL)
+   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidThreshold));
   // Set the capacity alarm threshold. Threshold values represent
@@ -189,13 +189,13 @@ public:
   // 0).
 
   DsLogAdmin::WeekMask*
-  get_week_mask (TAO_ENV_SINGLE_ARG_DECL)
+  get_week_mask (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the weekly scheduling parameters
 
   void
   set_week_mask (const DsLogAdmin::WeekMask & masks
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidTime,
                      DsLogAdmin::InvalidTimeInterval,
@@ -206,7 +206,7 @@ public:
   query (const char * grammar,
          const char * c,
          DsLogAdmin::Iterator_out i
-         TAO_ENV_ARG_DECL)
+         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
@@ -217,7 +217,7 @@ public:
   retrieve (DsLogAdmin::TimeT from_time,
             CORBA::Long how_many,
             DsLogAdmin::Iterator_out i
-            TAO_ENV_ARG_DECL)
+            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Retrieve <how_many> records from time <from_time> using iterator
   // <i>.
@@ -225,7 +225,7 @@ public:
   CORBA::ULong
   match (const char * grammar,
          const char * c
-         TAO_ENV_ARG_DECL)
+         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
@@ -234,7 +234,7 @@ public:
   CORBA::ULong
   delete_records (const char * grammar,
                   const char * c
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint));
@@ -242,14 +242,14 @@ public:
 
   CORBA::ULong
   delete_records_by_id (const DsLogAdmin::RecordIdList & ids
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Delete records matching ids in <ids>
 
 
   void
   write_records (const DsLogAdmin::Anys & records
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::LogFull,
                      DsLogAdmin::LogLocked));
@@ -257,7 +257,7 @@ public:
 
   void
   write_recordlist (const DsLogAdmin::RecordList & list
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::LogFull,
                      DsLogAdmin::LogLocked));
@@ -267,7 +267,7 @@ public:
   void
   set_record_attribute (DsLogAdmin::RecordId id,
                         const DsLogAdmin::NVList & attr_list
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId,
                      DsLogAdmin::InvalidAttribute));
@@ -277,7 +277,7 @@ public:
   set_records_attribute (const char * grammar,
                          const char * c,
                          const DsLogAdmin::NVList & attr_list
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar,
                      DsLogAdmin::InvalidConstraint,
@@ -287,7 +287,7 @@ public:
 
   DsLogAdmin::NVList*
   get_record_attribute (DsLogAdmin::RecordId id
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidRecordId));
   // Get the attributes of the record with id <id>. Raises
@@ -295,21 +295,21 @@ public:
 
   DsLogAdmin::Log_ptr
   copy (DsLogAdmin::LogId_out id
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Copy the log on which the operation was invoked.
 
   DsLogAdmin::Log_ptr
   copy_with_id (DsLogAdmin::LogId id
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::LogIdAlreadyExists));
   // Copy the log on which the operation was invoked and assign it the
   // given id.
 
   void
-  flush (TAO_ENV_SINGLE_ARG_DECL)
+  flush (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::UnsupportedQoS));
   // Causes all pending events to be written to storage. Raises
@@ -321,17 +321,17 @@ protected:
   DsLogAdmin::RecordList* query_i (const char *constraint,
                                       DsLogAdmin::Iterator_out &iter_out,
                                       CORBA::ULong how_many
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidConstraint));
 
   CORBA::ULong match_i (const char *constraint,
                         CORBA::Boolean delete_rec
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidConstraint));
 
-  void check_grammar (const char* grammar TAO_ENV_ARG_DECL)
+  void check_grammar (const char* grammar ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      DsLogAdmin::InvalidGrammar));
   // Throws DsLogAdmin::InvalidGrammar if we don't support this grammar.
diff --git a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp
index 06d74819fb2..c3e9ae40930 100644
--- a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp
+++ b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.cpp
@@ -36,7 +36,7 @@ TAO_LB_Minimum_Dispersion_Strategy::~TAO_LB_Minimum_Dispersion_Strategy (void)
 }
 
 CORBA::Object_ptr
-TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL)
+TAO_LB_Minimum_Dispersion_Strategy::replica (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for ( ; ; )
@@ -84,7 +84,7 @@ TAO_LB_Minimum_Dispersion_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL)
         ACE_TRY
           {
             CORBA::Boolean non_existent =
-              object->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+              object->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             if (!non_existent)
               {
@@ -130,7 +130,7 @@ TAO_LB_Minimum_Dispersion_Strategy::remove (TAO_LB_ReplicaProxy *proxy)
 
 void
 TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
 {
   int send_load_advisory = 0;
 
@@ -185,7 +185,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy
   // dispersion we tolerate before starting to send advisories.
   if (send_load_advisory == 2)
     {
-      proxy->control_->high_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->control_->high_load_advisory (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;  // We may not throw an exception, so explicitly return.
@@ -199,7 +199,7 @@ TAO_LB_Minimum_Dispersion_Strategy::load_changed (TAO_LB_ReplicaProxy *proxy
   // construction time...
   if (send_load_advisory == 1)
     {
-      proxy->control_->nominal_load_advisory (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->control_->nominal_load_advisory (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h
index df4e679543c..938b7ba0ecc 100644
--- a/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h
+++ b/TAO/orbsvcs/orbsvcs/Minimum_Dispersion.h
@@ -56,12 +56,12 @@ public:
   // Destructor
 
   // = The TAO_LB_LoadBalancing_Strategy methods
-  virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual int insert (TAO_LB_ReplicaProxy *);
   virtual int remove (TAO_LB_ReplicaProxy *);
   virtual void load_changed (TAO_LB_ReplicaProxy *
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
 private:
   TAO_LB_ReplicaProxySet proxies_;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
index 1349a07e442..48c9d4c5713 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -31,19 +31,19 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::~TAO_Bindings_Iterator (void)
 
   // Since we are going away, decrement the reference count on the
   // Naming Context we were iterating over.
-  context_->interface ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  context_->interface ()->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // Return the Default POA of this Servant
 template <class ITERATOR, class TABLE_ENTRY> PortableServer::POA_ptr
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
 TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b
-                                                        TAO_ENV_ARG_DECL)
+                                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNaming::Binding *binding;
@@ -71,7 +71,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b
   // self-destruct.
   if (context_->destroyed ())
     {
-      destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
@@ -101,7 +101,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b
 template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
 TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many,
                                                       CosNaming::BindingList_out bl
-                                                      TAO_ENV_ARG_DECL)
+                                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We perform an allocation before obtaining the lock so that an out
@@ -125,7 +125,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many,
   // self-destruct.
   if (context_->destroyed ())
     {
-      destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
@@ -167,7 +167,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_n (CORBA::ULong how_many,
 }
 
 template <class ITERATOR, class TABLE_ENTRY> void
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
@@ -185,11 +185,11 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::destroy (TAO_ENV_SINGLE_ARG_DECL)
 
   PortableServer::ObjectId_var id =
     poa_->servant_to_id (this
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa_->deactivate_object (id.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
index 8881a030306..887fc9c034d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
@@ -63,26 +63,26 @@ public:
   ~TAO_Bindings_Iterator (void);
   // Destructor.
 
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
   // Returns the Default POA of this Servant object
 
   // = Idl methods.
 
   CORBA::Boolean next_one (CosNaming::Binding_out b
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation passes back the next unseen binding.  True is
   // returned if a binding is passed back, and false is returned otherwise.
 
   CORBA::Boolean next_n (CORBA::ULong how_many,
                          CosNaming::BindingList_out bl
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation passes back at most <how_many> unseen bindings.
   // True is returned if bindings were passed back, and false is
   // returned if no bindings were passed back.
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation destroys the iterator.
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
index 98a689c88f7..9294d35a9ad 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -50,7 +50,7 @@ TAO_Hash_Naming_Context::_default_POA (void)
 
 CosNaming::NamingContext_ptr
 TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   // Naming context we will return.
   CosNaming::NamingContext_var result =
@@ -69,12 +69,12 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
     {
       // Resolve the name.
       CORBA::Object_var context = resolve (comp_name
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try narrowing object reference to the NamingContext type.
       result = CosNaming::NamingContext::_narrow (context.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
@@ -109,7 +109,7 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name
 void
 TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
                                CORBA::Object_ptr obj
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon, this->lock_,
@@ -134,13 +134,13 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        this->get_context (n TAO_ENV_ARG_PARAMETER);
+        this->get_context (n ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->bind (simple_name, obj TAO_ENV_ARG_PARAMETER);
+      context->bind (simple_name, obj ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   // If we received a simple name, we need to bind it in this context.
@@ -163,7 +163,7 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
 void
 TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
                                  CORBA::Object_ptr obj
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
@@ -188,13 +188,13 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n TAO_ENV_ARG_PARAMETER);
+        get_context (n ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->rebind (simple_name, obj TAO_ENV_ARG_PARAMETER);
+      context->rebind (simple_name, obj ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -219,7 +219,7 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
 void
 TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
                                        CosNaming::NamingContext_ptr nc
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
@@ -248,13 +248,13 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n TAO_ENV_ARG_PARAMETER);
+        get_context (n ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->bind_context (simple_name, nc TAO_ENV_ARG_PARAMETER);
+      context->bind_context (simple_name, nc ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   // If we received a simple name, we need to bind it in this context.
@@ -277,7 +277,7 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
 void
 TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
                                          CosNaming::NamingContext_ptr nc
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
@@ -302,13 +302,13 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n TAO_ENV_ARG_PARAMETER);
+        get_context (n ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->rebind_context (simple_name, nc TAO_ENV_ARG_PARAMETER);
+      context->rebind_context (simple_name, nc ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -332,7 +332,7 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
 
 CORBA::Object_ptr
 TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_,
                       CORBA::INTERNAL ());
@@ -382,7 +382,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
         {
           // Narrow to NamingContext.
           context = CosNaming::NamingContext::_narrow (result.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (result._retn ());
         }
       else
@@ -416,7 +416,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
 
           // If there are any exceptions, they will propagate up.
           return context->resolve (rest_of_name
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
         }
     }
   // If the name we had to resolve was simple, we just need to return
@@ -426,7 +426,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n
 
 void
 TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon,
                       this->lock_,
@@ -451,13 +451,13 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n
   if (name_len > 1)
     {
       CosNaming::NamingContext_var context =
-        get_context (n TAO_ENV_ARG_PARAMETER);
+        get_context (n ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosNaming::Name simple_name;
       simple_name.length (1);
       simple_name[0] = n[name_len - 1];
-      context->unbind (simple_name TAO_ENV_ARG_PARAMETER);
+      context->unbind (simple_name ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   // If we received a simple name, we need to unbind it in this
@@ -472,7 +472,7 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n
 
 CosNaming::NamingContext_ptr
 TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
@@ -491,7 +491,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
     CosNaming::NamingContext::_nil ();
 
   // Create new context.
-  result = new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
+  result = new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   // Bind the new context to the name.
@@ -499,7 +499,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
     {
       bind_context (n,
                     result.in ()
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -508,10 +508,10 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
       // created context, should any exceptions be raised by the
       // destroy() operation we want to ignore them.
       {
-        TAO_ENV_DECLARE_NEW_ENV;
+        ACE_DECLARE_NEW_CORBA_ENV;
         ACE_TRY_EX(DESTROY)
           {
-            result->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+            result->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK_EX(DESTROY);
           }
         ACE_CATCHANY {} ACE_ENDTRY;
@@ -526,7 +526,7 @@ TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n
 }
 
 void
-TAO_Hash_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Hash_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
@@ -563,7 +563,7 @@ TAO_Hash_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL)
       ACE_CHECK;
 
       poa->deactivate_object (id.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index c98b13d2b1a..448fff05a99 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -123,7 +123,7 @@ public:
 
   virtual void bind (const CosNaming::Name &n,
                      CORBA::Object_ptr obj
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   // Create a binding for name <n> and object <obj> in the naming
   // context.  Compound names are treated as follows: ctx->bind (<c1;
   // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>,
@@ -134,7 +134,7 @@ public:
 
   virtual void rebind (const CosNaming::Name &n,
                        CORBA::Object_ptr obj
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // This is similar to <bind> operation above, except for when the
   // binding for the specified name already exists in the specified
   // context.  In that case, the existing binding is replaced with the
@@ -142,20 +142,20 @@ public:
 
   virtual void bind_context (const CosNaming::Name &n,
                              CosNaming::NamingContext_ptr nc
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   // This is the version of <bind> specifically for binding naming
   // contexts, so that they will participate in name resolution when
   // compound names are passed to be resolved.
 
    virtual void rebind_context (const CosNaming::Name &n,
                                CosNaming::NamingContext_ptr nc
-                               TAO_ENV_ARG_DECL);
+                               ACE_ENV_ARG_DECL);
   // This is a version of <rebind> specifically for naming contexts,
   // so that they can participate in name resolution when compound
   // names are passed.
 
   virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
-                                     TAO_ENV_ARG_DECL);
+                                     ACE_ENV_ARG_DECL);
   // Return object reference that is bound to the name.  Compound name
   // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) =
   // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service
@@ -163,19 +163,19 @@ public:
   // for "narrowing" the object to the appropriate type.
 
   virtual void unbind (const CosNaming::Name &n
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // Remove the name binding from the context.  When compound names
   // are used, unbind is defined as follows: ctx->unbind (<c1; c2;
   // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
 
   virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n
-                                                         TAO_ENV_ARG_DECL);
+                                                         ACE_ENV_ARG_DECL);
   // This operation creates a new context and binds it to the name
   // supplied as an argument.  The newly-created context is
   // implemented by the same server as the context in which it was
   // bound (the name argument excluding the last component).
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
   // Delete the naming context.  The user should take care to <unbind> any
   // bindings in which the given context is bound to some names, to
   // avoid dangling references when invoking <destroy> operation.
@@ -190,7 +190,7 @@ protected:
   // = Helper method used by other methods.
 
   CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name
-                                            TAO_ENV_ARG_DECL);
+                                            ACE_ENV_ARG_DECL);
   // <get_context> is used by methods that need to resolve a compound
   // name before performing the actual operation (e.g., bind, unbind,
   // etc.)  <get_context> takes a full name (including the last
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index ef214adf61c..7b83b34e9b3 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -26,7 +26,7 @@ TAO_Naming_Context::~TAO_Naming_Context (void)
 }
 
 PortableServer::POA_ptr
-TAO_Naming_Context::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
+TAO_Naming_Context::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
 {
   return impl_->_default_POA ();
 }
@@ -34,110 +34,110 @@ TAO_Naming_Context::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
 void
 TAO_Naming_Context::bind (const CosNaming::Name &n,
                           CORBA::Object_ptr obj
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::NotFound,
                      CosNaming::NamingContext::CannotProceed,
                      CosNaming::NamingContext::InvalidName,
                      CosNaming::NamingContext::AlreadyBound))
 {
-  impl_->bind (n, obj TAO_ENV_ARG_PARAMETER);
+  impl_->bind (n, obj ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Naming_Context::rebind (const CosNaming::Name &n,
                             CORBA::Object_ptr obj
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  impl_->rebind (n, obj TAO_ENV_ARG_PARAMETER);
+  impl_->rebind (n, obj ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Naming_Context::bind_context (const CosNaming::Name &n,
                                   CosNaming::NamingContext_ptr nc
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName,
                        CosNaming::NamingContext::AlreadyBound))
 {
-  impl_->bind_context (n, nc TAO_ENV_ARG_PARAMETER);
+  impl_->bind_context (n, nc ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Naming_Context::rebind_context (const CosNaming::Name &n,
                                     CosNaming::NamingContext_ptr nc
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  impl_->rebind_context (n, nc TAO_ENV_ARG_PARAMETER);
+  impl_->rebind_context (n, nc ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
 TAO_Naming_Context::resolve (const CosNaming::Name &n
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  return impl_->resolve (n TAO_ENV_ARG_PARAMETER);
+  return impl_->resolve (n ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Naming_Context::unbind (const CosNaming::Name &n
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  impl_->unbind (n TAO_ENV_ARG_PARAMETER);
+  impl_->unbind (n ACE_ENV_ARG_PARAMETER);
 }
 
 CosNaming::NamingContext_ptr
-TAO_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return impl_->new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return impl_->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNaming::NamingContext_ptr
 TAO_Naming_Context::bind_new_context (const CosNaming::Name &n
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::AlreadyBound,
                        CosNaming::NamingContext::CannotProceed,
                        CosNaming::NamingContext::InvalidName))
 {
-  return impl_->bind_new_context (n TAO_ENV_ARG_PARAMETER);
+  return impl_->bind_new_context (n ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Naming_Context::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Naming_Context::destroy (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotEmpty))
 {
-  impl_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  impl_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_Naming_Context::list (CORBA::ULong how_many,
                           CosNaming::BindingList_out bl,
                           CosNaming::BindingIterator_out bi
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  impl_->list (how_many, bl, bi TAO_ENV_ARG_PARAMETER);
+  impl_->list (how_many, bl, bi ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -173,7 +173,7 @@ to_string_helper_assign (char * &k, const char * &src)
 
 char *
 TAO_Naming_Context::to_string (const CosNaming::Name &n
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContext::InvalidName))
 {
@@ -289,7 +289,7 @@ to_name_helper (char *dest, const char*& src)
 
 CosNaming::Name *
 TAO_Naming_Context::to_name (const char *sn
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContext::InvalidName))
 {
@@ -408,7 +408,7 @@ size_t
 TAO_Naming_Context::to_url_validate_and_compute_size (
     const char *addr,
     const char *sn
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   size_t addr_len = ACE_OS_String::strlen (addr);
 
@@ -439,7 +439,7 @@ TAO_Naming_Context::to_url_validate_and_compute_size (
 char *
 TAO_Naming_Context::to_url (const char * addr,
                             const char * sn
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContextExt::InvalidAddress,
                    CosNaming::NamingContext::InvalidName))
@@ -447,7 +447,7 @@ TAO_Naming_Context::to_url (const char * addr,
   /// Compute how many characters will be required for the URL
   CORBA::ULong no_char =
     TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
 
@@ -510,7 +510,7 @@ TAO_Naming_Context::to_url (const char * addr,
 
 CORBA::Object_ptr
 TAO_Naming_Context::resolve_str (const char * n
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNaming::NamingContext::NotFound,
                    CosNaming::NamingContext::CannotProceed,
@@ -521,11 +521,11 @@ TAO_Naming_Context::resolve_str (const char * n
   // argument instead of a Name.
 
   // Get the unstrigified name.
-  CosNaming::Name_var name = this->to_name (n TAO_ENV_ARG_PARAMETER);
+  CosNaming::Name_var name = this->to_name (n ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Pass this unstringified name to resolve and return an Object_ptr
-  return this->resolve (name.in () TAO_ENV_ARG_PARAMETER);
+  return this->resolve (name.in () ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_Naming_Context_Impl::~TAO_Naming_Context_Impl (void)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index 7168ed8deb4..e7ffff27984 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -55,7 +55,7 @@ public:
 
   virtual void bind (const CosNaming::Name &n,
                      CORBA::Object_ptr obj
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::NotFound,
                      CosNaming::NamingContext::CannotProceed,
@@ -72,7 +72,7 @@ public:
 
   virtual void rebind (const CosNaming::Name &n,
                        CORBA::Object_ptr obj
-                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -85,7 +85,7 @@ public:
 
   virtual void bind_context (const CosNaming::Name &n,
                              CosNaming::NamingContext_ptr nc
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -98,7 +98,7 @@ public:
 
   virtual void rebind_context (const CosNaming::Name &n,
                                CosNaming::NamingContext_ptr nc
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -108,7 +108,7 @@ public:
   // names are passed.
 
   virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
-                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -120,7 +120,7 @@ public:
   // for "narrowing" the object to the appropriate type.
 
   virtual void unbind (const CosNaming::Name &n
-                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::CannotProceed,
@@ -131,7 +131,7 @@ public:
   // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
 
   virtual CosNaming::NamingContext_ptr new_context (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // This operation returns a new naming context implemented by the
@@ -140,7 +140,7 @@ public:
 
   virtual CosNaming::NamingContext_ptr bind_new_context (
       const CosNaming::Name &n
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNaming::NamingContext::NotFound,
                        CosNaming::NamingContext::AlreadyBound,
@@ -153,7 +153,7 @@ public:
   // bound (the name argument excluding the last component).
 
 
-  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,
                        CosNaming::NamingContext::NotEmpty));
   // Delete the naming context.  The user should take care to <unbind> any
@@ -166,7 +166,7 @@ public:
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out bl,
                      CosNaming::BindingIterator_out bi
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Returns at most the requested number of bindings <how_many> in
@@ -175,7 +175,7 @@ public:
   // not contain any additional bindings <bi> returned as null.
 
   virtual char * to_string (const CosNaming::Name &n
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::InvalidName));
   // Stringify the name using '\' as the escape character. The
@@ -184,7 +184,7 @@ public:
   // an InvalidName exception is to be raised.
 
   virtual CosNaming::Name * to_name (const char *sn
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNaming::NamingContext::InvalidName));
   // The in parameter is an stringified name. This function removes the
@@ -193,7 +193,7 @@ public:
 
   virtual char * to_url ( const char * addr,
                           const char * sn
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS
                           )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -206,7 +206,7 @@ public:
   // iiopname://1.1@myhost.555xyz.com:9999/a/b/c
 
   virtual CORBA::Object_ptr resolve_str (const char * n
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS
                                          )
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
@@ -220,7 +220,7 @@ public:
   // It accepts a strigified name as an argument instead of a Name.
 
 
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Returns the Default POA of this Servant object
 
 private:
@@ -252,7 +252,7 @@ private:
 
   static size_t to_url_validate_and_compute_size (const char *add,
                                                   const char *sn
-                                                  TAO_ENV_ARG_DECL);
+                                                  ACE_ENV_ARG_DECL);
   // Validate the to_url() method input, and compute the size of the
   // returned URL address.
 
@@ -281,7 +281,7 @@ public:
 
   virtual void bind (const CosNaming::Name &n,
                      CORBA::Object_ptr obj
-                     TAO_ENV_ARG_DECL) = 0;
+                     ACE_ENV_ARG_DECL) = 0;
   // Create a binding for name <n> and object <obj> in the naming
   // context.  Compound names are treated as follows: ctx->bind (<c1;
   // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>,
@@ -292,7 +292,7 @@ public:
 
   virtual void rebind (const CosNaming::Name &n,
                        CORBA::Object_ptr obj
-                       TAO_ENV_ARG_DECL) = 0;
+                       ACE_ENV_ARG_DECL) = 0;
   // This is similar to <bind> operation above, except for when the
   // binding for the specified name already exists in the specified
   // context.  In that case, the existing binding is replaced with the
@@ -300,20 +300,20 @@ public:
 
   virtual void bind_context (const CosNaming::Name &n,
                              CosNaming::NamingContext_ptr nc
-                             TAO_ENV_ARG_DECL) = 0;
+                             ACE_ENV_ARG_DECL) = 0;
   // This is the version of <bind> specifically for binding naming
   // contexts, so that they will participate in name resolution when
   // compound names are passed to be resolved.
 
   virtual void rebind_context (const CosNaming::Name &n,
                                CosNaming::NamingContext_ptr nc
-                               TAO_ENV_ARG_DECL) = 0;
+                               ACE_ENV_ARG_DECL) = 0;
   // This is a version of <rebind> specifically for naming contexts,
   // so that they can participate in name resolution when compound
   // names are passed.
 
   virtual CORBA::Object_ptr resolve (const CosNaming::Name &n
-                                     TAO_ENV_ARG_DECL) = 0;
+                                     ACE_ENV_ARG_DECL) = 0;
   // Return object reference that is bound to the name.  Compound name
   // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) =
   // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service
@@ -321,24 +321,24 @@ public:
   // for "narrowing" the object to the appropriate type.
 
   virtual void unbind (const CosNaming::Name &n
-                       TAO_ENV_ARG_DECL) = 0;
+                       ACE_ENV_ARG_DECL) = 0;
   // Remove the name binding from the context.  When compound names
   // are used, unbind is defined as follows: ctx->unbind (<c1; c2;
   // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
 
-  virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL) = 0;
   // This operation returns a new naming context implemented by the
   // same naming server in which the operation was invoked.  The
   // context is not bound.
 
   virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n
-                                                         TAO_ENV_ARG_DECL) = 0;
+                                                         ACE_ENV_ARG_DECL) = 0;
   // This operation creates a new context and binds it to the name
   // supplied as an argument.  The newly-created context is
   // implemented by the same server as the context in which it was
   // bound (the name argument excluding the last component).
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) = 0;
   // Delete the naming context.  The user should take care to <unbind> any
   // bindings in which the given context is bound to some names, to
   // avoid dangling references when invoking <destroy> operation.
@@ -349,7 +349,7 @@ public:
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
                      CosNaming::BindingIterator_out &bi
-                     TAO_ENV_ARG_DECL) = 0;
+                     ACE_ENV_ARG_DECL) = 0;
   // Returns at most the requested number of bindings <how_many> in
   // <bl>.  If the naming context contains additional bindings, they
   // are returned with a BindingIterator.  In the naming context does
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index 1e12d7b1383..9f39cd79c65 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -31,17 +31,17 @@ TAO_Naming_Loader::~TAO_Naming_Loader (void)
 int
 TAO_Naming_Loader::init (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This function call initializes the Naming Service
       CORBA::Object_var object =
-        this->create_object (orb.in (), argc, argv TAO_ENV_ARG_PARAMETER);
+        this->create_object (orb.in (), argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -63,7 +63,7 @@ TAO_Naming_Loader::fini (void)
 CORBA::Object_ptr
 TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb,
                                   int argc, char *argv[]
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int result;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
index 61e0066a192..1f1730bf81e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
@@ -46,7 +46,7 @@ public:
   // ORB and the command line parameters.
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                    int argc, char *argv[]
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index 63ad2be955f..f3c19c757ee 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -77,14 +77,14 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
 {
   if (resolve_for_existing_naming_service)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
           // Try to find an existing Naming Service.
           CORBA::Object_var naming_obj =
             orb->resolve_initial_references ("NameService",
                                              timeout
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (naming_obj.in ()))
@@ -98,12 +98,12 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
 
               this->naming_context_ =
                 CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               this->naming_service_ior_ =
                 orb->object_to_string (naming_obj.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               return 0;
@@ -202,7 +202,7 @@ TAO_Naming_Server::init_with_orb (int argc,
 {
   int result;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Duplicate the ORB
@@ -210,7 +210,7 @@ TAO_Naming_Server::init_with_orb (int argc,
 
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -222,15 +222,15 @@ TAO_Naming_Server::init_with_orb (int argc,
 
       // Get the POA object.
       this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_Manager.
       PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->root_poa_->the_POAManager (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;
 
       CORBA::PolicyList policies (2);
@@ -239,13 +239,13 @@ TAO_Naming_Server::init_with_orb (int argc,
       // Id Assignment policy
       policies[0] =
         this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan policy
       policies[1] =
         this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We use a different POA, otherwise the user would have to change
@@ -253,7 +253,7 @@ TAO_Naming_Server::init_with_orb (int argc,
       this->ns_poa_ = this->root_poa_->create_POA ("NameService",
                                                    poa_manager.in (),
                                                    policies
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       // Warning!  If create_POA fails, then the policies won't be
       // destroyed and there will be hell to pay in memory leaks!
       ACE_TRY_CHECK;
@@ -264,7 +264,7 @@ TAO_Naming_Server::init_with_orb (int argc,
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -328,7 +328,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
                                     size_t context_size,
                                     int enable_multicast)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       if (persistence_location != 0)
@@ -364,7 +364,7 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
             TAO_Transient_Naming_Context::make_new_context (poa,
                                                             TAO_ROOT_NAMING_CONTEXT,
                                                             context_size
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
@@ -372,15 +372,15 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
       // Set the ior of the root Naming Context.
       this->naming_service_ior_=
         orb->object_to_string (this->naming_context_.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -390,9 +390,9 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
         {
           CORBA::String_var ior =
             orb->object_to_string (this->naming_context_.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          adapter->bind ("NameService", ior.in () TAO_ENV_ARG_PARAMETER);
+          adapter->bind ("NameService", ior.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -492,17 +492,17 @@ TAO_Naming_Server::fini (void)
   // the Naming Service
   ACE_TRY_NEW_ENV
     {
-      this->ns_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      this->ns_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       CORBA::Object_var table_object =
         this->orb_->resolve_initial_references ("IORTable"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -510,7 +510,7 @@ TAO_Naming_Server::fini (void)
         }
       else
         {
-          adapter->unbind ("NameService" TAO_ENV_ARG_PARAMETER);
+          adapter->unbind ("NameService" ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -564,11 +564,11 @@ int
 TAO_Naming_Client::init (CORBA::ORB_ptr orb,
                          ACE_Time_Value *timeout)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", timeout TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService", timeout ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -577,7 +577,7 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb,
                           -1);
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index 1fe01ea657a..4f14bdb4697 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -173,14 +173,14 @@ TAO_Persistent_Context_Index::init (size_t context_size)
     // CASE 1:there are no Naming Contexts registered.  We need to create
     // one.
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
 
       this->root_context_ =
         TAO_Persistent_Naming_Context::make_new_context (poa_.in (),
                                                          TAO_ROOT_NAMING_CONTEXT,
                                                          context_size,
                                                          this
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -246,16 +246,16 @@ TAO_Persistent_Context_Index::recreate_all (void)
       PortableServer::ServantBase_var s = context;
 
       // Register with the POA.
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId (entry->ext_id_.poa_id_);
 
       this->poa_->activate_object_with_id (id.in (),
                                            context
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      CosNaming::NamingContext_var result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CosNaming::NamingContext_var result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       // If this is the root Naming Context, take a note of it.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
index 43567878765..ce6379ec9b3 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -70,8 +70,8 @@ TAO_Persistent_Bindings_Map::find (const char *id,
     return -1;
   else
     {
-      TAO_ENV_DECLARE_NEW_ENV;
-      obj = orb_->string_to_object (entry.ref_ TAO_ENV_ARG_PARAMETER);
+      ACE_DECLARE_NEW_CORBA_ENV;
+      obj = orb_->string_to_object (entry.ref_ ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       type = entry.type_;
 
@@ -163,8 +163,8 @@ TAO_Persistent_Bindings_Map::shared_bind (const char * id,
                                           int rebind)
 {
   // Obtain a stringified ior of <obj> (i.e., the representation we can store).
-  TAO_ENV_DECLARE_NEW_ENV;
-  CORBA::String_var ref = orb_->object_to_string (obj TAO_ENV_ARG_PARAMETER);
+  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::String_var ref = orb_->object_to_string (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Calculate and allocate the memory we need to store this name to
@@ -323,7 +323,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
                                                  const char *poa_id,
                                                  size_t context_size,
                                                  TAO_Persistent_Context_Index * ind
-                                                 TAO_ENV_ARG_DECL)
+                                                 ACE_ENV_ARG_DECL)
 {
   // Store the stub we will return here.
   CosNaming::NamingContext_var result;
@@ -377,10 +377,10 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
 
   poa->activate_object_with_id (id.in (),
                                 context
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (result._retn ());
 
-  result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   // Everything went smoothly, without errors - we don't need any cleanup.
@@ -390,7 +390,7 @@ TAO_Persistent_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
 }
 
 CosNaming::NamingContext_ptr
-TAO_Persistent_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Persistent_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
@@ -416,7 +416,7 @@ TAO_Persistent_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL)
                       poa_id,
                       this->persistent_context_->total_size (),
                       this->index_
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   return result._retn ();
@@ -426,7 +426,7 @@ void
 TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
                                      CosNaming::BindingList_out &bl,
                                      CosNaming::BindingIterator_out &bi
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   // Allocate nil out parameters in case we won't be able to complete
   // the operation.
@@ -515,7 +515,7 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
 
       // Increment reference count on this Naming Context, so it doesn't get
       // deleted before the BindingIterator servant gets deleted.
-      interface_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      interface_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Register with the POA.
@@ -529,10 +529,10 @@ TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
 
       this->poa_->activate_object_with_id (id.in (),
                                            bind_iter
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      bi = bind_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      bi = bind_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
index 80be98ec6e5..970c52cad66 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -180,7 +180,7 @@ public:
                                                         const char *poa_id,
                                                         size_t context_size,
                                                         TAO_Persistent_Context_Index *ind
-                                                        TAO_ENV_ARG_DECL);
+                                                        ACE_ENV_ARG_DECL);
   // This utility method factors out the code needed to create a new
   // Persistent Naming Context servant and activate it under the
   // specified POA with the specified id.  This function is static so
@@ -189,7 +189,7 @@ public:
 
   // = Methods not implemented in TAO_Hash_Naming_Context.
 
-  virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL);
+  virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL);
   // This operation returns a new naming context implemented by the
   // same naming server in which the operation was invoked.  The
   // context is not bound.
@@ -197,7 +197,7 @@ public:
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
                      CosNaming::BindingIterator_out &bi
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   // Returns at most the requested number of bindings <how_many> in
   // <bl>.  If the naming context contains additional bindings, they
   // are returned with a BindingIterator.  In the naming context does
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index 14a4cf459a7..10c23a9165c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -142,7 +142,7 @@ CosNaming::NamingContext_ptr
 TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
                                                 const char *poa_id,
                                                 size_t context_size
-                                                TAO_ENV_ARG_DECL)
+                                                ACE_ENV_ARG_DECL)
 {
   // Store the stub we will return here.
   CosNaming::NamingContext_var result;
@@ -181,17 +181,17 @@ TAO_Transient_Naming_Context::make_new_context (PortableServer::POA_ptr poa,
 
   poa->activate_object_with_id (id.in (),
                                 context
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (result._retn ());
 
-  result = context->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  result = context->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   return result._retn ();
 }
 
 CosNaming::NamingContext_ptr
-TAO_Transient_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Transient_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (TAO_SYNCH_RECURSIVE_MUTEX,
                       ace_mon,
@@ -217,7 +217,7 @@ TAO_Transient_Naming_Context::new_context (TAO_ENV_SINGLE_ARG_DECL)
     make_new_context (this->poa_.in (),
                       poa_id,
                       this->transient_context_->total_size ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   return result._retn ();
@@ -227,7 +227,7 @@ void
 TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
                                     CosNaming::BindingList_out &bl,
                                     CosNaming::BindingIterator_out &bi
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   // Allocate nil out parameters in case we won't be able to complete
   // the operation.
@@ -316,7 +316,7 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
 
       // Increment reference count on this Naming Context, so it doesn't get
       // deleted before the BindingIterator servant gets deleted.
-      interface_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      interface_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Register with the POA.
@@ -330,10 +330,10 @@ TAO_Transient_Naming_Context::list (CORBA::ULong how_many,
 
       this->poa_->activate_object_with_id (id.in (),
                                            bind_iter
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      bi = bind_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      bi = bind_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
index 31912db4da8..3af69ee0ec8 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -140,7 +140,7 @@ public:
   static CosNaming::NamingContext_ptr make_new_context (PortableServer::POA_ptr poa,
                                                         const char *poa_id,
                                                         size_t context_size
-                                                        TAO_ENV_ARG_DECL);
+                                                        ACE_ENV_ARG_DECL);
   // This utility method factors out the code needed to create a new
   // Transient Naming Context servant and activate it under the
   // specified POA with the specified id.  This function is static so
@@ -149,7 +149,7 @@ public:
 
   // = Methods not implemented in TAO_Hash_Naming_Context.
 
-  virtual CosNaming::NamingContext_ptr new_context (TAO_ENV_SINGLE_ARG_DECL);
+  virtual CosNaming::NamingContext_ptr new_context (ACE_ENV_SINGLE_ARG_DECL);
   // This operation returns a new naming context implemented by the
   // same naming server in which the operation was invoked.  The
   // context is not bound.
@@ -157,7 +157,7 @@ public:
   virtual void list (CORBA::ULong how_many,
                      CosNaming::BindingList_out &bl,
                      CosNaming::BindingIterator_out &bi
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   // Returns at most the requested number of bindings <how_many> in
   // <bl>.  If the naming context contains additional bindings, they
   // are returned with a BindingIterator.  In the naming context does
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp
index f9c8e8a468f..727cd0d066a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.cpp
@@ -21,7 +21,7 @@ TAO_Notify_AdminProperties::~TAO_Notify_AdminProperties ()
 }
 
 CosNotification::AdminProperties*
-TAO_Notify_AdminProperties::get_admin (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_AdminProperties::get_admin (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -55,7 +55,7 @@ TAO_Notify_AdminProperties::get_admin (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_AdminProperties::set_admin (const CosNotification::AdminProperties & admin TAO_ENV_ARG_DECL)
+TAO_Notify_AdminProperties::set_admin (const CosNotification::AdminProperties & admin ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedAdmin
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h
index cd6ae6339b3..eb6345201b1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_AdminProperties.h
@@ -46,7 +46,7 @@ public:
   virtual ~TAO_Notify_AdminProperties ();
 
   virtual CosNotification::AdminProperties * get_admin (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -54,7 +54,7 @@ public:
 
   virtual void set_admin (
     const CosNotification::AdminProperties & admin
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp
index 36df545efc1..16db407d876 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp
@@ -27,7 +27,7 @@ TAO_Notify_Buffering_Strategy::~TAO_Notify_Buffering_Strategy ()
 }
 
 void
-TAO_Notify_Buffering_Strategy::execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/, ACE_Time_Value *tv)
+TAO_Notify_Buffering_Strategy::execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/, ACE_Time_Value *tv)
 {
   // use_max_queue_ may be set to 0.  If max_events_per_consumer_ is
   // 0, then we are going to use the maximum queue length regardless.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h
index a5cfba96459..2ad9e86908d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.h
@@ -47,7 +47,7 @@ public:
 
   virtual ~TAO_Notify_Buffering_Strategy ();
 
-  virtual void execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv);
+  virtual void execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue, TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value *tv);
   // Execute this strategy.
 
   void max_queue_length (CORBA::Long max_queue_length);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h
index b8df19fd784..8aba476a6d2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h
@@ -59,55 +59,55 @@ class TAO_Notify_Export TAO_Notify_CO_Factory : public ACE_Service_Object
   //
  public:
   // = Creation methods
-  virtual TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent TAO_ENV_ARG_DECL)=0;
+  virtual TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent ACE_ENV_ARG_DECL)=0;
   // Create an Event Channel.
 
-  virtual TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)=0;
+  virtual TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL)=0;
   // Create a Consumer Admin.
 
-  virtual TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)=0;
+  virtual TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL)=0;
   // Create a Supplier Admin.
 
-  virtual TAO_Notify_FilterFactory_i* create_filter_factory (TAO_ENV_SINGLE_ARG_DECL)=0;
+  virtual TAO_Notify_FilterFactory_i* create_filter_factory (ACE_ENV_SINGLE_ARG_DECL)=0;
   // Create the Filter Factory.
 
   // = Proxy Creation methods.
-  virtual TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0;
+  virtual TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL)=0;
   // Create a Structured ProxyPushSupplier.
 
-  virtual TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0;
+  virtual TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL)=0;
   // Create a Sequence ProxyPushSupplier.
 
-  virtual TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)=0;
+  virtual TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL)=0;
   // Create a ProxyPushSupplier.
 
-  virtual TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0;
+  virtual TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL)=0;
   // Create a Structured ProxyPushConsumer.
 
-  virtual TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0;
+  virtual TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL)=0;
   // Create a Sequence ProxyPushConsumer.
 
-  virtual TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)=0;
+  virtual TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL)=0;
   // Create a ProxyPushConsumer.
 
   //= Locks
   // = Methods to create locks.
-  virtual ACE_Lock* create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL)=0;
+  virtual ACE_Lock* create_channel_factory_lock (ACE_ENV_SINGLE_ARG_DECL)=0;
   // Create lock type used by channel factory.
 
-  virtual ACE_Lock* create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL)=0;
+  virtual ACE_Lock* create_event_channel_lock (ACE_ENV_SINGLE_ARG_DECL)=0;
   // Create lock type used by EC's.
 
-  virtual ACE_Lock* create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL)=0;
+  virtual ACE_Lock* create_consumer_admin_lock (ACE_ENV_SINGLE_ARG_DECL)=0;
   // Create lock type used by Consumer Admin's.
 
-  virtual ACE_Lock* create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL)=0;
+  virtual ACE_Lock* create_supplier_admin_lock (ACE_ENV_SINGLE_ARG_DECL)=0;
   // Create lock type used by Supplier Admin's.
 
-  virtual ACE_Lock* create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL)=0;
+  virtual ACE_Lock* create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_DECL)=0;
   // Create lock type used by proxy supplier.
 
-  virtual ACE_Lock* create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL)=0;
+  virtual ACE_Lock* create_proxy_consumer_lock (ACE_ENV_SINGLE_ARG_DECL)=0;
   // Create lock type used by proxy consumer.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp
index ee8f631d50b..ccd18699281 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.cpp
@@ -52,9 +52,9 @@ TAO_Notify_Shutdown_Worker::TAO_Notify_Shutdown_Worker (void)
 }
 
 void
-TAO_Notify_Shutdown_Worker::work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL)
+TAO_Notify_Shutdown_Worker::work (TAO_Notify_EventListener* listener ACE_ENV_ARG_DECL)
 {
-  listener->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  listener->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 /********************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h
index 046ed275efd..1b2717ecb17 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection.h
@@ -80,7 +80,7 @@ class TAO_Notify_Export TAO_Notify_Shutdown_Worker : public TAO_ESF_Worker<TAO_N
   TAO_Notify_Shutdown_Worker (void);
 
   // = TAO_ESF_Worker method
-  void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL);
+  void work (TAO_Notify_EventListener* listener ACE_ENV_ARG_DECL);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h
index 54fa37c4495..4a2b0664811 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h
@@ -40,10 +40,10 @@ class TAO_Notify_Export TAO_Notify_Collection_Factory : public ACE_Service_Objec
   //
 public:
   // = Methods to create listener collections.
-  virtual TAO_Notify_EventListener_List* create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual TAO_Notify_EventListener_List* create_event_listener_list (ACE_ENV_SINGLE_ARG_DECL) = 0;
   // Create the event listener list.
 
- virtual TAO_Notify_UpdateListener_List* create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL) = 0;
+ virtual TAO_Notify_UpdateListener_List* create_update_listener_list (ACE_ENV_SINGLE_ARG_DECL) = 0;
   // create update listener list.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h
index ec7cca5e588..21e24ff0f50 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h
@@ -50,7 +50,7 @@ class TAO_Notify_Export TAO_Notify_Command : public ACE_Message_Block
   TAO_Notify_Command (TAO_Notify_Event_Processor* event_processor, TAO_Notify_Event* event);
   ~TAO_Notify_Command ();
 
-  virtual int execute (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL) = 0;
   // Command callback
 
   virtual CORBA::Short priority (void) const;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
index 55ecf32f9aa..70cca1e06f0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -16,7 +16,7 @@ TAO_Notify_Constraint_Interpreter::~TAO_Notify_Constraint_Interpreter (void)
 void
 TAO_Notify_Constraint_Interpreter::build_tree (
     const char *constraints
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint,
                    CORBA::NO_MEMORY))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index ca8274732b5..31e4eb5c4e5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
@@ -32,7 +32,7 @@
 
 class TAO_Notify_Constraint_Visitor;
 
-class TAO_Notify_Export TAO_Notify_Constraint_Interpreter 
+class TAO_Notify_Export TAO_Notify_Constraint_Interpreter
   : public TAO_ETCL_Interpreter
 {
   //
@@ -49,7 +49,7 @@ public:
   // Destructor
 
   void build_tree (const char* constraints
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosNotifyFilter::InvalidConstraint,
                      CORBA::NO_MEMORY));
   // This constructor builds an expression tree representing the
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index 19bb5ca02ef..bc1882ea915 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -15,7 +15,7 @@ TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void)
 {
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::bind_structured_event (
     const CosNotification::StructuredEvent &s_event
   )
@@ -29,14 +29,14 @@ TAO_Notify_Constraint_Visitor::bind_structured_event (
       int status =
         this->property_lookup_.bind (
             name_str,
-            ACE_const_cast (CORBA::Any *, 
+            ACE_const_cast (CORBA::Any *,
                             &s_event.filterable_data[index].value)
           );
 
       if (status != 0)
         {
           return 1;
-        } 
+        }
     }
 
   return 0;
@@ -75,7 +75,7 @@ TAO_Notify_Constraint_Visitor::visit_literal (
   return 0;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident)
 {
   int return_value = -1;
@@ -96,7 +96,7 @@ TAO_Notify_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident)
   return return_value;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_union_value (
     TAO_ETCL_Union_Value *union_value
   )
@@ -119,7 +119,7 @@ TAO_Notify_Constraint_Visitor::visit_union_value (
   return 0;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_union_pos (
     TAO_ETCL_Union_Pos *union_pos
   )
@@ -134,7 +134,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
 
           TAO_DynUnion_i dyn_union;
           dyn_union.init (this->current_member_.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::TypeCode_var tc = this->current_member_->type ();
@@ -146,12 +146,12 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
             case TAO_ETCL_UNSIGNED:
               {
                 CORBA::Any disc_any;
-                CORBA::TypeCode_var disc_tc = 
-                  tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+                CORBA::TypeCode_var disc_tc =
+                  tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
-                CORBA::TCKind disc_kind = 
+                CORBA::TCKind disc_kind =
                   TAO_DynAnyFactory::unalias (disc_tc.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
                 ACE_TRY_CHECK;
 
                 switch (disc_kind)
@@ -194,16 +194,16 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
 
                 DynamicAny::DynAny_var dyn_any =
                   TAO_DynAnyFactory::make_dyn_any (disc_any
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
                 ACE_TRY_CHECK;
                 dyn_union.set_discriminator (dyn_any.in ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
                 ACE_TRY_CHECK;
                 DynamicAny::DynAny_var u_member =
-                  dyn_union.member (TAO_ENV_SINGLE_ARG_PARAMETER);
+                  dyn_union.member (ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
-                this->current_member_ = 
-                  u_member->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+                this->current_member_ =
+                  u_member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
 
                 break;
@@ -211,8 +211,8 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
             case TAO_ETCL_STRING:
               {
                 const char *name = (const char *) disc_val;
-                CORBA::ULong count = 
-                  tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+                CORBA::ULong count =
+                  tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
 
                 const char *member_name = 0;
@@ -221,7 +221,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
                 for (i = 0; i < count; ++i)
                   {
                     member_name = tc->member_name (i
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
                     ACE_TRY_CHECK;
 
                     if (ACE_OS::strcmp (name, member_name) == 0)
@@ -230,16 +230,16 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
                       }
                   }
 
-                // If there's no match, member_label will throw 
+                // If there's no match, member_label will throw
                 // CORBA::TypeCode::Bounds and the catch block will
                 // return -1;
-                this->current_member_ = tc->member_label (i 
-                                                          TAO_ENV_ARG_PARAMETER);
+                this->current_member_ = tc->member_label (i
+                                                          ACE_ENV_ARG_PARAMETER);
                 ACE_TRY_CHECK;
 
                 break;
               }
-            // The TAO_ETCL_Union_Value that was put on the queue 
+            // The TAO_ETCL_Union_Value that was put on the queue
             // shouldn't have any other type.
             default:
               return -1;
@@ -274,7 +274,7 @@ TAO_Notify_Constraint_Visitor::visit_union_pos (
   ACE_ENDTRY;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_component_pos (
     TAO_ETCL_Component_Pos *pos
   )
@@ -286,7 +286,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
       // component as found in property_lookup_ will be in current_member_.
       CORBA::TypeCode_var tc = this->current_member_->type ();
       CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAny_var member;
@@ -299,11 +299,11 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
           {
             TAO_DynEnum_i dyn_enum;
             dyn_enum.init (this->current_member_.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             success = dyn_enum.seek (slot
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             if (success == 0)
@@ -311,8 +311,8 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
                 return -1;
               }
 
-            member = 
-              dyn_enum.current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+            member =
+              dyn_enum.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             break;
@@ -321,11 +321,11 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
           {
             TAO_DynStruct_i dyn_struct;
             dyn_struct.init (this->current_member_.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             success = dyn_struct.seek (slot
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             if (success == 0)
@@ -333,7 +333,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
                 return -1;
               }
 
-            member = dyn_struct.current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+            member = dyn_struct.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             break;
@@ -345,7 +345,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
           return -1;
       }
 
-      CORBA::Any_var value = member->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_ETCL_Constraint *comp = pos->component ();
@@ -369,7 +369,7 @@ TAO_Notify_Constraint_Visitor::visit_component_pos (
   ACE_ENDTRY;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_component_assoc (
     TAO_ETCL_Component_Assoc *assoc
   )
@@ -379,7 +379,7 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc (
   // no way that TAO can put one into the event's filterable data.
   // However, from the looks of the ETCL grammar, I believe that a
   // contruct like 'exist $(foo)' is legal, and is in effect using
-  // the event's filterable data as one big NVList. It is 
+  // the event's filterable data as one big NVList. It is
   // equivalent to '$.foo'. I've implemented this method on that
   // basis, while keeping in mind that a clearer interpretation of
   // the spec may come along someday.
@@ -413,7 +413,7 @@ TAO_Notify_Constraint_Visitor::visit_component_assoc (
     }
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_component_array (
     TAO_ETCL_Component_Array *array
   )
@@ -425,7 +425,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array (
       // component as found in property_lookup_ will be in current_member_.
       CORBA::TypeCode_var tc = this->current_member_->type ();
       CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAny_var member;
@@ -438,11 +438,11 @@ TAO_Notify_Constraint_Visitor::visit_component_array (
           {
             TAO_DynEnum_i dyn_array;
             dyn_array.init (this->current_member_.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             success = dyn_array.seek (slot
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             if (success == 0)
@@ -450,7 +450,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array (
                 return -1;
               }
 
-            member = dyn_array.current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+            member = dyn_array.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             break;
@@ -459,11 +459,11 @@ TAO_Notify_Constraint_Visitor::visit_component_array (
           {
             TAO_DynStruct_i dyn_sequence;
             dyn_sequence.init (this->current_member_.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             success = dyn_sequence.seek (slot
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             if (success == 0)
@@ -471,8 +471,8 @@ TAO_Notify_Constraint_Visitor::visit_component_array (
                 return -1;
               }
 
-            member = 
-              dyn_sequence.current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+            member =
+              dyn_sequence.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             break;
@@ -483,7 +483,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array (
           return -1;
       }
 
-      CORBA::Any_var value = member->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var value = member->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_ETCL_Constraint *comp = array->component ();
@@ -507,7 +507,7 @@ TAO_Notify_Constraint_Visitor::visit_component_array (
   ACE_ENDTRY;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -522,7 +522,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
             // If the TCKind is not a sequence or an array, the
             // call to length() will raise an exception, and the
             // catch block will return -1;
-            CORBA::ULong length = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+            CORBA::ULong length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             TAO_ETCL_Literal_Constraint lit (length);
@@ -536,14 +536,14 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
             // catch block will return -1;
             TAO_DynUnion_i dyn_union;
             dyn_union.init (this->current_member_.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
-            DynamicAny::DynAny_var disc = 
-              dyn_union.get_discriminator (TAO_ENV_SINGLE_ARG_PARAMETER);
+            DynamicAny::DynAny_var disc =
+              dyn_union.get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
-            CORBA::Any_var disc_any = disc->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+            CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             TAO_ETCL_Literal_Constraint lit (disc_any);
@@ -552,7 +552,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
           }
         case TAO_ETCL_TYPE_ID:
           {
-            const char *name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+            const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             TAO_ETCL_Literal_Constraint lit (name);
@@ -561,7 +561,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
           }
         case TAO_ETCL_REPOS_ID:
           {
-            const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+            const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             TAO_ETCL_Literal_Constraint lit (id);
@@ -579,7 +579,7 @@ TAO_Notify_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
   ACE_ENDTRY;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_component (
     TAO_ETCL_Component *component
   )
@@ -611,7 +611,7 @@ TAO_Notify_Constraint_Visitor::visit_component (
     }
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_dot (TAO_ETCL_Dot *dot)
 {
   // If we are here, we know we're headed for a more nested
@@ -620,7 +620,7 @@ TAO_Notify_Constraint_Visitor::visit_dot (TAO_ETCL_Dot *dot)
   return dot->component ()->accept (this);
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_eval (TAO_ETCL_Eval *eval)
 {
   // Nothing to do but visit the contained component.
@@ -649,7 +649,7 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
 
       // If the current member is not a union, this call will
       // throw BadKind and the catch block will return -1.
-      CORBA::Long default_index = tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Long default_index = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // No default index.
@@ -674,11 +674,11 @@ TAO_Notify_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
   ACE_ENDTRY;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist)
 {
   TAO_ETCL_Constraint *component = exist->component ();
-  
+
   if (component->accept (this) == 0)
     {
       TAO_ETCL_Literal_Constraint top;
@@ -698,7 +698,7 @@ TAO_Notify_Constraint_Visitor::visit_exist (TAO_ETCL_Exist *exist)
   return -1;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_unary_expr (
     TAO_ETCL_Unary_Expr *unary_expr
   )
@@ -739,7 +739,7 @@ TAO_Notify_Constraint_Visitor::visit_unary_expr (
   return -1;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_binary_expr (
     TAO_ETCL_Binary_Expr *binary_expr
   )
@@ -773,7 +773,7 @@ TAO_Notify_Constraint_Visitor::visit_binary_expr (
   }
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_or (
     TAO_ETCL_Binary_Expr *binary
   )
@@ -815,7 +815,7 @@ TAO_Notify_Constraint_Visitor::visit_or (
   return return_value;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_and (
     TAO_ETCL_Binary_Expr *binary
   )
@@ -928,7 +928,7 @@ TAO_Notify_Constraint_Visitor::visit_binary_op (
   return return_value;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_twiddle (
     TAO_ETCL_Binary_Expr *binary
   )
@@ -958,7 +958,7 @@ TAO_Notify_Constraint_Visitor::visit_twiddle (
   return return_value;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_in (
     TAO_ETCL_Binary_Expr *binary
   )
@@ -990,7 +990,7 @@ TAO_Notify_Constraint_Visitor::visit_in (
                 {
                   CORBA::TypeCode_var tc = component->type ();
                   kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
               ACE_CATCHANY
@@ -1004,23 +1004,23 @@ TAO_Notify_Constraint_Visitor::visit_in (
               switch (kind)
               {
                 case CORBA::tk_sequence:
-                  result = this->sequence_does_contain (component, 
+                  result = this->sequence_does_contain (component,
                                                         left);
                   break;
                 case CORBA::tk_array:
-                  result = this->array_does_contain (component, 
+                  result = this->array_does_contain (component,
                                                      left);
                   break;
                 case CORBA::tk_struct:
-                  result = this->struct_does_contain (component, 
+                  result = this->struct_does_contain (component,
                                                       left);
                   break;
                 case CORBA::tk_union:
-                  result = this->union_does_contain (component, 
+                  result = this->union_does_contain (component,
                                                      left);
                   break;
                 case CORBA::tk_any:
-                  result = this->any_does_contain (component, 
+                  result = this->any_does_contain (component,
                                                    left);
                   break;
                 default:
@@ -1036,7 +1036,7 @@ TAO_Notify_Constraint_Visitor::visit_in (
   return return_value;
 }
 
-int 
+int
 TAO_Notify_Constraint_Visitor::visit_preference (
     TAO_ETCL_Preference *
   )
@@ -1059,7 +1059,7 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (
     {
       CORBA::TypeCode_var type = any->type ();
       CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The literal and the array elements must be
@@ -1073,12 +1073,12 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (
         }
 
       TAO_DynSequence_i dyn_seq;
-      dyn_seq.init (*any 
-                    TAO_ENV_ARG_PARAMETER);
+      dyn_seq.init (*any
+                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      DynamicAny::AnySeq_var any_seq = 
-        dyn_seq.get_elements (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::AnySeq_var any_seq =
+        dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ULong length = any_seq->length ();
@@ -1100,7 +1100,7 @@ TAO_Notify_Constraint_Visitor::sequence_does_contain (
   ACE_ENDTRY;
 
   return 0;
-}                                
+}
 
 CORBA::Boolean
 TAO_Notify_Constraint_Visitor::array_does_contain (
@@ -1113,7 +1113,7 @@ TAO_Notify_Constraint_Visitor::array_does_contain (
     {
       CORBA::TypeCode_var type = any->type ();
       CORBA::TCKind kind = TAO_DynAnyFactory::unalias (type.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The literal and the array elements must be
@@ -1127,12 +1127,12 @@ TAO_Notify_Constraint_Visitor::array_does_contain (
         }
 
       TAO_DynArray_i dyn_array;
-      dyn_array.init (*any 
-                      TAO_ENV_ARG_PARAMETER);
+      dyn_array.init (*any
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      DynamicAny::AnySeq_var any_seq = 
-        dyn_array.get_elements (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::AnySeq_var any_seq =
+        dyn_array.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ULong length = any_seq->length ();
@@ -1167,11 +1167,11 @@ TAO_Notify_Constraint_Visitor::struct_does_contain (
     {
       TAO_DynStruct_i dyn_struct;
       dyn_struct.init (*any
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::NameValuePairSeq_var members =
-        dyn_struct.get_members (TAO_ENV_SINGLE_ARG_PARAMETER);
+        dyn_struct.get_members (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ULong length = members->length ();
@@ -1182,7 +1182,7 @@ TAO_Notify_Constraint_Visitor::struct_does_contain (
         {
           tc = members[i].value.type ();
           kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // The literal and the struct member must be
@@ -1222,20 +1222,20 @@ TAO_Notify_Constraint_Visitor::union_does_contain (
   ACE_TRY
     {
       TAO_DynUnion_i dyn_union;
-      dyn_union.init (*any 
-                      TAO_ENV_ARG_PARAMETER);
+      dyn_union.init (*any
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      DynamicAny::DynAny_var cc = 
-        dyn_union.current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc =
+        dyn_union.current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-  
-      CORBA::Any_var member = cc->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+
+      CORBA::Any_var member = cc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::TypeCode_var tc = member->type ();
       CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // The literal and the union member must be
@@ -1287,21 +1287,21 @@ TAO_Notify_Constraint_Visitor::simple_type_match (int expr_type,
           return 0;
         }
     case TAO_ETCL_DOUBLE:
-      if (tc_kind != CORBA::tk_double 
+      if (tc_kind != CORBA::tk_double
           && tc_kind != CORBA::tk_float)
         {
           return 0;
         }
     case TAO_ETCL_INTEGER:
     case TAO_ETCL_SIGNED:
-      if (tc_kind != CORBA::tk_short 
+      if (tc_kind != CORBA::tk_short
           && tc_kind != CORBA::tk_long
           && tc_kind != CORBA::tk_longlong)
         {
           return 0;
         }
     case TAO_ETCL_UNSIGNED:
-      if (tc_kind != CORBA::tk_ushort 
+      if (tc_kind != CORBA::tk_ushort
           && tc_kind != CORBA::tk_ulong
           && tc_kind != CORBA::tk_ulonglong)
         {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
index 5653d01839a..d73d7d209e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
@@ -87,32 +87,32 @@ TAO_Notify_ConsumerAdmin_i::_decr_refcnt (void)
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_ConsumerAdmin_i::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
 {
   this->_incr_refcnt ();
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_ConsumerAdmin_i::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
 {
   this->_decr_refcnt ();
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::dispatch_event (TAO_Notify_Event &event ACE_ENV_ARG_DECL)
 {
   // Dispatch the event to all the registered listeners.
   TAO_Notify_Dispatch_Command_Worker worker (&event, this->event_manager_->event_processor ());
   // Propogate the filter command.
 
-  this->event_listener_list_->for_each (&worker TAO_ENV_ARG_PARAMETER);
+  this->event_listener_list_->for_each (&worker ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean /*eval_parent*/ TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean /*eval_parent*/ ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean bval =
-    this->get_filter_admin ().match (event TAO_ENV_ARG_PARAMETER);
+    this->get_filter_admin ().match (event ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if ((bval == 1 && this->filter_operator_ == CosNotifyChannelAdmin::AND_OP) ||
@@ -125,7 +125,7 @@ TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boo
     // note the last param. we ask that the parent filter *not* be evaluated again
     // because we've done it here.
 
-    this->event_listener_list_->for_each (&worker TAO_ENV_ARG_PARAMETER);
+    this->event_listener_list_->for_each (&worker ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
     // Propogate the filter command.
 
@@ -138,7 +138,7 @@ TAO_Notify_ConsumerAdmin_i::evaluate_filter (TAO_Notify_Event &event, CORBA::Boo
 
       // OR we could instead do:
       //
-      // this->dispatch_event (event TAO_ENV_ARG_PARAMETER);
+      // this->dispatch_event (event ACE_ENV_ARG_PARAMETER);
       // return 0;
       //
       // This will short circuit a few steps, because the event processor is going to
@@ -160,24 +160,24 @@ void
 TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id,
                                   CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator,
                                   PortableServer::POA_ptr my_POA
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   my_POA_ = PortableServer::POA::_duplicate (my_POA);
 
   this->lock_ =
-    this->channel_objects_factory_->create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->channel_objects_factory_->create_consumer_admin_lock (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_pushsupplier_POA_ = this->poa_factory_->
     create_proxy_pushsupplier_POA (this->my_POA_.in (), my_id
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->my_id_ = my_id;
   this->filter_operator_ = filter_operator;
 
   this->event_listener_list_ =
-    this->collection_factory_->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->collection_factory_->create_event_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the task to forward filtering/dispatching commands to:
@@ -185,12 +185,12 @@ TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id,
   // add a "get_singleton_reactive_task" to the event manager factory interface.
   this->dispatching_task_ =
     new TAO_Notify_Worker_Task ();
-  /*this->event_manager_objects_factory_->create_dispatching_task (TAO_ENV_SINGLE_ARG_PARAMETER);
+  /*this->event_manager_objects_factory_->create_dispatching_task (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   */
   this->filter_eval_task_ =
     new TAO_Notify_Worker_Task ();
-  // this->event_manager_objects_factory_->create_listener_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER);
+  // this->event_manager_objects_factory_->create_listener_eval_task (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get hold of the admin properties.
@@ -221,7 +221,7 @@ TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id,
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotification::EventTypeSeq removed;
 
@@ -234,50 +234,50 @@ TAO_Notify_ConsumerAdmin_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
   this->subscription_list_.populate (removed);
 
   this->event_manager_->subscribe_for_events (this,
-                                              added, removed TAO_ENV_ARG_PARAMETER);
+                                              added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate ourselves
   this->poa_factory_->deactivate_object (this, this->my_POA_.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 
   // shutdown proxy's.
   TAO_Notify_Shutdown_Worker shutdown_worker;
 
-  this->event_listener_list_->for_each (&shutdown_worker TAO_ENV_ARG_PARAMETER);
+  this->event_listener_list_->for_each (&shutdown_worker ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->event_listener_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->event_listener_list_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->poa_factory_->destroy_POA (this->proxy_pushsupplier_POA_.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->dispatching_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->filter_eval_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // unregister from EC
-  this->event_channel_->unregister_listener (this TAO_ENV_ARG_PARAMETER);
+  this->event_channel_->unregister_listener (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 TAO_Notify_Worker_Task*
@@ -293,14 +293,14 @@ TAO_Notify_ConsumerAdmin_i::filter_eval_task (void)
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
                    ))
 {
   this->event_manager_->subscribe_for_events (this, //*this->event_listener_list_,
-                                              added, removed TAO_ENV_ARG_PARAMETER);
+                                              added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   {
     ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
@@ -314,15 +314,15 @@ TAO_Notify_ConsumerAdmin_i::subscription_change (const CosNotification::EventTyp
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_ConsumerAdmin_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::get_ref (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var obj = this->poa_factory_->
-    servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER);
+    servant_to_reference (this->my_POA_.in (), this ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_Notify_Event_Manager*
@@ -338,30 +338,30 @@ TAO_Notify_ConsumerAdmin_i::get_filter_admin (void)
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::register_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::register_listener (TAO_Notify_EventListener *listener ACE_ENV_ARG_DECL)
 {
   // register it.
-  this->event_listener_list_->connected (listener TAO_ENV_ARG_PARAMETER);
+  this->event_listener_list_->connected (listener ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::unregister_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::unregister_listener (TAO_Notify_EventListener *listener ACE_ENV_ARG_DECL)
 {
-  this->event_listener_list_->disconnected (listener TAO_ENV_ARG_PARAMETER);
+  this->event_listener_list_->disconnected (listener ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::deactivate_proxy_pushsupplier (PortableServer::Servant servant TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::deactivate_proxy_pushsupplier (PortableServer::Servant servant ACE_ENV_ARG_DECL)
 {
   this->poa_factory_->
     deactivate_object (servant, this->proxy_pushsupplier_POA_.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::AdminID
-TAO_Notify_ConsumerAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_ConsumerAdmin_i::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -370,16 +370,16 @@ TAO_Notify_ConsumerAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SING
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_ConsumerAdmin_i::MyChannel (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return event_channel_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return event_channel_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_Notify_ConsumerAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_ConsumerAdmin_i::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -388,16 +388,16 @@ TAO_Notify_ConsumerAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_EN
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_ConsumerAdmin_i::push_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::push_suppliers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->proxy_pushsupplier_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->proxy_pushsupplier_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
-TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ProxyNotFound
@@ -406,73 +406,73 @@ TAO_Notify_ConsumerAdmin_i::get_proxy_supplier (CosNotifyChannelAdmin::ProxyID p
   CORBA::Object_var obj =
     this->poa_factory_->id_to_reference (proxy_id,
                                          proxy_pushsupplier_POA_.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ());
 
   return CosNotifyChannelAdmin::ProxySupplier::_narrow (obj.in ());
 }
 
 CORBA::Object_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
 {
   TAO_Notify_StructuredProxyPushSupplier_i* struct_proxy_pushsupplier =
     this->channel_objects_factory_->create_struct_proxy_pushsupplier (this
-                                                                      TAO_ENV_ARG_PARAMETER);
+                                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var proxy_pushsupplier_var (struct_proxy_pushsupplier);
 
-  struct_proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER);
+  struct_proxy_pushsupplier->init (proxy_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return this->poa_factory_->
     activate_object_with_id (proxy_id,
                              this->proxy_pushsupplier_POA_.in (),
                              struct_proxy_pushsupplier
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
 {
   TAO_Notify_SequenceProxyPushSupplier_i* seq_proxy_pushsupplier =
     this->channel_objects_factory_->create_seq_proxy_pushsupplier (this
-                                                                   TAO_ENV_ARG_PARAMETER);
+                                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var proxy_pushsupplier_var (seq_proxy_pushsupplier);
 
-  seq_proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER);
+  seq_proxy_pushsupplier->init (proxy_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return this->poa_factory_->
     activate_object_with_id (proxy_id,
                              this->proxy_pushsupplier_POA_.in (),
                              seq_proxy_pushsupplier
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
 {
   TAO_Notify_ProxyPushSupplier_i* proxy_pushsupplier =
-    this->channel_objects_factory_->create_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER);
+    this->channel_objects_factory_->create_proxy_pushsupplier (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var proxy_pushsupplier_var (proxy_pushsupplier);
 
-  proxy_pushsupplier->init (proxy_id TAO_ENV_ARG_PARAMETER);
+  proxy_pushsupplier->init (proxy_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return this->poa_factory_->
     activate_object_with_id (proxy_id,
                              this->proxy_pushsupplier_POA_.in (),
                              proxy_pushsupplier
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::AdminLimitExceeded
@@ -492,13 +492,13 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelA
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
-        obj = this->obtain_proxy_pushsupplier_i (proxy_id TAO_ENV_ARG_PARAMETER);
+        obj = this->obtain_proxy_pushsupplier_i (proxy_id ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ());
       }
       break;
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
-        obj = this->obtain_struct_proxy_pushsupplier_i (proxy_id TAO_ENV_ARG_PARAMETER);
+        obj = this->obtain_struct_proxy_pushsupplier_i (proxy_id ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ());
       }
       break;
@@ -506,7 +506,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelA
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
       {
         obj = this->obtain_sequence_proxy_pushsupplier_i (proxy_id
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxySupplier::_nil ());
       }
       break;
@@ -518,26 +518,26 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_push_supplier (CosNotifyChannelA
 
   this->proxy_pushsupplier_ids_.next (); // commit this id to the pool
   return CosNotifyChannelAdmin::ProxySupplier::_narrow (obj.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotification::QoSProperties*
-TAO_Notify_ConsumerAdmin_i::get_qos (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::get_qos (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->qos_admin_.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER);
+  this->qos_admin_.set_qos (qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Then update our task's qos
@@ -552,64 +552,64 @@ TAO_Notify_ConsumerAdmin_i::set_qos (const CosNotification::QoSProperties & qos
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER);
+  this->qos_admin_.validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterID
-TAO_Notify_ConsumerAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER);
+  return this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::remove_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
                    ))
 {
-  this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER);
+  this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_Notify_ConsumerAdmin_i::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
                    ))
 {
-  return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER);
+  return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterIDSeq*
-TAO_Notify_ConsumerAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -622,21 +622,21 @@ TAO_Notify_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
 
   PortableServer::ServantBase_var proxy_var (cosec_proxy);
 
-  cosec_proxy->init (TAO_ENV_SINGLE_ARG_PARAMETER);
+  cosec_proxy->init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushSupplier::_nil ());
 
   PortableServer::POA_var def_poa =
     this->event_channel_->get_default_POA ();
 
   CORBA::Object_var obj = this->poa_factory_->
-    activate_object (def_poa.in (), cosec_proxy TAO_ENV_ARG_PARAMETER);
+    activate_object (def_poa.in (), cosec_proxy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushSupplier::_nil ());
 
   return CosEventChannelAdmin::ProxyPushSupplier::_narrow (obj.in ());
 }
 
 CosNotifyChannelAdmin::ProxySupplier_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     CosNotifyChannelAdmin::AdminLimitExceeded
@@ -647,7 +647,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_notification_pull_supplier (CosNotifyChannelA
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -658,7 +658,7 @@ TAO_Notify_ConsumerAdmin_i::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL)
 
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ConsumerAdmin_i::priority_filter (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -668,7 +668,7 @@ TAO_Notify_ConsumerAdmin_i::priority_filter (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -677,7 +677,7 @@ TAO_Notify_ConsumerAdmin_i::priority_filter (CosNotifyFilter::MappingFilter_ptr
 }
 
 CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ConsumerAdmin_i::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -687,7 +687,7 @@ TAO_Notify_ConsumerAdmin_i::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ TAO_ENV_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -696,7 +696,7 @@ TAO_Notify_ConsumerAdmin_i::lifetime_filter (CosNotifyFilter::MappingFilter_ptr
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_ConsumerAdmin_i::pull_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ConsumerAdmin_i::pull_suppliers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -714,10 +714,10 @@ TAO_Notify_Filter_Command_Worker::TAO_Notify_Filter_Command_Worker (TAO_Notify_E
 }
 
 void
-TAO_Notify_Filter_Command_Worker::work (TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL)
+TAO_Notify_Filter_Command_Worker::work (TAO_Notify_EventListener* event_listener ACE_ENV_ARG_DECL)
 {
   this->event_processor_->evaluate_listener_filter (this->event_, event_listener,
-                                                    this->eval_parent_ TAO_ENV_ARG_PARAMETER);
+                                                    this->eval_parent_ ACE_ENV_ARG_PARAMETER);
 }
 
 /****************************************************************************************************/
@@ -733,9 +733,9 @@ TAO_Notify_Dispatch_Command_Worker::~TAO_Notify_Dispatch_Command_Worker ()
 }
 
 void
-TAO_Notify_Dispatch_Command_Worker::work (TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL)
+TAO_Notify_Dispatch_Command_Worker::work (TAO_Notify_EventListener* event_listener ACE_ENV_ARG_DECL)
 {
-  this->event_processor_->dispatch_event (this->event_, event_listener TAO_ENV_ARG_PARAMETER);
+  this->event_processor_->dispatch_event (this->event_, event_listener ACE_ENV_ARG_PARAMETER);
 }
 
 /****************************************************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h
index 1e7aa09ff50..a4e272b46fa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h
@@ -69,17 +69,17 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList
   virtual CORBA::ULong _decr_refcnt (void);
 
   // = The Servant methods
-  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
 
   //= TAO_Notify_EventListener methods
-  virtual void dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL);
+  virtual void dispatch_event (TAO_Notify_Event &event ACE_ENV_ARG_DECL);
   // Callback methods to supply the event to the listener.
 
-  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL);
+  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent ACE_ENV_ARG_DECL);
   // Evaluates true if this event is acceptable by the listener.
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // Ask the listener to relinqish any bindings and prepare to be disposed.
 
   virtual TAO_Notify_Worker_Task* event_dispatch_task (void);
@@ -92,10 +92,10 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList
   void init (CosNotifyChannelAdmin::AdminID myID,
              CosNotifyChannelAdmin::InterFilterGroupOperator myOperator,
              PortableServer::POA_ptr my_POA
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize the Consumer Admin.
 
-  CosNotifyChannelAdmin::ConsumerAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL);
+  CosNotifyChannelAdmin::ConsumerAdmin_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL);
   // Return the CORBA object for this servant.
 
   TAO_Notify_Event_Manager* get_event_manager (void);
@@ -104,13 +104,13 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList
   TAO_Notify_FilterAdmin_i& get_filter_admin (void);
   // Get our filter admin.
 
-  void deactivate_proxy_pushsupplier (PortableServer::Servant servant TAO_ENV_ARG_DECL);
+  void deactivate_proxy_pushsupplier (PortableServer::Servant servant ACE_ENV_ARG_DECL);
   // Deactivate servant from <proxy_pushsupplier_POA_>.
 
-  void register_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL);
+  void register_listener (TAO_Notify_EventListener *listener ACE_ENV_ARG_DECL);
   // Register with parent for subscription updates.
 
-  void unregister_listener (TAO_Notify_EventListener *listener TAO_ENV_ARG_DECL);
+  void unregister_listener (TAO_Notify_EventListener *listener ACE_ENV_ARG_DECL);
   // Unregister with parent from subscription updates.
 
   void proxy_pushsupplier_destroyed (CosNotifyChannelAdmin::ProxyID proxyID);
@@ -118,28 +118,28 @@ class TAO_Notify_Export TAO_Notify_ConsumerAdmin_i : public TAO_Notify_EventList
 
   // = Interface methods
   virtual CosNotifyChannelAdmin::AdminID MyID (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyFilter::MappingFilter_ptr priority_filter (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -147,14 +147,14 @@ virtual CosNotifyFilter::MappingFilter_ptr priority_filter (
 
 virtual void priority_filter (
     CosNotifyFilter::MappingFilter_ptr priority_filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -162,21 +162,21 @@ virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter (
 
 virtual void lifetime_filter (
     CosNotifyFilter::MappingFilter_ptr lifetime_filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ProxyIDSeq * pull_suppliers (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -184,7 +184,7 @@ virtual CosNotifyChannelAdmin::ProxyIDSeq * push_suppliers (
 
 virtual CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (
     CosNotifyChannelAdmin::ProxyID proxy_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -194,7 +194,7 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr get_proxy_supplier (
 virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_supplier (
     CosNotifyChannelAdmin::ClientType ctype,
     CosNotifyChannelAdmin::ProxyID_out proxy_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -204,7 +204,7 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_pull_suppli
 virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_supplier (
     CosNotifyChannelAdmin::ClientType ctype,
     CosNotifyChannelAdmin::ProxyID_out proxy_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -212,14 +212,14 @@ virtual CosNotifyChannelAdmin::ProxySupplier_ptr obtain_notification_push_suppli
   ));
 
 virtual void destroy (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotification::QoSProperties * get_qos (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -227,7 +227,7 @@ virtual CosNotification::QoSProperties * get_qos (
 
 virtual void set_qos (
     const CosNotification::QoSProperties & qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -237,7 +237,7 @@ virtual void set_qos (
 virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -247,7 +247,7 @@ virtual void validate_qos (
 virtual void subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -256,7 +256,7 @@ virtual void subscription_change (
 
 virtual CosNotifyFilter::FilterID add_filter (
     CosNotifyFilter::Filter_ptr new_filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -264,7 +264,7 @@ virtual CosNotifyFilter::FilterID add_filter (
 
 virtual void remove_filter (
     CosNotifyFilter::FilterID filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -273,7 +273,7 @@ virtual void remove_filter (
 
 virtual CosNotifyFilter::Filter_ptr get_filter (
     CosNotifyFilter::FilterID filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -281,28 +281,28 @@ virtual CosNotifyFilter::Filter_ptr get_filter (
   ));
 
 virtual CosNotifyFilter::FilterIDSeq * get_all_filters (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void remove_all_filters (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -310,16 +310,16 @@ virtual CosEventChannelAdmin::ProxyPullSupplier_ptr obtain_pull_supplier (
 
 protected:
   // = Helper methods
-  void destroy_i (TAO_ENV_SINGLE_ARG_DECL);
+  void destroy_i (ACE_ENV_SINGLE_ARG_DECL);
   // Destroy CA
 
- CORBA::Object_ptr obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL);
+ CORBA::Object_ptr obtain_struct_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL);
  // Obtain a proxy pushsupplier object
 
- CORBA::Object_ptr obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL);
+ CORBA::Object_ptr obtain_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL);
  // Obtain a structured proxy pushsupplier object.
 
- CORBA::Object_ptr obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL);
+ CORBA::Object_ptr obtain_sequence_proxy_pushsupplier_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL);
  // Obtain a sequence proxy pushsupplier object.
 
  // = Data members
@@ -400,7 +400,7 @@ public:
   TAO_Notify_Filter_Command_Worker (TAO_Notify_Event* event, TAO_Notify_Event_Processor* event_processor, CORBA::Boolean eval_parent);
 
   // = TAO_ESF_Worker method
-  void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL);
+  void work (TAO_Notify_EventListener* listener ACE_ENV_ARG_DECL);
 
 protected:
   TAO_Notify_Event* event_;
@@ -423,7 +423,7 @@ public:
   ~TAO_Notify_Dispatch_Command_Worker ();
 
   // = TAO_ESF_Worker method
-  void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL);
+  void work (TAO_Notify_EventListener* listener ACE_ENV_ARG_DECL);
 
 protected:
   TAO_Notify_Event* event_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
index f827f9e389f..83869d678f5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
@@ -46,7 +46,7 @@ TAO_Notify_Default_CO_Factory::fini (void)
 
 
 TAO_Notify_EventChannel_i*
-TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFactory_i* parent TAO_ENV_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFactory_i* parent ACE_ENV_ARG_DECL)
 {
   TAO_Notify_EventChannel_i* channel;
   ACE_NEW_THROW_EX (channel,
@@ -57,7 +57,7 @@ TAO_Notify_Default_CO_Factory::create_event_channel (TAO_Notify_EventChannelFact
 
 TAO_Notify_ConsumerAdmin_i*
 TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i* event_channel
-                                                      TAO_ENV_ARG_DECL)
+                                                      ACE_ENV_ARG_DECL)
 {
   TAO_Notify_ConsumerAdmin_i* consumer_admin_i;
   ACE_NEW_THROW_EX (consumer_admin_i,
@@ -67,11 +67,11 @@ TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i*
     {
       // Propagate the event channels qos to the consumer
       CosNotification::QoSProperties_var qos =
-                           event_channel->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
+                           event_channel->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       consumer_admin_i->set_qos (qos.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -86,7 +86,7 @@ TAO_Notify_Default_CO_Factory::create_consumer_admin (TAO_Notify_EventChannel_i*
 
 TAO_Notify_SupplierAdmin_i*
 TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i* event_channel
-                                                   TAO_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL)
 {
   TAO_Notify_SupplierAdmin_i* supplier_admin_i;
 
@@ -97,11 +97,11 @@ TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i*
     {
       // Propagate the event channels qos to the supplier
       CosNotification::QoSProperties_var qos =
-                           event_channel->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
+                           event_channel->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       supplier_admin_i->set_qos (qos.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -116,7 +116,7 @@ TAO_Notify_Default_CO_Factory::create_supplier_admin (TAO_Notify_EventChannel_i*
 
 
 TAO_Notify_FilterFactory_i*
-TAO_Notify_Default_CO_Factory::create_filter_factory (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_filter_factory (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Notify_FilterFactory_i* filterfactory;
   ACE_NEW_THROW_EX (filterfactory,
@@ -127,7 +127,7 @@ TAO_Notify_Default_CO_Factory::create_filter_factory (TAO_ENV_SINGLE_ARG_DECL)
 
 
 TAO_Notify_StructuredProxyPushSupplier_i*
-TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL)
 {
   TAO_Notify_StructuredProxyPushSupplier_i* proxy;
   ACE_NEW_THROW_EX (proxy,
@@ -137,11 +137,11 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_Cons
     {
       // Propagate the parent qos to the supplier
       CosNotification::QoSProperties_var qos =
-                           parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
+                           parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       proxy->set_qos (qos.in ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -155,7 +155,7 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushsupplier (TAO_Notify_Cons
 }
 
 TAO_Notify_SequenceProxyPushSupplier_i*
-TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL)
 {
   TAO_Notify_SequenceProxyPushSupplier_i* proxy;
   ACE_NEW_THROW_EX (proxy,
@@ -165,11 +165,11 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_Consume
     {
       // Propagate the parent qos to the supplier
       CosNotification::QoSProperties_var qos =
-                           parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
+                           parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       proxy->set_qos (qos.in ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -183,7 +183,7 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushsupplier (TAO_Notify_Consume
 }
 
 TAO_Notify_ProxyPushSupplier_i*
-TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL)
 {
   TAO_Notify_ProxyPushSupplier_i* proxy;
   ACE_NEW_THROW_EX (proxy,
@@ -193,11 +193,11 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdm
     {
       // Propagate the parent qos to the supplier
       CosNotification::QoSProperties_var qos =
-                           parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
+                           parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       proxy->set_qos (qos.in ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -212,7 +212,7 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushsupplier (TAO_Notify_ConsumerAdm
 
 
 TAO_Notify_StructuredProxyPushConsumer_i*
-TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL)
 {
   TAO_Notify_StructuredProxyPushConsumer_i* proxy;
   ACE_NEW_THROW_EX (proxy,
@@ -222,11 +222,11 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_Supp
     {
       // Propagate the parent qos to the consumer
       CosNotification::QoSProperties_var qos =
-                           parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
+                           parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       proxy->set_qos (qos.in ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -240,7 +240,7 @@ TAO_Notify_Default_CO_Factory::create_struct_proxy_pushconsumer (TAO_Notify_Supp
 }
 
 TAO_Notify_ProxyPushConsumer_i*
-TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL)
 {
   TAO_Notify_ProxyPushConsumer_i* proxy;
   ACE_NEW_THROW_EX (proxy,
@@ -250,11 +250,11 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdm
     {
       // Propagate the parent qos to the consumer
       CosNotification::QoSProperties_var qos =
-                           parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
+                           parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       proxy->set_qos (qos.in ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -268,7 +268,7 @@ TAO_Notify_Default_CO_Factory::create_proxy_pushconsumer (TAO_Notify_SupplierAdm
 }
 
 TAO_Notify_SequenceProxyPushConsumer_i*
-TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL)
 {
   TAO_Notify_SequenceProxyPushConsumer_i* proxy;
   ACE_NEW_THROW_EX (proxy,
@@ -278,11 +278,11 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_Supplie
     {
       // Propagate the parent qos to the consumer
       CosNotification::QoSProperties_var qos =
-                           parent->get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
+                           parent->get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       proxy->set_qos (qos.in ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -297,13 +297,13 @@ TAO_Notify_Default_CO_Factory::create_seq_proxy_pushconsumer (TAO_Notify_Supplie
 
 
 ACE_Lock*
-TAO_Notify_Default_CO_Factory::create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_channel_factory_lock (ACE_ENV_SINGLE_ARG_DECL)
 {
-  return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_Lock*
-TAO_Notify_Default_CO_Factory::create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_event_channel_lock (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_Lock* lock;
   ACE_NEW_THROW_EX (lock,
@@ -313,31 +313,31 @@ TAO_Notify_Default_CO_Factory::create_event_channel_lock (TAO_ENV_SINGLE_ARG_DEC
 }
 
 ACE_Lock*
-TAO_Notify_Default_CO_Factory::create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_consumer_admin_lock (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Later:
-  return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_Lock*
-TAO_Notify_Default_CO_Factory::create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_supplier_admin_lock (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Later:
-  return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_Lock*
-TAO_Notify_Default_CO_Factory::create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Later:
-  return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_Lock*
-TAO_Notify_Default_CO_Factory::create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Default_CO_Factory::create_proxy_consumer_lock (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Later:
-  return create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
index 8dd11836a7b..dda4365bfbf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
@@ -51,55 +51,55 @@ public:
 
   // = TAO_Notify_CO_Factory methods
   // = Creation methods
-  TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent TAO_ENV_ARG_DECL);
+  TAO_Notify_EventChannel_i* create_event_channel (TAO_Notify_EventChannelFactory_i* parent ACE_ENV_ARG_DECL);
   // Create an Event Channel.
 
-  TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL);
+  TAO_Notify_ConsumerAdmin_i* create_consumer_admin (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL);
   // Create a Consumer Admin.
 
-  TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL);
+  TAO_Notify_SupplierAdmin_i* create_supplier_admin (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL);
   // Create a Supplier Admin.
 
-  TAO_Notify_FilterFactory_i* create_filter_factory (TAO_ENV_SINGLE_ARG_DECL);
+  TAO_Notify_FilterFactory_i* create_filter_factory (ACE_ENV_SINGLE_ARG_DECL);
   // Create the Filter Factory.
 
   // = Proxy Creation methods.
-  TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL);
+  TAO_Notify_StructuredProxyPushSupplier_i* create_struct_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL);
   // Create a Structured ProxyPushSupplier.
 
-  TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL);
+  TAO_Notify_SequenceProxyPushSupplier_i* create_seq_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL);
   // Create a Sequence ProxyPushSupplier.
 
-  TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent TAO_ENV_ARG_DECL);
+  TAO_Notify_ProxyPushSupplier_i* create_proxy_pushsupplier (TAO_Notify_ConsumerAdmin_i* parent ACE_ENV_ARG_DECL);
   // Create a ProxyPushSupplier.
 
-  TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL);
+  TAO_Notify_StructuredProxyPushConsumer_i* create_struct_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL);
   // Create a Structured ProxyPushConsumer.
 
-  TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL);
+  TAO_Notify_SequenceProxyPushConsumer_i* create_seq_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL);
   // Create a Sequence ProxyPushConsumer.
 
-  TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent TAO_ENV_ARG_DECL);
+  TAO_Notify_ProxyPushConsumer_i* create_proxy_pushconsumer (TAO_Notify_SupplierAdmin_i* parent ACE_ENV_ARG_DECL);
   // Create a ProxyPushConsumer.
 
   //= Locks
   // = Methods to create locks.
-  ACE_Lock* create_channel_factory_lock (TAO_ENV_SINGLE_ARG_DECL);
+  ACE_Lock* create_channel_factory_lock (ACE_ENV_SINGLE_ARG_DECL);
   // Create lock type used by channel factory.
 
-  ACE_Lock* create_event_channel_lock (TAO_ENV_SINGLE_ARG_DECL);
+  ACE_Lock* create_event_channel_lock (ACE_ENV_SINGLE_ARG_DECL);
   // Create lock type used by EC's.
 
-  ACE_Lock* create_consumer_admin_lock (TAO_ENV_SINGLE_ARG_DECL);
+  ACE_Lock* create_consumer_admin_lock (ACE_ENV_SINGLE_ARG_DECL);
   // Create lock type used by Consumer Admin's.
 
-  ACE_Lock* create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_DECL);
+  ACE_Lock* create_supplier_admin_lock (ACE_ENV_SINGLE_ARG_DECL);
   // Create lock type used by Supplier Admin's.
 
-  ACE_Lock* create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_DECL);
+  ACE_Lock* create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_DECL);
   // Create lock type used by proxy supplier.
 
-  ACE_Lock* create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_DECL);
+  ACE_Lock* create_proxy_consumer_lock (ACE_ENV_SINGLE_ARG_DECL);
   // Create lock type used by proxy consumer.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
index da83f014891..a5a3eaf53de 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
@@ -39,7 +39,7 @@ TAO_Notify_Default_Collection_Factory::fini (void)
 }
 
 TAO_Notify_EventListener_List*
-TAO_Notify_Default_Collection_Factory::create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_Default_Collection_Factory::create_event_listener_list (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
 {
   // @@ Pradeep: the copy_on_write versions are a much better choice
   // for a default than the immediate changes version.  The latter
@@ -68,7 +68,7 @@ ACE_NEW_THROW_EX (listener_list,
 }
 
 TAO_Notify_UpdateListener_List*
-TAO_Notify_Default_Collection_Factory::create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_Default_Collection_Factory::create_update_listener_list (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
 {
 
   /*  TAO_Notify_UpdateListener_List* listener_list =
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
index 78c621a790d..1d8dca43561 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
@@ -51,10 +51,10 @@ public:
   virtual int fini (void);
 
   // = Methods to create listener collections.
-  virtual TAO_Notify_EventListener_List* create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_EventListener_List* create_event_listener_list (ACE_ENV_SINGLE_ARG_DECL);
   // Create the event listener list.
 
- virtual TAO_Notify_UpdateListener_List* create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL);
+ virtual TAO_Notify_UpdateListener_List* create_update_listener_list (ACE_ENV_SINGLE_ARG_DECL);
   // create update listener list.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
index 8504fedf3a2..82bf4ee4b74 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
@@ -129,7 +129,7 @@ TAO_Notify_Default_EMO_Factory::init (int argc, char* argv[])
 }
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_task (int mt, int tp_size TAO_ENV_ARG_DECL)
+TAO_Notify_Default_EMO_Factory::create_task (int mt, int tp_size ACE_ENV_ARG_DECL)
 {
   TAO_Notify_Worker_Task* task;
 
@@ -166,21 +166,21 @@ TAO_Notify_Default_EMO_Factory::init_instance (void)
 int
 TAO_Notify_Default_EMO_Factory::preallocate_tasks (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   this->prealloc_source_eval_task_ =
     create_task (EMO_OPTIONS::instance ()->mt_source_eval_, EMO_OPTIONS::instance ()->source_threads_
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->prealloc_listener_eval_task_ =
     create_task (EMO_OPTIONS::instance ()->mt_listener_eval_, EMO_OPTIONS::instance ()->listener_threads_
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->prealloc_dispatching_task_ =
     create_task (EMO_OPTIONS::instance ()->mt_dispatching_, EMO_OPTIONS::instance ()->dispatching_threads_
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -194,7 +194,7 @@ TAO_Notify_Default_EMO_Factory::fini (void)
 }
 
 TAO_Notify_Event_Manager*
-TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)
+TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL)
 {
   TAO_Notify_Event_Manager* event_manager;
   ACE_NEW_THROW_EX (event_manager,
@@ -204,7 +204,7 @@ TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i*
 }
 
 TAO_Notify_Event_Map*
-TAO_Notify_Default_EMO_Factory::create_event_map (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Default_EMO_Factory::create_event_map (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Notify_Event_Map* event_map;
   ACE_NEW_THROW_EX (event_map,
@@ -214,7 +214,7 @@ TAO_Notify_Default_EMO_Factory::create_event_map (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 TAO_Notify_Event_Processor*
-TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL)
+TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager* event_manager ACE_ENV_ARG_DECL)
 {
   TAO_Notify_Event_Processor* event_processor;
   ACE_NEW_THROW_EX (event_processor,
@@ -225,49 +225,49 @@ TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager
 
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_source_eval_task (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Default_EMO_Factory::create_source_eval_task (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1)
     return create_task (EMO_OPTIONS::instance ()->mt_source_eval_,
                         EMO_OPTIONS::instance ()->source_threads_
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   else
     return prealloc_source_eval_task_;
 }
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_lookup_task (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Default_EMO_Factory::create_lookup_task (ACE_ENV_SINGLE_ARG_DECL)
 {
   return create_task (EMO_OPTIONS::instance ()->mt_lookup_,
-                      EMO_OPTIONS::instance ()->lookup_threads_ TAO_ENV_ARG_PARAMETER);
+                      EMO_OPTIONS::instance ()->lookup_threads_ ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_listener_eval_task (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Default_EMO_Factory::create_listener_eval_task (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1)
     return create_task (EMO_OPTIONS::instance ()->mt_listener_eval_,
                         EMO_OPTIONS::instance ()->listener_threads_
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   else
     return prealloc_listener_eval_task_;
 }
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Default_EMO_Factory::create_dispatching_task (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1)
     return create_task (EMO_OPTIONS::instance ()->mt_dispatching_,
                         EMO_OPTIONS::instance ()->dispatching_threads_
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   else
     return prealloc_dispatching_task_;
 }
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_updates_task (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Default_EMO_Factory::create_updates_task (ACE_ENV_SINGLE_ARG_DECL)
 {
-  return create_task (EMO_OPTIONS::instance ()->asynch_updates_, ASYNCH_UPDATES_THREADS TAO_ENV_ARG_PARAMETER);
+  return create_task (EMO_OPTIONS::instance ()->asynch_updates_, ASYNCH_UPDATES_THREADS ACE_ENV_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
index 18ada3e25f0..0157a74f071 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
@@ -70,21 +70,21 @@ class TAO_Notify_Export TAO_Notify_Default_EMO_Factory : public TAO_Notify_EMO_F
   virtual int init (int argc, char* argv[]);
   virtual int fini (void);
 
-  virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL);
+  virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL);
   // Create an event manager.
 
-  virtual TAO_Notify_Event_Map* create_event_map (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Event_Map* create_event_map (ACE_ENV_SINGLE_ARG_DECL);
   // Create the event map.
 
-  virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL);
+  virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager ACE_ENV_ARG_DECL);
   // Create event processor.
 
   // = Create processing tasks.
-  virtual TAO_Notify_Worker_Task* create_source_eval_task (TAO_ENV_SINGLE_ARG_DECL);
-  virtual TAO_Notify_Worker_Task* create_lookup_task (TAO_ENV_SINGLE_ARG_DECL);
-  virtual TAO_Notify_Worker_Task* create_listener_eval_task ( TAO_ENV_SINGLE_ARG_DECL);
-  virtual TAO_Notify_Worker_Task* create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL);
-  virtual TAO_Notify_Worker_Task* create_updates_task (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Worker_Task* create_source_eval_task (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Worker_Task* create_lookup_task (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Worker_Task* create_listener_eval_task ( ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Worker_Task* create_dispatching_task (ACE_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Notify_Worker_Task* create_updates_task (ACE_ENV_SINGLE_ARG_DECL);
 
   virtual void destroy_source_eval_task (TAO_Notify_Worker_Task* task);
   virtual void destroy_lookup_task (TAO_Notify_Worker_Task* task);
@@ -97,7 +97,7 @@ class TAO_Notify_Export TAO_Notify_Default_EMO_Factory : public TAO_Notify_EMO_F
 
 protected:
   //= Protected Methods
-  TAO_Notify_Worker_Task* create_task (int mt, int tp_size TAO_ENV_ARG_DECL);
+  TAO_Notify_Worker_Task* create_task (int mt, int tp_size ACE_ENV_ARG_DECL);
   // Create a worker task, mt => is this a MT task, if so, tp_size is thread pool size.
 
   int preallocate_tasks (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
index 6db78cedef9..578a10b5878 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
@@ -36,59 +36,59 @@ TAO_Notify_Default_POA_Factory::fini (void)
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Default_POA_Factory::create_event_channel_POA (PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL)
+TAO_Notify_Default_POA_Factory::create_event_channel_POA (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL)
 {
   return this->create_generic_childPOA_i (EC_POA_NAME,
-                                          parent_poa TAO_ENV_ARG_PARAMETER);
+                                          parent_poa ACE_ENV_ARG_PARAMETER);
 }
 
 
 PortableServer::POA_ptr
-TAO_Notify_Default_POA_Factory::create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL)
+TAO_Notify_Default_POA_Factory::create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL)
 {
   char child_poa_name[BUFSIZ];
 
   ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "SA");
 
   return this->create_generic_childPOA_i (child_poa_name, parent_poa
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Default_POA_Factory::create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL)
+TAO_Notify_Default_POA_Factory::create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL)
 {
   char child_poa_name[BUFSIZ];
 
   ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "CA");
 
   return this->create_generic_childPOA_i (child_poa_name,
-                                          parent_poa TAO_ENV_ARG_PARAMETER);
+                                          parent_poa ACE_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Default_POA_Factory::create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL)
+TAO_Notify_Default_POA_Factory::create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL)
 {
   char child_poa_name[BUFSIZ];
 
   ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "PPC");
 
   return this->create_generic_childPOA_i (child_poa_name,
-                                          parent_poa TAO_ENV_ARG_PARAMETER);
+                                          parent_poa ACE_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Default_POA_Factory::create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL)
+TAO_Notify_Default_POA_Factory::create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL)
 {
   char child_poa_name[BUFSIZ];
 
   ACE_OS::sprintf (child_poa_name, "%d%s", new_poa_id, "PPS");
 
   return this->create_generic_childPOA_i (child_poa_name,
-                                          parent_poa TAO_ENV_ARG_PARAMETER);
+                                          parent_poa ACE_ENV_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL)
+TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
 {
   // @@ Pradeep: if the Notification service is ever going to be
   // persistent or fault tolerant you may need to create this stuff
@@ -100,16 +100,16 @@ TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa
   // to detect duplicates for us.
   PortableServer::IdUniquenessPolicy_var idpolicy =
     poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil());
 
   PortableServer::IdAssignmentPolicy_var assignpolicy =
     poa->create_id_assignment_policy (PortableServer::USER_ID
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   PortableServer::POAManager_var manager =
-    poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Create a PolicyList
@@ -126,10 +126,10 @@ TAO_Notify_Default_POA_Factory::create_generic_childPOA_i (const char* child_poa
   PortableServer::POA_var poa_ret = poa->create_POA (child_poa_name,
                                                      manager.in (),
                                                      policy_list
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil());
 
-  idpolicy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  idpolicy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil());
 
   assignpolicy->destroy ();
@@ -169,7 +169,7 @@ TAO_Notify_Default_POA_Factory::long_to_ObjectId (const CORBA::Long id)
 }
 
 CORBA::Object_ptr
-TAO_Notify_Default_POA_Factory::activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL)
+TAO_Notify_Default_POA_Factory::activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa, PortableServer::Servant servant ACE_ENV_ARG_DECL)
 {
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
@@ -177,75 +177,75 @@ TAO_Notify_Default_POA_Factory::activate_object_with_id (CORBA::Long id, Portabl
 
   poa->activate_object_with_id (oid.in (),
                                 servant
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return poa->id_to_reference (oid.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_Default_POA_Factory::activate_object (PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL)
+TAO_Notify_Default_POA_Factory::activate_object (PortableServer::POA_ptr poa, PortableServer::Servant servant ACE_ENV_ARG_DECL)
 {
-  PortableServer::ObjectId_var oid = poa->activate_object (servant TAO_ENV_ARG_PARAMETER);
+  PortableServer::ObjectId_var oid = poa->activate_object (servant ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  return poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER);
+  return poa->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_Default_POA_Factory::servant_to_reference (PortableServer::POA_ptr poa, PortableServer::Servant servant TAO_ENV_ARG_DECL)
+TAO_Notify_Default_POA_Factory::servant_to_reference (PortableServer::POA_ptr poa, PortableServer::Servant servant ACE_ENV_ARG_DECL)
 {
-  PortableServer::ObjectId_var oid = poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
+  PortableServer::ObjectId_var oid = poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  return poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER);
+  return poa->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_Default_POA_Factory::id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL)
+TAO_Notify_Default_POA_Factory::id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
 {
   // Convert CORBA::Long to ObjectId
   PortableServer::ObjectId_var oid =
     this->long_to_ObjectId (id);
 
   return poa->id_to_reference (oid.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Default_POA_Factory::destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL)
+TAO_Notify_Default_POA_Factory::destroy_POA (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
 {
   if (!CORBA::is_nil (poa))
-    poa->destroy (1,0 TAO_ENV_ARG_PARAMETER);
+    poa->destroy (1,0 ACE_ENV_ARG_PARAMETER);
   // The <wait_for_completion> flag causes a deadlock when destroying the POA
   // because we are involved in an upcall.
   // TODO:I have to think about what the implications of not waiting are.
 }
 
 void
-TAO_Notify_Default_POA_Factory::deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL)
+TAO_Notify_Default_POA_Factory::deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (poa) || CORBA::is_nil (obj))
     return;
 
   PortableServer::ObjectId_var id =
-    poa->reference_to_id (obj TAO_ENV_ARG_PARAMETER);
+    poa->reference_to_id (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_Default_POA_Factory::deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL)
+TAO_Notify_Default_POA_Factory::deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (poa) || servant == 0)
     return;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
index 44b314cfdf0..0d327a128b2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
@@ -47,41 +47,41 @@ public:
   virtual int init (int argc, char* argv[]);
   virtual int fini (void);
 
-  PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL);
+  PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL);
   // Create the POA to activate Event Channels in.
 
-  PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL);
+  PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL);
   // Create the POA to activate SA's in.
 
-  PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL);
+  PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL);
   // Create the POA to activate CA's in.
 
-  PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL);
+  PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL);
   // Create the POA to activate proxy push consumers in.
 
-  PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL);
+  PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL);
   // Create the POA to activate proxy push suppliers in.
 
   // = Object activation and POA methods
-  CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL);
+  CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL);
   // Converts <id> to an ObjectId and registers with the POA <poa>.
 
-  CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL);
+  CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL);
   // Registers with the POA <poa>.
 
-  CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL);
+  CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL);
   // Registers with the POA <poa>.
 
-  CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
+  CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
   // Look for the Object with id <id> in <poa>.
 
-  void destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
+  void destroy_POA (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
   // Destroy the <poa>
 
-  void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
+  void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
   // Deactivate the object.
 
-  void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr TAO_ENV_ARG_DECL);
+  void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr ACE_ENV_ARG_DECL);
   // Deactivate the object.
 
 protected:
@@ -90,7 +90,7 @@ protected:
   PortableServer::ObjectId* long_to_ObjectId (const CORBA::Long id);
   // Converts a CORBA::Long to an ObjectId
 
-  PortableServer::POA_ptr create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL);
+  PortableServer::POA_ptr create_generic_childPOA_i (const char* child_poa_name, PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL);
   // Create the POA with the most generic policies required of our POA's.
 
 };
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp
index 32a2f1f4798..c4ea39c8e9a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.cpp
@@ -246,30 +246,30 @@ TAO_Notify_Any::event_type (void) const
 
 CORBA::Boolean
 TAO_Notify_Any::do_match (CosNotifyFilter::Filter_ptr filter
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                           "TAO_Notify_Any::do_match ()\n"));
 
-  return filter->match (*this->data_ TAO_ENV_ARG_PARAMETER);
+  return filter->match (*this->data_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_Any::do_push (CosEventComm::PushConsumer_ptr consumer
-                         TAO_ENV_ARG_DECL) const
+                         ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                           "TAO_Notify_Any::do_push ("
                           "CosEventComm::PushConsumer_ptr)\n"));
 
-  consumer->push (*this->data_ TAO_ENV_ARG_PARAMETER);
+  consumer->push (*this->data_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_Any::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer
-                         TAO_ENV_ARG_DECL) const
+                         ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
@@ -282,7 +282,7 @@ TAO_Notify_Any::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer
   event.header.fixed_header.event_type.type_name = CORBA::string_dup ("%ANY");
   event.header.fixed_header.event_type.domain_name = CORBA::string_dup ("");
 
-  consumer->push_structured_event (event TAO_ENV_ARG_PARAMETER);
+  consumer->push_structured_event (event ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -290,7 +290,7 @@ TAO_Notify_Any::do_push (CosNotifyComm::SequencePushConsumer_ptr consumer,
                          const TAO_Notify_QoSAdmin_i& /*qos_admin*/,
                          CosNotification::EventBatch& /*unsent*/,
                          int /*flush_queue*/
-                         TAO_ENV_ARG_DECL) const
+                         ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
@@ -307,7 +307,7 @@ TAO_Notify_Any::do_push (CosNotifyComm::SequencePushConsumer_ptr consumer,
   events.length (1);
   events[0] = event;
 
-  consumer->push_structured_events (events TAO_ENV_ARG_PARAMETER);
+  consumer->push_structured_events (events ACE_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -420,18 +420,18 @@ TAO_Notify_StructuredEvent::event_type (void) const
 
 CORBA::Boolean
 TAO_Notify_StructuredEvent::do_match (CosNotifyFilter::Filter_ptr filter
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                           "TAO_Notify_StructuredEvent::do_match ()\n"));
 
-  return filter->match_structured (*this->data_ TAO_ENV_ARG_PARAMETER);
+  return filter->match_structured (*this->data_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_StructuredEvent::do_push (CosEventComm::PushConsumer_ptr consumer
-                                     TAO_ENV_ARG_DECL) const
+                                     ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
@@ -443,18 +443,18 @@ TAO_Notify_StructuredEvent::do_push (CosEventComm::PushConsumer_ptr consumer
   any <<= *this->data_;
   // is the typecode set by this operation or do we need to set it explicity.
 
-  consumer->push (any TAO_ENV_ARG_PARAMETER);
+  consumer->push (any ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_StructuredEvent::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                           "TAO_Notify_StructuredEvent::do_push ("
                           "CosNotifyComm::StructuredPushConsumer_ptr)\n"));
 
-  consumer->push_structured_event (*this->data_ TAO_ENV_ARG_PARAMETER);
+  consumer->push_structured_event (*this->data_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -462,7 +462,7 @@ TAO_Notify_StructuredEvent::do_push (CosNotifyComm::SequencePushConsumer_ptr con
                                      const TAO_Notify_QoSAdmin_i& /*qos_admin*/,
                                      CosNotification::EventBatch& /*unsent*/,
                                      int /*flush_queue*/
-                                     TAO_ENV_ARG_DECL) const
+                                     ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
@@ -473,5 +473,5 @@ TAO_Notify_StructuredEvent::do_push (CosNotifyComm::SequencePushConsumer_ptr con
   events.length (1);
   events[0] = *this->data_;
 
-  consumer->push_structured_events (events TAO_ENV_ARG_PARAMETER);
+  consumer->push_structured_events (events ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h
index a659e89a038..524c4d2ef37 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event.h
@@ -126,16 +126,16 @@ public:
   // ownership of the data to the new object otherwise we copy the data
   // for the new object.
 
-  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL) = 0;
+  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) = 0;
   // Returns true if the filter matches.
 
-  virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const = 0;
-  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const = 0;
+  virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const = 0;
+  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const = 0;
   virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer,
                         const TAO_Notify_QoSAdmin_i& qos_admin,
                         CosNotification::EventBatch& unsent,
                         int flush_queue
-                        TAO_ENV_ARG_DECL) const = 0;
+                        ACE_ENV_ARG_DECL) const = 0;
   // Push self to <consumer>
 
   // = QoS Properties.
@@ -206,14 +206,14 @@ public:
 
   virtual CORBA::Boolean is_special_event_type (void) const;
   virtual const TAO_Notify_EventType& event_type (void) const;
-  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL);
-  virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
-  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
+  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL);
+  virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const;
+  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const;
   virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer,
                         const TAO_Notify_QoSAdmin_i& qos_admin,
                         CosNotification::EventBatch& unsent,
                         int flush_queue
-                        TAO_ENV_ARG_DECL) const;
+                        ACE_ENV_ARG_DECL) const;
 
 protected:
   CORBA::Any* data_;
@@ -243,14 +243,14 @@ public:
 
   virtual CORBA::Boolean is_special_event_type (void) const;
   virtual const TAO_Notify_EventType& event_type (void) const;
-  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL);
-  virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
-  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
+  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL);
+  virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const;
+  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const;
   virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer,
                         const TAO_Notify_QoSAdmin_i& qos_admin,
                         CosNotification::EventBatch& unsent,
                         int flush_queue
-                        TAO_ENV_ARG_DECL) const;
+                        ACE_ENV_ARG_DECL) const;
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
index 708164dc121..6e98a60de08 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -23,7 +23,7 @@ TAO_Notify_EventChannelFactory_i::~TAO_Notify_EventChannelFactory_i (void)
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL)
 {
   TAO_Notify_EventChannelFactory_i* channelfactory;
   ACE_NEW_THROW_EX (channelfactory,
@@ -33,22 +33,22 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA TA
 
   PortableServer::ServantBase_var channelfactory_var (channelfactory);
 
-  channelfactory->init_i (default_POA TAO_ENV_ARG_PARAMETER);
+  channelfactory->init_i (default_POA ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
 
   CORBA::Object_var obj = channelfactory->poa_factory_->
     activate_object (channelfactory->my_POA_.in (),
-                     channelfactory TAO_ENV_ARG_PARAMETER);
+                     channelfactory ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
 
   return CosNotifyChannelAdmin::EventChannelFactory
-    ::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+    ::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_Factory::init (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Notify_Factory::init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->my_POA_ = PortableServer::POA::_duplicate (default_POA);
@@ -60,23 +60,23 @@ TAO_Notify_EventChannelFactory_i::init_i (PortableServer::POA_ptr default_POA TA
 
   // The POA that we should activate the Event Channels in.
   this->ec_POA_ = this->poa_factory_->
-    create_event_channel_POA (this->my_POA_.in () TAO_ENV_ARG_PARAMETER);
+    create_event_channel_POA (this->my_POA_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->lock_ =
-    this->channel_objects_factory_->create_channel_factory_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->channel_objects_factory_->create_channel_factory_lock (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->default_filter_factory_ =
-    this->create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->create_default_filter_factory_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannelFactory_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory_i::get_ref (ACE_ENV_SINGLE_ARG_DECL)
 {
   return CosNotifyChannelAdmin::EventChannelFactory
     ::_narrow (this->poa_factory_->
-               servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER));
+               servant_to_reference (this->my_POA_.in (), this ACE_ENV_ARG_PARAMETER));
 }
 
 void
@@ -88,33 +88,33 @@ TAO_Notify_EventChannelFactory_i::event_channel_destroyed (CosNotifyChannelAdmin
     ACE_DEBUG ((LM_DEBUG, "event_channel_destroyed %d\n", channel_id));
 }
 
-void TAO_Notify_EventChannelFactory_i::shutdown (TAO_ENV_SINGLE_ARG_DECL
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT)
+void TAO_Notify_EventChannelFactory_i::shutdown (ACE_ENV_SINGLE_ARG_DECL
+#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
                                                  ,
 #endif
                                                 CORBA::Boolean destroy_children)
 {
   if (destroy_children == 1)
     {
-      this->poa_factory_->destroy_POA (this->ec_POA_.in () TAO_ENV_ARG_PARAMETER);
+      this->poa_factory_->destroy_POA (this->ec_POA_.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->poa_factory_->deactivate_object(this->default_filter_factory_.in (),
                                             this->my_POA_.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   // Deactivate ourselves.
   this->poa_factory_->deactivate_object (this,
                                          this->my_POA_.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
 TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSProperties& initial_qos,
                                                  const CosNotification::AdminProperties& initial_admin,
                                                  CosNotifyChannelAdmin::ChannelID_out ec_id
-                                                 TAO_ENV_ARG_DECL
+                                                 ACE_ENV_ARG_DECL
                                                  )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -124,7 +124,7 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope
 {
   TAO_Notify_EventChannel_i* channel =
     this->channel_objects_factory_->create_event_channel (this
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ());
 
   PortableServer::ServantBase_var channel_var (channel);
@@ -140,12 +140,12 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope
   }
 
   channel->init (ec_id, initial_qos, initial_admin, this->my_POA_.in (), this->ec_POA_.in ()
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ());
 
   CORBA::Object_var obj = this->poa_factory_->
     activate_object_with_id (ec_id, this->ec_POA_.in (), channel
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ());
 
   this->ec_ids_.next ();
@@ -153,18 +153,18 @@ TAO_Notify_EventChannelFactory_i::create_channel(const CosNotification::QoSPrope
 }
 
 CosNotifyChannelAdmin::ChannelIDSeq*
-TAO_Notify_EventChannelFactory_i::get_all_channels (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory_i::get_all_channels (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
 
-  return this->ec_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->ec_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::ChannelID id TAO_ENV_ARG_DECL)
+TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::ChannelID id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ChannelNotFound
@@ -175,7 +175,7 @@ TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::Chan
   ACE_TRY
     {
       obj = this->poa_factory_->id_to_reference (id, this->ec_POA_.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY // Translate any exception to "not found"
@@ -185,14 +185,14 @@ TAO_Notify_EventChannelFactory_i::get_event_channel (CosNotifyChannelAdmin::Chan
   ACE_ENDTRY;
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ());
 
-  return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+  return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Notify_FilterFactory_i* filterfactory =
-    this->channel_objects_factory_->create_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->channel_objects_factory_->create_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ());
 
   PortableServer::ServantBase_var filterfactory_var (filterfactory);
@@ -202,7 +202,7 @@ TAO_Notify_EventChannelFactory_i::create_default_filter_factory_i (TAO_ENV_SINGL
 
   CORBA::Object_var obj =
     this->poa_factory_->activate_object (this->my_POA_.in (),
-                                         filterfactory TAO_ENV_ARG_PARAMETER);
+                                         filterfactory ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ());
 
   return CosNotifyFilter::FilterFactory::_narrow (obj.in ());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
index 243a60aa35d..7bbde23e510 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
@@ -61,15 +61,15 @@ public:
   virtual ~TAO_Notify_EventChannelFactory_i (void);
   // Destructor
 
-  static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL);
+  static CosNotifyChannelAdmin::EventChannelFactory_ptr create (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL);
   // Create a factory servant and activates it with the default POA.
   // Also creates a resource factory and assigns it this default_POA.
 
-  CosNotifyChannelAdmin::EventChannelFactory_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL);
+  CosNotifyChannelAdmin::EventChannelFactory_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL);
   // Get the CORBA object.
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL
+#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
   ,    // This is ugly -- destroy_children should come BEFORE the env arg.
 #endif
                  CORBA::Boolean destroy_children = 0);
@@ -89,7 +89,7 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr create_channel (
     const CosNotification::QoSProperties & initial_qos,
     const CosNotification::AdminProperties & initial_admin,
     CosNotifyChannelAdmin::ChannelID_out id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -98,7 +98,7 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr create_channel (
   ));
 
 virtual CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -106,7 +106,7 @@ virtual CosNotifyChannelAdmin::ChannelIDSeq * get_all_channels (
 
 virtual CosNotifyChannelAdmin::EventChannel_ptr get_event_channel (
     CosNotifyChannelAdmin::ChannelID id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -117,10 +117,10 @@ virtual CosNotifyChannelAdmin::EventChannel_ptr get_event_channel (
   TAO_Notify_EventChannelFactory_i (void);
   // Constructor
 
-  void init_i (PortableServer::POA_ptr default_POA TAO_ENV_ARG_DECL);
+  void init_i (PortableServer::POA_ptr default_POA ACE_ENV_ARG_DECL);
   // Initializes this object.
 
-  CosNotifyFilter::FilterFactory_ptr create_default_filter_factory_i (TAO_ENV_SINGLE_ARG_DECL);
+  CosNotifyFilter::FilterFactory_ptr create_default_filter_factory_i (ACE_ENV_SINGLE_ARG_DECL);
   // Create the default filter factory.
 
   // = Data members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
index 721f1e02010..628b37fc18e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
@@ -50,7 +50,7 @@ TAO_Notify_EventChannel_i::~TAO_Notify_EventChannel_i (void)
 }
 
 void
-TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA TAO_ENV_ARG_DECL)
+TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, const CosNotification::QoSProperties& initial_qos, const CosNotification::AdminProperties& initial_admin, PortableServer::POA_ptr default_POA, PortableServer::POA_ptr my_POA ACE_ENV_ARG_DECL)
 {
   this->channel_id_ = channel_id;
 
@@ -58,40 +58,40 @@ TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, co
   this->default_POA_ = PortableServer::POA::_duplicate (default_POA);
 
   this->lock_ =
-    this->channel_objects_factory_->create_event_channel_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->channel_objects_factory_->create_event_channel_lock (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_manager_ =
-    this->event_manager_objects_factory_->create_event_manager (this TAO_ENV_ARG_PARAMETER);
+    this->event_manager_objects_factory_->create_event_manager (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Set these before initializing the event manger.
-  this->set_qos (initial_qos TAO_ENV_ARG_PARAMETER);
+  this->set_qos (initial_qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->event_manager_->init (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->event_manager_->init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // try to set initial admin params
   // This must be set after initializing the event manager
   // since it is the one that owns the admin properties.
-  this->set_admin (initial_admin TAO_ENV_ARG_PARAMETER);
+  this->set_admin (initial_admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the POA for the CA's
   this->CA_POA_ =
     this->poa_factory_->create_consumer_admin_POA (this->my_POA_.in (), channel_id
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the POA for the SA's
   this->SA_POA_ =
     this->poa_factory_->create_supplier_admin_POA (this->my_POA_.in (), channel_id
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_listener_list_ =
-    TAO_Notify_Factory::get_collection_factory ()->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_Notify_Factory::get_collection_factory ()->create_event_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the default Consumer Admin. Because the ID_Pool is being used
@@ -99,11 +99,11 @@ TAO_Notify_EventChannel_i::init (CosNotifyChannelAdmin::ChannelID channel_id, co
   CosNotifyChannelAdmin::AdminID id_unused;
 
   CosNotifyChannelAdmin::ConsumerAdmin_var def_consumer_admin =
-    this->new_for_consumers (default_op_, id_unused TAO_ENV_ARG_PARAMETER);
+    this->new_for_consumers (default_op_, id_unused ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::SupplierAdmin_var def_supplier_admin =
-    this->new_for_suppliers (default_op_, id_unused TAO_ENV_ARG_PARAMETER);
+    this->new_for_suppliers (default_op_, id_unused ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -132,10 +132,10 @@ TAO_Notify_EventChannel_i::get_default_POA (void)
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_EventChannel_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel_i::get_ref (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var obj = this->poa_factory_->
-    servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER);
+    servant_to_reference (this->my_POA_.in (), this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil ());
 
   return CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ());
@@ -143,47 +143,47 @@ TAO_Notify_EventChannel_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
 
 
 void
-TAO_Notify_EventChannel_i::unregister_listener (TAO_Notify_EventListener* group_listener TAO_ENV_ARG_DECL)
+TAO_Notify_EventChannel_i::unregister_listener (TAO_Notify_EventListener* group_listener ACE_ENV_ARG_DECL)
 {
   // UnRegister the group listener.
-  this->event_listener_list_->disconnected (group_listener TAO_ENV_ARG_PARAMETER);
+  this->event_listener_list_->disconnected (group_listener ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_EventChannel_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->event_manager_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->event_manager_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Deactivate ourselves.
   this->poa_factory_->deactivate_object (this,
                                          this->my_POA_.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // shutdown consumer admins's.
   TAO_Notify_Shutdown_Worker shutdown_worker;
 
-  this->event_listener_list_->for_each (&shutdown_worker TAO_ENV_ARG_PARAMETER);
+  this->event_listener_list_->for_each (&shutdown_worker ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // release all references.
-  this->event_listener_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->event_listener_list_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ TODO: We need a way to send shutdown messages to the proxy consumers too.
   // (event listeners are proxy suppliers or CA's in disguise)
 
   this->poa_factory_->destroy_POA (this->CA_POA_.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->poa_factory_->destroy_POA (this->SA_POA_.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 const TAO_Notify_QoSAdmin_i&
@@ -193,32 +193,32 @@ TAO_Notify_EventChannel_i::qos_admin (void) const
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_Notify_EventChannel_i::MyFactory (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel_i::MyFactory (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->channel_factory_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->channel_factory_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel_i::default_consumer_admin (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel_i::default_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->get_consumeradmin (this->default_id_ TAO_ENV_ARG_PARAMETER);
+  return this->get_consumeradmin (this->default_id_ ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel_i::default_supplier_admin (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel_i::default_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->get_supplieradmin (this->default_id_ TAO_ENV_ARG_PARAMETER);
+  return this->get_supplieradmin (this->default_id_ ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_EventChannel_i::default_filter_factory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_EventChannel_i::default_filter_factory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -227,14 +227,14 @@ TAO_Notify_EventChannel_i::default_filter_factory (TAO_ENV_SINGLE_ARG_DECL_NOT_U
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id TAO_ENV_ARG_DECL)
+TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // @@ use auto_ptr
   TAO_Notify_ConsumerAdmin_i* consumer_admin =
-    this->channel_objects_factory_->create_consumer_admin (this TAO_ENV_ARG_PARAMETER);
+    this->channel_objects_factory_->create_consumer_admin (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
   PortableServer::ServantBase_var consumeradmin_var (consumer_admin);
@@ -247,18 +247,18 @@ TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilter
     id = this->consumer_admin_ids_.get ();
   }
 
-  consumer_admin->init (id, op, this->CA_POA_.in () TAO_ENV_ARG_PARAMETER);
+  consumer_admin->init (id, op, this->CA_POA_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
   CORBA::Object_var obj =
     this->poa_factory_->activate_object_with_id (id,
                                                  this->CA_POA_.in (),
                                                  consumer_admin
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
   // Register the group listener.
-  this->event_listener_list_->connected (consumer_admin TAO_ENV_ARG_PARAMETER);
+  this->event_listener_list_->connected (consumer_admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
   this->consumer_admin_ids_.next ();
@@ -266,13 +266,13 @@ TAO_Notify_EventChannel_i::new_for_consumers (CosNotifyChannelAdmin::InterFilter
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id TAO_ENV_ARG_DECL)
+TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilterGroupOperator op, CosNotifyChannelAdmin::AdminID_out id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   TAO_Notify_SupplierAdmin_i* supplieradmin =
-    this->channel_objects_factory_->create_supplier_admin (this TAO_ENV_ARG_PARAMETER);
+    this->channel_objects_factory_->create_supplier_admin (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
 
   PortableServer::ServantBase_var supplieradmin_var (supplieradmin);
@@ -283,14 +283,14 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter
     id = this->supplier_admin_ids_.get ();
   }
 
-  supplieradmin->init (id, op, this->SA_POA_.in () TAO_ENV_ARG_PARAMETER);
+  supplieradmin->init (id, op, this->SA_POA_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
 
   CORBA::Object_var obj = this->poa_factory_->
     activate_object_with_id (id,
                              this->SA_POA_.in (),
                              supplieradmin
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
 
   this->supplier_admin_ids_.next ();
@@ -298,7 +298,7 @@ TAO_Notify_EventChannel_i::new_for_suppliers (CosNotifyChannelAdmin::InterFilter
 }
 
 CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id TAO_ENV_ARG_DECL)
+TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::AdminNotFound
@@ -306,14 +306,14 @@ TAO_Notify_EventChannel_i::get_consumeradmin (CosNotifyChannelAdmin::AdminID id
 {
   CORBA::Object_var obj =
     this->poa_factory_->id_to_reference (id, this->CA_POA_.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ConsumerAdmin::_nil ());
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_narrow (obj.in ());
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id TAO_ENV_ARG_DECL)
+TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::AdminNotFound
@@ -321,23 +321,23 @@ TAO_Notify_EventChannel_i::get_supplieradmin (CosNotifyChannelAdmin::AdminID id
 {
   CORBA::Object_var obj =
     this->poa_factory_->id_to_reference (id, this->SA_POA_.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
 
   return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ());
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_Notify_EventChannel_i::get_all_consumeradmins (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel_i::get_all_consumeradmins (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->consumer_admin_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->consumer_admin_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::AdminIDSeq*
-TAO_Notify_EventChannel_i::get_all_supplieradmins (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel_i::get_all_supplieradmins (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -346,63 +346,63 @@ TAO_Notify_EventChannel_i::get_all_supplieradmins (TAO_ENV_SINGLE_ARG_DECL)
                       CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
-  return this->supplier_admin_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->supplier_admin_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotification::QoSProperties*
-TAO_Notify_EventChannel_i::get_qos (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel_i::get_qos (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->qos_admin_.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_EventChannel_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL)
+TAO_Notify_EventChannel_i::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER);
+  this->qos_admin_.set_qos (qos ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_EventChannel_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL)
+TAO_Notify_EventChannel_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER);
+  this->qos_admin_.validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotification::AdminProperties*
-TAO_Notify_EventChannel_i::get_admin (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel_i::get_admin (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // Delegate to Event Manager.
-  return this->event_manager_->admin_properties ()->get_admin (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->event_manager_->admin_properties ()->get_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_EventChannel_i::set_admin (const CosNotification::AdminProperties & admin TAO_ENV_ARG_DECL)
+TAO_Notify_EventChannel_i::set_admin (const CosNotification::AdminProperties & admin ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedAdmin
                    ))
 {
-  this->event_manager_->admin_properties ()->set_admin (admin TAO_ENV_ARG_PARAMETER);
+  this->event_manager_->admin_properties ()->set_admin (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_manager_->update_task_admins ();
 }
 
 CosEventChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel_i::for_consumers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -412,25 +412,25 @@ TAO_Notify_EventChannel_i::for_consumers (TAO_ENV_SINGLE_ARG_DECL)
   // TODO: find a way to disable the destroy method in the default Admin.
 
   CORBA::Object_var obj =
-    this->get_consumeradmin (this->default_id_ TAO_ENV_ARG_PARAMETER);
+    this->get_consumeradmin (this->default_id_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosEventChannelAdmin::ConsumerAdmin::_nil ());
 
   return CosEventChannelAdmin::ConsumerAdmin::_narrow (obj.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_EventChannel_i::for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_EventChannel_i::for_suppliers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   CORBA::Object_var obj =
-    this->get_supplieradmin (this->default_id_ TAO_ENV_ARG_PARAMETER);
+    this->get_supplieradmin (this->default_id_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosEventChannelAdmin::SupplierAdmin::_nil ());
 
   return CosEventChannelAdmin::SupplierAdmin::_narrow (obj.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
index 3847d750794..c8757fcb99a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
@@ -76,7 +76,7 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify
              const CosNotification::AdminProperties& initial_admin,
              PortableServer::POA_ptr default_POA,
              PortableServer::POA_ptr my_POA
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize this object.
   // checks if the <initial_qos> and <initial admin> are valid.
   // creates default filter, consumer admin and supplier admin.
@@ -85,7 +85,7 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify
   PortableServer::POA_ptr get_default_POA (void);
   // Get the default POA.
 
-  CosNotifyChannelAdmin::EventChannel_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL);
+  CosNotifyChannelAdmin::EventChannel_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL);
   // Get the CORBA object for this servant
 
   TAO_Notify_Event_Manager* get_event_manager (void);
@@ -98,34 +98,34 @@ class TAO_Notify_Export TAO_Notify_EventChannel_i : public virtual POA_CosNotify
   void supplier_admin_destroyed (CosNotifyChannelAdmin::AdminID SA_ID);
   // This id is no longer in use.It can be reused by <supplier_admin_ids_>.
 
-  void unregister_listener (TAO_Notify_EventListener* group_listener TAO_ENV_ARG_DECL);
+  void unregister_listener (TAO_Notify_EventListener* group_listener ACE_ENV_ARG_DECL);
   // Consumer Admin's are Group Listeners that are registered automatically with the EC when a ConsumerAdmin
   // is created. When a consumer is destroyed, it asks the EC to unregister itself.
 
   // = Interface methods
   virtual CosNotifyChannelAdmin::EventChannelFactory_ptr MyFactory (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr default_consumer_admin (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::SupplierAdmin_ptr default_supplier_admin (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyFilter::FilterFactory_ptr default_filter_factory (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -134,7 +134,7 @@ virtual CosNotifyFilter::FilterFactory_ptr default_filter_factory (
 virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (
     CosNotifyChannelAdmin::InterFilterGroupOperator op,
     CosNotifyChannelAdmin::AdminID_out id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -143,7 +143,7 @@ virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr new_for_consumers (
 virtual CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers (
     CosNotifyChannelAdmin::InterFilterGroupOperator op,
     CosNotifyChannelAdmin::AdminID_out id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -151,7 +151,7 @@ virtual CosNotifyChannelAdmin::SupplierAdmin_ptr new_for_suppliers (
 
 virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (
     CosNotifyChannelAdmin::AdminID id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -160,7 +160,7 @@ virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr get_consumeradmin (
 
 virtual CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (
     CosNotifyChannelAdmin::AdminID id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -168,21 +168,21 @@ virtual CosNotifyChannelAdmin::SupplierAdmin_ptr get_supplieradmin (
   ));
 
 virtual CosNotifyChannelAdmin::AdminIDSeq * get_all_consumeradmins (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::AdminIDSeq * get_all_supplieradmins (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotification::QoSProperties * get_qos (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -190,7 +190,7 @@ virtual CosNotification::QoSProperties * get_qos (
 
   virtual void set_qos (
     const CosNotification::QoSProperties & qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -200,7 +200,7 @@ virtual CosNotification::QoSProperties * get_qos (
   virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -208,7 +208,7 @@ virtual CosNotification::QoSProperties * get_qos (
   ));
 
   virtual CosNotification::AdminProperties * get_admin (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -216,7 +216,7 @@ virtual CosNotification::QoSProperties * get_qos (
 
   virtual void set_admin (
     const CosNotification::AdminProperties & admin
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -224,21 +224,21 @@ virtual CosNotification::QoSProperties * get_qos (
   ));
 
   virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void destroy (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp
index fa626cea37d..84c80dfe3f9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp
@@ -30,9 +30,9 @@ TAO_Notify_Event_Dispatch_Command::~TAO_Notify_Event_Dispatch_Command ()
 }
 
 int
-TAO_Notify_Event_Dispatch_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Dispatch_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->event_listener_->dispatch_event (*this->event_ TAO_ENV_ARG_PARAMETER);
+  this->event_listener_->dispatch_event (*this->event_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h
index b1646aabdcd..86dd58ea0f5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h
@@ -45,7 +45,7 @@ class TAO_Notify_Export TAO_Notify_Event_Dispatch_Command : public TAO_Notify_Co
 
   ~TAO_Notify_Event_Dispatch_Command ();
 
-  virtual int execute (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
   // Command callback
 
  protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp
index 161f142ebf4..a2628852f52 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp
@@ -37,7 +37,7 @@ TAO_Notify_Event_Manager::~TAO_Notify_Event_Manager ()
 }
 
 void
-TAO_Notify_Event_Manager::init (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Manager::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->lock_,
                     ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (),
@@ -48,25 +48,25 @@ TAO_Notify_Event_Manager::init (TAO_ENV_SINGLE_ARG_DECL)
   this->admin_properties_ = new TAO_Notify_AdminProperties ();
 
   this->event_map_ =
-    this->emo_factory_->create_event_map (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->emo_factory_->create_event_map (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_processor_ =
-    this->emo_factory_->create_event_processor (this TAO_ENV_ARG_PARAMETER);
+    this->emo_factory_->create_event_processor (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->updates_dispatching_task_ =
-    this->emo_factory_->create_updates_task (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->emo_factory_->create_updates_task (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Init the objects
-  this->event_map_->init (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->event_map_->init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_Notify_QoSAdmin_i* qos_admin =
        (TAO_Notify_QoSAdmin_i*)&(this->event_channel_->qos_admin ());
 
-  this->event_processor_->init (qos_admin TAO_ENV_ARG_PARAMETER);
+  this->event_processor_->init (qos_admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->updates_dispatching_task_->init_task (
@@ -79,54 +79,54 @@ TAO_Notify_Event_Manager::init (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_Event_Manager::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Manager::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
                       CORBA::INTERNAL ());
   ACE_CHECK;
 
-  this->event_processor_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->event_processor_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->event_map_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->event_map_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->updates_dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->updates_dispatching_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Manager::subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL)
 {
   TAO_Notify_EventType_List added_update, removed_update;
 
   this->event_map_->subscribe_for_events (event_listener, added_update,
-                                         added TAO_ENV_ARG_PARAMETER);
+                                         added ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_map_->unsubscribe_from_events (event_listener, removed_update,
-                                              removed TAO_ENV_ARG_PARAMETER);
+                                              removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // if either of the lists are *not* empty, send updates
   if (added_update.is_empty () == 0 || removed_update.is_empty () == 0)
     this->dispatch_updates_i (this->event_map_->subscription_change_listeners (),
-                              added_update, removed_update TAO_ENV_ARG_PARAMETER);
+                              added_update, removed_update ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Manager::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL)
 {
   TAO_Notify_EventType_List added_list;
   TAO_Notify_EventType_List removed_list;
 
   this->event_map_->update_publication_list (added, removed,
-                                            added_list, removed_list TAO_ENV_ARG_PARAMETER);
+                                            added_list, removed_list ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // if either of the lists are *not* empty, send updates
   if (added_list.is_empty () == 0 || removed_list.is_empty () == 0)
     this->dispatch_updates_i (this->event_map_->publication_change_listeners (),
-                              added_list, removed_list TAO_ENV_ARG_PARAMETER);
+                              added_list, removed_list ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -136,7 +136,7 @@ TAO_Notify_Event_Manager::update_task_admins (void)
 }
 
 void
-TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
                       CORBA::INTERNAL ());
@@ -144,7 +144,7 @@ TAO_Notify_Event_Manager::dispatch_updates_i (TAO_Notify_UpdateListener_List* up
   TAO_Notify_Update_Worker update_worker (this->updates_dispatching_task_,
                                           added, removed);
 
-  update_listener_list->for_each (&update_worker TAO_ENV_ARG_PARAMETER);
+  update_listener_list->for_each (&update_worker ACE_ENV_ARG_PARAMETER);
 }
 
 /********************************************************************/
@@ -157,13 +157,13 @@ TAO_Notify_Update_Worker::TAO_Notify_Update_Worker (TAO_Notify_Worker_Task * upd
 }
 
 void
-TAO_Notify_Update_Worker::work (TAO_Notify_UpdateListener* listener TAO_ENV_ARG_DECL)
+TAO_Notify_Update_Worker::work (TAO_Notify_UpdateListener* listener ACE_ENV_ARG_DECL)
 {
   TAO_Notify_Update_Dispatch_Command* mb =
     new TAO_Notify_Update_Dispatch_Command (listener, this->added_,
                                             this->removed_);
 
-  this->updates_dispatching_task_->process_event (mb TAO_ENV_ARG_PARAMETER);
+  this->updates_dispatching_task_->process_event (mb ACE_ENV_ARG_PARAMETER);
 }
 
 /********************************************************************/
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
index 0df63cd44bd..cf07091dab9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
@@ -59,34 +59,34 @@ class TAO_Notify_Export TAO_Notify_Event_Manager
   ~TAO_Notify_Event_Manager ();
   // Destructor.
 
-  void init (TAO_ENV_SINGLE_ARG_DECL);
+  void init (ACE_ENV_SINGLE_ARG_DECL);
   // Init
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // Shutdown operations.
 
   // = Publish/Subscribe management
   // = Subscription
-  void subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL);
+  void subscribe_for_events (TAO_Notify_EventListener* event_listener, const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL);
   // Subscribes <event_listener> for events <added>.
   // Unsubscribes <event_listener> for events <removed>.
 
   // = Publications
-  void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL);
+  void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL);
   // Suppliers can send anonymous requests to the Event Manager to indicate
   // what kind of events they expect to produce.
 
   // = Updates
-  void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
+  void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL);
   // Registers the subscription update listener with the Event Manager.
 
-  void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
+  void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL);
   // Unregister from subscription updates.
 
-  void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
+  void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL);
   // Registers the publication update listener with the Event Manager.
 
-  void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
+  void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL);
   // Unregister from publication updates.
 
   // = Accessors
@@ -111,7 +111,7 @@ class TAO_Notify_Export TAO_Notify_Event_Manager
   // = Event forwarding methods.
   void process_event (TAO_Notify_Event* event,
                       TAO_Notify_EventSource* event_source
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   // Delivers the event to listeners subscribed for <event>
   // <event_source> is the <event> source to the Event Manager.
 
@@ -122,7 +122,7 @@ protected:
   void dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list,
                            TAO_Notify_EventType_List& added,
                            TAO_Notify_EventType_List& removed
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
   // Dispatch the updates to the <update_listener_list>
 
   // = Data members.
@@ -163,7 +163,7 @@ class TAO_Notify_Export TAO_Notify_Update_Worker : public TAO_ESF_Worker<TAO_Not
   TAO_Notify_Update_Worker (TAO_Notify_Worker_Task * updates_dispatching_task, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed);
 
   // = TAO_ESF_Worker method
-  void work (TAO_Notify_UpdateListener* listener TAO_ENV_ARG_DECL);
+  void work (TAO_Notify_UpdateListener* listener ACE_ENV_ARG_DECL);
  protected:
   // = Data members.
   TAO_Notify_EventType_List& added_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i
index 88a95c1baf2..0b9af87de70 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i
@@ -8,7 +8,7 @@
 ACE_INLINE void
 TAO_Notify_Event_Manager::process_event  (TAO_Notify_Event* event,
                                           TAO_Notify_EventSource* event_source
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   if (admin_properties_->reject_new_events () == 1
       && admin_properties_->queue_full ())
@@ -16,36 +16,36 @@ TAO_Notify_Event_Manager::process_event  (TAO_Notify_Event* event,
 
   this->event_processor_->evaluate_source_filter (event,
                                                   event_source
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   // Start by checking if the event passes through the Source's filter.
 }
 
 ACE_INLINE void
-TAO_Notify_Event_Manager::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL)
 {
   this->event_map_->register_for_publication_updates (update_listener
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
-TAO_Notify_Event_Manager::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL)
 {
   this->event_map_->register_for_subscription_updates (update_listener
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
-TAO_Notify_Event_Manager:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Manager:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL)
 {
   this->event_map_->unregister_from_subscription_updates (update_listener
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
-TAO_Notify_Event_Manager::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Manager::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL)
 {
   this->event_map_->unregister_from_publication_updates(update_listener
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_Notify_Event_Map*
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h
index 77c84b86954..cd4e92af434 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h
@@ -47,23 +47,23 @@ class TAO_Notify_Export TAO_Notify_EMO_Factory : public ACE_Service_Object
  public:
   virtual ~TAO_Notify_EMO_Factory (){};
 
-  virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel TAO_ENV_ARG_DECL)= 0;
+  virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel ACE_ENV_ARG_DECL)= 0;
   // Create an event manager.
 
-  virtual TAO_Notify_Event_Map* create_event_map (TAO_ENV_SINGLE_ARG_DECL)= 0;
+  virtual TAO_Notify_Event_Map* create_event_map (ACE_ENV_SINGLE_ARG_DECL)= 0;
   // Create the event map.
 
-  virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager TAO_ENV_ARG_DECL)= 0;
+  virtual TAO_Notify_Event_Processor* create_event_processor (TAO_Notify_Event_Manager* event_manager ACE_ENV_ARG_DECL)= 0;
   // Create event processor.
 
   // = Create processing tasks.
-  virtual TAO_Notify_Worker_Task* create_source_eval_task (TAO_ENV_SINGLE_ARG_DECL)= 0;
-  virtual TAO_Notify_Worker_Task* create_lookup_task (TAO_ENV_SINGLE_ARG_DECL)= 0;
-  virtual TAO_Notify_Worker_Task* create_listener_eval_task (TAO_ENV_SINGLE_ARG_DECL)= 0;
+  virtual TAO_Notify_Worker_Task* create_source_eval_task (ACE_ENV_SINGLE_ARG_DECL)= 0;
+  virtual TAO_Notify_Worker_Task* create_lookup_task (ACE_ENV_SINGLE_ARG_DECL)= 0;
+  virtual TAO_Notify_Worker_Task* create_listener_eval_task (ACE_ENV_SINGLE_ARG_DECL)= 0;
 
-  virtual TAO_Notify_Worker_Task* create_dispatching_task (TAO_ENV_SINGLE_ARG_DECL)= 0;
+  virtual TAO_Notify_Worker_Task* create_dispatching_task (ACE_ENV_SINGLE_ARG_DECL)= 0;
   // Task that dispatches events.
-  virtual TAO_Notify_Worker_Task* create_updates_task (TAO_ENV_SINGLE_ARG_DECL)= 0;
+  virtual TAO_Notify_Worker_Task* create_updates_task (ACE_ENV_SINGLE_ARG_DECL)= 0;
   // Task that dispatches updates.
 
   // Destroy processing tasks.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp
index 1ccbc9eb6aa..7881ebdfd17 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp
@@ -41,23 +41,23 @@ TAO_Notify_Event_Map::~TAO_Notify_Event_Map ()
 }
 
 void
-TAO_Notify_Event_Map::init (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Map::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->default_subscription_list_ =
-    this->collection_factory_->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->collection_factory_->create_event_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   // Create the default list of listeners.
 
   this->subscription_change_listeners_
-    = this->collection_factory_->create_update_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    = this->collection_factory_->create_update_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->publication_change_listeners_
-    = this->collection_factory_->create_update_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    = this->collection_factory_->create_update_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Map::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Map::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Shutdown all event listener lists in the event map.
   EVENT_RECIPIENT_MAP::ITERATOR iterator (this->event_recipient_map_);
@@ -66,21 +66,21 @@ TAO_Notify_Event_Map::shutdown (TAO_ENV_SINGLE_ARG_DECL)
        iterator.next (entry) != 0;
        iterator.advance ())
     {
-      entry->int_id_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      entry->int_id_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  default_subscription_list_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  default_subscription_list_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  subscription_change_listeners_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  subscription_change_listeners_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  publication_change_listeners_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  publication_change_listeners_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added ACE_ENV_ARG_DECL)
 {
   TAO_Notify_EventListener_List* event_listener_list;
   TAO_Notify_EventType event_type;
@@ -101,7 +101,7 @@ TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_list
         {
           // create the list.
           TAO_Notify_EventListener_List* new_list =
-            this->collection_factory_->create_event_listener_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->collection_factory_->create_event_listener_list (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           // add the list to the recipient map.
@@ -109,7 +109,7 @@ TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_list
           event_listener_list = new_list;
         }
 
-      event_listener_list->connected (event_listener TAO_ENV_ARG_PARAMETER);
+      event_listener_list->connected (event_listener ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // mirror changes in the subscription list
@@ -119,7 +119,7 @@ TAO_Notify_Event_Map::subscribe_for_events (TAO_Notify_EventListener* event_list
 }
 
 void
-TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL)
 {
   TAO_Notify_EventListener_List* event_listener_list;
   TAO_Notify_EventType event_type;
@@ -137,7 +137,7 @@ TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_l
 
       // remove <event_listener> from the list.
 
-      event_listener_list->disconnected (event_listener TAO_ENV_ARG_PARAMETER);
+      event_listener_list->disconnected (event_listener ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // If this was the last entry in the list then we should remove
@@ -157,27 +157,27 @@ TAO_Notify_Event_Map::unsubscribe_from_events (TAO_Notify_EventListener* event_l
 }
 
 void
-TAO_Notify_Event_Map::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Map::register_for_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL)
 {
-  this->publication_change_listeners_->connected (update_listener TAO_ENV_ARG_PARAMETER);
+  this->publication_change_listeners_->connected (update_listener ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Map::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Map::register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL)
 {
-  this->subscription_change_listeners_->connected (update_listener TAO_ENV_ARG_PARAMETER);
+  this->subscription_change_listeners_->connected (update_listener ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Map:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Map:: unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL)
 {
-  this->subscription_change_listeners_->disconnected (update_listener TAO_ENV_ARG_PARAMETER);
+  this->subscription_change_listeners_->disconnected (update_listener ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Map::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Map::unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL)
 {
-  this->publication_change_listeners_->disconnected (update_listener TAO_ENV_ARG_PARAMETER);
+  this->publication_change_listeners_->disconnected (update_listener ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotification::EventTypeSeq*
@@ -209,7 +209,7 @@ TAO_Notify_Event_Map::obtain_subscription_types (void)
 }
 
 void
-TAO_Notify_Event_Map::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list TAO_ENV_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_Event_Map::update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list ACE_ENV_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
 {
   TAO_Notify_EventType event_type;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h
index ef139ca3353..9f94b5e31c3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h
@@ -57,35 +57,35 @@ public:
   virtual ~TAO_Notify_Event_Map ();
   // Destructor.
 
-  void init (TAO_ENV_SINGLE_ARG_DECL);
+  void init (ACE_ENV_SINGLE_ARG_DECL);
   // Init
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // Shutdown releases all listeners.
 
   // = Subscribe and Unsubscribe methods.
-  void subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added TAO_ENV_ARG_DECL);
+  void subscribe_for_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List& update, const CosNotification::EventTypeSeq & added ACE_ENV_ARG_DECL);
 
-  void unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL);
+  void unsubscribe_from_events (TAO_Notify_EventListener* event_listener, TAO_Notify_EventType_List &update, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL);
 
   // = Publish and Unpublish methods
   // Later:
-  void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list TAO_ENV_ARG_DECL);
+  void update_publication_list (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed, TAO_Notify_EventType_List &added_list, TAO_Notify_EventType_List &removed_list ACE_ENV_ARG_DECL);
   // Suppliers can send anonymous requests to the Event Manager to indicate
   // what kind of events they expect to produce.
 
   // = Subscription Updates
-  void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
+  void register_for_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL);
   // Registers the subscription update listener with the Event Manager.
 
-  void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
+  void unregister_from_subscription_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL);
   // Unregister from subscription updates.
 
   // = Publication Updates
-  void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
+  void register_for_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL);
   // Registers the publication update listener with the Event Manager.
 
-  void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener TAO_ENV_ARG_DECL);
+  void unregister_from_publication_updates (TAO_Notify_UpdateListener* update_listener ACE_ENV_ARG_DECL);
   // Unregister from publication updates.
 
   // = Subscription list lookup
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp
index cb487af32f8..ce55df28f1a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp
@@ -29,9 +29,9 @@ TAO_Notify_Event_Processor::~TAO_Notify_Event_Processor ()
 
 void
 TAO_Notify_Event_Processor::init (TAO_Notify_QoSAdmin_i* qos_properties
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
-  this->lookup_task_ = this->emo_factory_->create_lookup_task (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->lookup_task_ = this->emo_factory_->create_lookup_task (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get hold of the admin properties.
@@ -43,15 +43,15 @@ TAO_Notify_Event_Processor::init (TAO_Notify_QoSAdmin_i* qos_properties
 }
 
 void
-TAO_Notify_Event_Processor::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Event_Processor::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->lookup_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->lookup_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event,
                                                     TAO_Notify_EventSource* event_source
-                                                    TAO_ENV_ARG_DECL)
+                                                    ACE_ENV_ARG_DECL)
 {
   // TODO: use cache allocator here.
   // @@ Pradeep: you shouldn't be allocating at all!  If this must go
@@ -64,22 +64,22 @@ TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event,
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                           "Evaluating listener filter\n"));
 
-  event_source->filter_eval_task ()->process_event (mb TAO_ENV_ARG_PARAMETER);
+  event_source->filter_eval_task ()->process_event (mb ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_Event_Processor::lookup_subscriptions (TAO_Notify_Event* event,
                                                   TAO_Notify_EventSource* /*event_source*/
-                                                  TAO_ENV_ARG_DECL)
+                                                  ACE_ENV_ARG_DECL)
 {
   TAO_Notify_Lookup_Command* lookup =
     new TAO_Notify_Lookup_Command (this, event, this->event_manager_->event_map ());
 
-  this->lookup_task_->process_event (lookup TAO_ENV_ARG_PARAMETER);
+  this->lookup_task_->process_event (lookup ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent ACE_ENV_ARG_DECL)
 {
   // @@ Pradeep: you should use ACE_NEW here....
   // @@ Pradeep: do you really need to allocate this guy from the
@@ -90,14 +90,14 @@ TAO_Notify_Event_Processor::evaluate_listener_filter (TAO_Notify_Event* event, T
   TAO_Notify_Listener_Filter_Eval_Command* mb =
     new TAO_Notify_Listener_Filter_Eval_Command (this, event, event_listener, eval_parent);
 
-  event_listener->filter_eval_task ()->process_event (mb TAO_ENV_ARG_PARAMETER);
+  event_listener->filter_eval_task ()->process_event (mb ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_Event_Processor::dispatch_event (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener TAO_ENV_ARG_DECL)
+TAO_Notify_Event_Processor::dispatch_event (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener ACE_ENV_ARG_DECL)
 {
   TAO_Notify_Event_Dispatch_Command* dispatch =
     new TAO_Notify_Event_Dispatch_Command (this, event, event_listener);
 
-  event_listener->event_dispatch_task ()->process_event (dispatch TAO_ENV_ARG_PARAMETER);
+  event_listener->event_dispatch_task ()->process_event (dispatch ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h
index 888730b1326..d4d98499699 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h
@@ -58,34 +58,34 @@ class TAO_Notify_Export TAO_Notify_Event_Processor
   virtual ~TAO_Notify_Event_Processor ();
 
   void init (TAO_Notify_QoSAdmin_i* qos_properties
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Init
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // Shutdown operations.
 
   void evaluate_source_filter (TAO_Notify_Event* event,
                                TAO_Notify_EventSource* event_source
-                               TAO_ENV_ARG_DECL);
+                               ACE_ENV_ARG_DECL);
   // Event processing entry point.
 
   // = Callbacks for Source/Event Listeners.
   void lookup_subscriptions (TAO_Notify_Event* event,
                              TAO_Notify_EventSource* event_source
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   // This method is called by an Event_Source after it has
   // successfully evaluated its filter.
 
   void evaluate_listener_filter (TAO_Notify_Event* event,
                                  TAO_Notify_EventListener* event_listener,
                                  CORBA::Boolean eval_parent
-                                 TAO_ENV_ARG_DECL);
+                                 ACE_ENV_ARG_DECL);
   // This method is called by the subscription lookup command asking
   // that <event> be delivered to <event_listener>.
 
   void dispatch_event (TAO_Notify_Event* event,
                        TAO_Notify_EventListener* event_listener
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // This method is called by an Event_Listener after it has
   // successfully evaluated its filter.
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp
index 7b9859e70f4..99ac21f7715 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp
@@ -16,7 +16,7 @@ TAO_Notify_Collection_Factory* TAO_Notify_Factory::collection_factory_ = 0;
 TAO_Notify_EMO_Factory* TAO_Notify_Factory::emo_factory_ = 0;
 
 void
-TAO_Notify_Factory::init (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Factory::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   co_factory_ =
     ACE_Dynamic_Service <TAO_Notify_CO_Factory>::instance (TAO_NOTIFY_DEF_CO_FACTORY_NAME);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h
index e5476598473..a5c48f02e74 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h
@@ -62,7 +62,7 @@ class TAO_Notify_Export TAO_Notify_Factory
  protected:
   friend class TAO_Notify_EventChannelFactory_i;
 
-  static void init (TAO_ENV_SINGLE_ARG_DECL);
+  static void init (ACE_ENV_SINGLE_ARG_DECL);
   // Initalize the services.
 
   static void shutdown (void);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
index 5f385bb3e87..ecf40231947 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
@@ -14,7 +14,7 @@ TAO_Notify_FilterAdmin_i::~TAO_Notify_FilterAdmin_i (void)
 }
 
 CORBA::Boolean
-TAO_Notify_FilterAdmin_i::match (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
+TAO_Notify_FilterAdmin_i::match (TAO_Notify_Event &event ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData
@@ -32,7 +32,7 @@ TAO_Notify_FilterAdmin_i::match (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
 
   for (; iter.next (entry); iter.advance ())
     {
-      ret_val = event.do_match (entry->int_id_.in () TAO_ENV_ARG_PARAMETER);
+      ret_val = event.do_match (entry->int_id_.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (ret_val == 1)
@@ -45,7 +45,7 @@ TAO_Notify_FilterAdmin_i::match (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
 CosNotifyFilter::FilterID
 TAO_Notify_FilterAdmin_i::add_filter (
     CosNotifyFilter::Filter_ptr new_filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -69,7 +69,7 @@ TAO_Notify_FilterAdmin_i::add_filter (
     }
 }
 
-void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_id TAO_ENV_ARG_DECL)
+void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
@@ -84,7 +84,7 @@ void TAO_Notify_FilterAdmin_i::remove_filter (CosNotifyFilter::FilterID filter_i
 CosNotifyFilter::Filter_ptr
 TAO_Notify_FilterAdmin_i::get_filter (
     CosNotifyFilter::FilterID filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -102,28 +102,28 @@ TAO_Notify_FilterAdmin_i::get_filter (
 }
 
 CosNotifyFilter::FilterIDSeq*
-TAO_Notify_FilterAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_FilterAdmin_i::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_ids_.get_sequence(TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->filter_ids_.get_sequence(ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_FilterAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_FilterAdmin_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   CosNotifyFilter::FilterIDSeq* id_list =
-    this->get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < id_list->length (); ++i)
     {
       CosNotifyFilter::FilterID id = (*id_list)[i];
-      this->remove_filter (id TAO_ENV_ARG_PARAMETER);
+      this->remove_filter (id ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h
index 76783881955..a821c0c0205 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h
@@ -42,7 +42,7 @@ public:
   // Destructor
 
   // = match operation on all the filters
-  CORBA::Boolean match (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
+  CORBA::Boolean match (TAO_Notify_Event &event ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException,
                      CosNotifyFilter::UnsupportedFilterableData
@@ -51,7 +51,7 @@ public:
 
   virtual CosNotifyFilter::FilterID add_filter (
     CosNotifyFilter::Filter_ptr new_filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -59,7 +59,7 @@ public:
 
   virtual void remove_filter (
     CosNotifyFilter::FilterID filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -68,7 +68,7 @@ public:
 
   virtual CosNotifyFilter::Filter_ptr get_filter (
     CosNotifyFilter::FilterID filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -76,14 +76,14 @@ public:
   ));
 
   virtual CosNotifyFilter::FilterIDSeq * get_all_filters (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void remove_all_filters (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp
index 100337158d5..388bdefeee2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.cpp
@@ -16,11 +16,11 @@ TAO_Notify_FilterFactory_i::~TAO_Notify_FilterFactory_i (void)
 }
 
 CosNotifyFilter::FilterFactory_ptr
-TAO_Notify_FilterFactory_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_FilterFactory_i::get_ref (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyFilter::FilterFactory_var filterfactory;
 
-  filterfactory = _this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  filterfactory = _this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyFilter::FilterFactory::_nil ());
 
   return filterfactory._retn ();
@@ -29,7 +29,7 @@ TAO_Notify_FilterFactory_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
 CosNotifyFilter::Filter_ptr
 TAO_Notify_FilterFactory_i::create_filter (
     const char *constraint_grammar
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -47,14 +47,14 @@ TAO_Notify_FilterFactory_i::create_filter (
                     TAO_Notify_Filter_i (constraint_grammar),
                     CORBA::NO_MEMORY ());
 
-  return filter->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return filter->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyFilter::MappingFilter_ptr
 TAO_Notify_FilterFactory_i::create_mapping_filter (
                                                    const char * /*constraint_grammar*/,
                                                    const CORBA::Any & /*default_value*/
-                                                   TAO_ENV_ARG_DECL_NOT_USED //TAO_ENV_SINGLE_ARG_PARAMETER
+                                                   ACE_ENV_ARG_DECL_NOT_USED //ACE_ENV_SINGLE_ARG_PARAMETER
                                                    )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h
index d6b57eb7794..72eb9e53166 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterFactory_i.h
@@ -46,12 +46,12 @@ public:
   // Destructor
 
   CosNotifyFilter::FilterFactory_ptr
-  get_ref (TAO_ENV_SINGLE_ARG_DECL);
+  get_ref (ACE_ENV_SINGLE_ARG_DECL);
   // Activate with the default POA
 
   virtual CosNotifyFilter::Filter_ptr create_filter (
     const char * constraint_grammar
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -61,7 +61,7 @@ public:
   virtual CosNotifyFilter::MappingFilter_ptr create_mapping_filter (
     const char * constraint_grammar,
     const CORBA::Any & default_value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
index 25a119d2098..8c9bfaeb18b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
@@ -18,8 +18,8 @@ TAO_Notify_Filter_i::TAO_Notify_Filter_i (const char* constraint_grammar)
 // Implementation skeleton destructor
 TAO_Notify_Filter_i::~TAO_Notify_Filter_i (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
-  this->remove_all_constraints (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_DECLARE_NEW_CORBA_ENV;
+  this->remove_all_constraints (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (TAO_debug_level > 0)
@@ -29,7 +29,7 @@ TAO_Notify_Filter_i::~TAO_Notify_Filter_i (void)
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_Notify_Filter_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Filter_i::get_ref (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var my_POA = _default_POA ();
 
@@ -37,21 +37,21 @@ TAO_Notify_Filter_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
 
   PortableServer::ObjectId_var oid =
     my_POA->activate_object (this
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
 
   CORBA::Object_var obj =
     my_POA->id_to_reference (oid.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyFilter::Filter::_nil ());
 
   return CosNotifyFilter::Filter::_narrow (obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 }
 
 char*
 TAO_Notify_Filter_i::constraint_grammar (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -63,7 +63,7 @@ TAO_Notify_Filter_i::constraint_grammar (
 void
 TAO_Notify_Filter_i::add_constraints_i (
     const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -87,7 +87,7 @@ TAO_Notify_Filter_i::add_constraints_i (
 
           notify_constr_expr->interpreter.build_tree (
                                   expr.constraint_expr.in ()
-                                  TAO_ENV_ARG_PARAMETER
+                                  ACE_ENV_ARG_PARAMETER
                                 );
           ACE_TRY_CHECK;
 
@@ -120,7 +120,7 @@ TAO_Notify_Filter_i::add_constraints_i (
 CosNotifyFilter::ConstraintInfoSeq*
 TAO_Notify_Filter_i::add_constraints (
     const CosNotifyFilter::ConstraintExpSeq& constraint_list
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -163,7 +163,7 @@ TAO_Notify_Filter_i::add_constraints (
     }
 
   this->add_constraints_i (*infoseq
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   auto_infoseq.release ();
@@ -175,7 +175,7 @@ void
 TAO_Notify_Filter_i::modify_constraints (
     const CosNotifyFilter::ConstraintIDSeq & del_list,
     const CosNotifyFilter::ConstraintInfoSeq & modify_list
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -229,7 +229,7 @@ TAO_Notify_Filter_i::modify_constraints (
   ACE_TRY
     {
       this->add_constraints_i (modify_list
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -273,7 +273,7 @@ TAO_Notify_Filter_i::modify_constraints (
 CosNotifyFilter::ConstraintInfoSeq *
 TAO_Notify_Filter_i::get_constraints (
     const CosNotifyFilter::ConstraintIDSeq & id_list
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::ConstraintNotFound))
@@ -308,7 +308,7 @@ TAO_Notify_Filter_i::get_constraints (
 }
 
 CosNotifyFilter::ConstraintInfoSeq *
-TAO_Notify_Filter_i::get_all_constraints (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Filter_i::get_all_constraints (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   size_t current_size = this->constraint_expr_list_.current_size ();
@@ -344,7 +344,7 @@ TAO_Notify_Filter_i::get_all_constraints (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Notify_Filter_i::remove_all_constraints (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Filter_i::remove_all_constraints (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CONSTRAINT_EXPR_LIST_ITER iter (this->constraint_expr_list_);
@@ -364,10 +364,10 @@ TAO_Notify_Filter_i::remove_all_constraints (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_Notify_Filter_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Filter_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->remove_all_constraints (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->remove_all_constraints (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var my_POA = _default_POA ();
@@ -379,7 +379,7 @@ TAO_Notify_Filter_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_Notify_Filter_i::match (const CORBA::Any & /*filterable_data */
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData))
 {
@@ -390,7 +390,7 @@ TAO_Notify_Filter_i::match (const CORBA::Any & /*filterable_data */
 CORBA::Boolean
 TAO_Notify_Filter_i::match_structured (
     const CosNotification::StructuredEvent & filterable_data
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData))
@@ -424,7 +424,7 @@ TAO_Notify_Filter_i::match_structured (
 CORBA::Boolean
 TAO_Notify_Filter_i::match_typed (
     const CosNotification::PropertySeq & /* filterable_data */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC (( CORBA::SystemException,
                    CosNotifyFilter::UnsupportedFilterableData))
@@ -436,7 +436,7 @@ TAO_Notify_Filter_i::match_typed (
 CosNotifyFilter::CallbackID
 TAO_Notify_Filter_i::attach_callback (
     CosNotifyComm::NotifySubscribe_ptr /* callback */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -447,7 +447,7 @@ TAO_Notify_Filter_i::attach_callback (
 void
 TAO_Notify_Filter_i::detach_callback (
     CosNotifyFilter::CallbackID /* callback */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyFilter::CallbackNotFound))
@@ -456,7 +456,7 @@ TAO_Notify_Filter_i::detach_callback (
 }
 
 CosNotifyFilter::CallbackIDSeq *
-TAO_Notify_Filter_i::get_callbacks (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Filter_i::get_callbacks (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
index 6559a4e397b..8afd12e2f7f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.h
@@ -53,11 +53,11 @@ public:
   virtual ~TAO_Notify_Filter_i (void);
 
   CosNotifyFilter::Filter_ptr
-  get_ref (TAO_ENV_SINGLE_ARG_DECL);
+  get_ref (ACE_ENV_SINGLE_ARG_DECL);
   // Activate with the default POA
 
 virtual char * constraint_grammar (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -65,7 +65,7 @@ virtual char * constraint_grammar (
 
 virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (
     const CosNotifyFilter::ConstraintExpSeq & constraint_list
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -75,7 +75,7 @@ virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (
 virtual void modify_constraints (
     const CosNotifyFilter::ConstraintIDSeq & del_list,
     const CosNotifyFilter::ConstraintInfoSeq & modify_list
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -85,7 +85,7 @@ virtual void modify_constraints (
 
 virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (
     const CosNotifyFilter::ConstraintIDSeq & id_list
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -93,21 +93,21 @@ virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (
   ));
 
 virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void remove_all_constraints (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void destroy (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -115,7 +115,7 @@ virtual void destroy (
 
 virtual CORBA::Boolean match (
     const CORBA::Any & filterable_data
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -124,7 +124,7 @@ virtual CORBA::Boolean match (
 
 virtual CORBA::Boolean match_structured (
     const CosNotification::StructuredEvent & filterable_data
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -133,7 +133,7 @@ virtual CORBA::Boolean match_structured (
 
 virtual CORBA::Boolean match_typed (
     const CosNotification::PropertySeq & filterable_data
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -142,7 +142,7 @@ virtual CORBA::Boolean match_typed (
 
 virtual CosNotifyFilter::CallbackID attach_callback (
     CosNotifyComm::NotifySubscribe_ptr callback
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -150,7 +150,7 @@ virtual CosNotifyFilter::CallbackID attach_callback (
 
 virtual void detach_callback (
     CosNotifyFilter::CallbackID callback
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -158,7 +158,7 @@ virtual void detach_callback (
   ));
 
 virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -167,7 +167,7 @@ virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (
 private:
   void add_constraints_i (
       const CosNotifyFilter::ConstraintInfoSeq& constraint_info_seq
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp
index 3e917878450..b0cc56bcf1d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp
@@ -51,7 +51,7 @@ TAO_Notify_ID_Pool_Ex<ID_TYPE, ID_TYPE_SEQ>::~TAO_Notify_ID_Pool_Ex ()
 }
 
 template <class ID_TYPE, class ID_TYPE_SEQ> ID_TYPE_SEQ*
-TAO_Notify_ID_Pool_Ex<ID_TYPE, ID_TYPE_SEQ>::get_sequence (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ID_Pool_Ex<ID_TYPE, ID_TYPE_SEQ>::get_sequence (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Figure out the length of the list.
   size_t len = this->active_list_.size ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h
index 33471fc7b10..c88b497b7df 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h
@@ -78,7 +78,7 @@ class TAO_Notify_ID_Pool_Ex : public TAO_Notify_ID_Pool <ID_TYPE>
   TAO_Notify_ID_Pool_Ex (void);
   ~TAO_Notify_ID_Pool_Ex ();
 
-  ID_TYPE_SEQ* get_sequence (TAO_ENV_SINGLE_ARG_DECL);
+  ID_TYPE_SEQ* get_sequence (ACE_ENV_SINGLE_ARG_DECL);
   // Get a list of all ids in use.
   // Essentially converts the <active_list_> to a Sequence.
 };
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp
index 1e75f974275..7be49ac9fe3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp
@@ -26,15 +26,15 @@ TAO_Notify_Listener_Filter_Eval_Command::~TAO_Notify_Listener_Filter_Eval_Comman
 }
 
 int
-TAO_Notify_Listener_Filter_Eval_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Listener_Filter_Eval_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Boolean result =
-    this->event_listener_->evaluate_filter (*this->event_, this->eval_parent_ TAO_ENV_ARG_PARAMETER);
+    this->event_listener_->evaluate_filter (*this->event_, this->eval_parent_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result == 1)
     {
-      this->event_processor_->dispatch_event (this->event_, this->event_listener_ TAO_ENV_ARG_PARAMETER);
+      this->event_processor_->dispatch_event (this->event_, this->event_listener_ ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h
index daaf4567e9b..1526a3ed433 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h
@@ -45,7 +45,7 @@ class TAO_Notify_Export TAO_Notify_Listener_Filter_Eval_Command : public TAO_Not
 
   ~TAO_Notify_Listener_Filter_Eval_Command();
 
-  virtual int execute (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
   // Command callback
 
  protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h
index bb15333aaff..458c8c29c1d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listeners.h
@@ -71,18 +71,18 @@ class  TAO_Notify_Export TAO_Notify_EventListener : virtual public TAO_Notify_Re
 
 public:
   virtual void dispatch_event (TAO_Notify_Event &event
-                               TAO_ENV_ARG_DECL) = 0;
+                               ACE_ENV_ARG_DECL) = 0;
   // Callback methods to supply the event to the listener.
 
   virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event,
                                           CORBA::Boolean eval_parent
-                                          TAO_ENV_ARG_DECL) = 0;
+                                          ACE_ENV_ARG_DECL) = 0;
   // Evaluates true if this event is acceptable by the listener.
   // The <eval_parent> is a hint to the listener to help it determine
   // if its wise to evaluate the parents filter too. This helps in
   // implementing the "interfilter group operator" logic.
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0;
   // Ask the listener to relinquish any bindings and prepare to be
   // disposed.
 
@@ -107,7 +107,7 @@ class TAO_Notify_Export TAO_Notify_EventSource : virtual public TAO_Notify_RefCo
   // TODO: add a shutdown method to this interface!!
 
   virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event
-                                          TAO_ENV_ARG_DECL) = 0;
+                                          ACE_ENV_ARG_DECL) = 0;
   // Evaluates true if this event is acceptable by the Source.
 
   virtual TAO_Notify_Worker_Task* filter_eval_task (void) = 0;
@@ -130,7 +130,7 @@ class TAO_Notify_Export TAO_Notify_UpdateListener : virtual public TAO_Notify_Re
  public:
   virtual void dispatch_update (TAO_Notify_EventType_List& added,
                                 TAO_Notify_EventType_List& removed
-                                TAO_ENV_ARG_DECL) = 0;
+                                ACE_ENV_ARG_DECL) = 0;
   // Callback method to supply updates.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp
index b2f1b14b23d..46ca4442051 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp
@@ -23,7 +23,7 @@ TAO_Notify_Lookup_Command::~TAO_Notify_Lookup_Command ()
 }
 
 int
-TAO_Notify_Lookup_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Lookup_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   // If the event is *not* the special event
   // send it to the list that matches it.
@@ -42,7 +42,7 @@ TAO_Notify_Lookup_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
       if (event_map_->find (this->event_->event_type (),
                            listener_list) == 0)
         {
-          listener_list->for_each (this TAO_ENV_ARG_PARAMETER);
+          listener_list->for_each (this ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
     }
@@ -50,7 +50,7 @@ TAO_Notify_Lookup_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
   // if (this->default_subscription_list_->is_empty () == 0)
   // @@ can't do this test - is_empty is not impl.
   {
-    event_map_->default_subscription_list ()->for_each (this TAO_ENV_ARG_PARAMETER);
+    event_map_->default_subscription_list ()->for_each (this ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (-1);
   }
 
@@ -59,8 +59,8 @@ TAO_Notify_Lookup_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_Notify_Lookup_Command::work (TAO_Notify_EventListener* event_listener
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
-  this->event_processor_->evaluate_listener_filter (this->event_, event_listener, 1 TAO_ENV_ARG_PARAMETER);
+  this->event_processor_->evaluate_listener_filter (this->event_, event_listener, 1 ACE_ENV_ARG_PARAMETER);
   // Note the last parameter, we want the parent filter to be evaluated.
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h
index 07a769906e5..a860df2e3f7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h
@@ -46,11 +46,11 @@ class TAO_Notify_Export TAO_Notify_Lookup_Command : public TAO_Notify_Command, p
 
   ~TAO_Notify_Lookup_Command ();
 
-  virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Command callback
 
   // = TAO_ESF_Worker method
-  void work (TAO_Notify_EventListener* listener TAO_ENV_ARG_DECL);
+  void work (TAO_Notify_EventListener* listener ACE_ENV_ARG_DECL);
  protected:
   // = Data member
   TAO_Notify_Event_Map* event_map_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp
index 7ae2676c1c2..34cfcdf67bd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp
@@ -56,7 +56,7 @@ TAO_Notify_MT_Worker_Task::init_task (
 }
 
 void
-TAO_Notify_MT_Worker_Task::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_MT_Worker_Task::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
 {
   // Put a shutdown message in the task queue and wait here till all
   // threads exit.
@@ -71,8 +71,8 @@ TAO_Notify_MT_Worker_Task::close (u_long)
 
   TAO_Notify_Shutdown_Command * mb = new TAO_Notify_Shutdown_Command ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
-  this->process_event (mb TAO_ENV_ARG_PARAMETER);
+  ACE_DECLARE_NEW_CORBA_ENV;
+  this->process_event (mb ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // We can not wait for ourselves to quit
@@ -90,10 +90,10 @@ TAO_Notify_MT_Worker_Task::close (u_long)
 }
 
 int
-TAO_Notify_MT_Worker_Task::process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv)
+TAO_Notify_MT_Worker_Task::process_event (TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value *tv)
 {
   // Execute the buffering strategy.
-  this->buffering_strategy_->execute (this->msg_queue (), mb TAO_ENV_ARG_PARAMETER, tv);
+  this->buffering_strategy_->execute (this->msg_queue (), mb ACE_ENV_ARG_PARAMETER, tv);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -114,7 +114,7 @@ TAO_Notify_MT_Worker_Task::update_qos (TAO_Notify_QoSAdmin_i& qos_admin)
   // set on say the event channel or the supplier proxy.
   ACE_TRY_NEW_ENV
     {
-      CosNotification::QoSProperties_var qos = qos_admin.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CosNotification::QoSProperties_var qos = qos_admin.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (CORBA::ULong index = 0; index < qos->length (); ++index)
@@ -185,7 +185,7 @@ TAO_Notify_MT_Worker_Task::svc (void)
 
           if (command != 0)
             {
-              result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER);
+              result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -212,7 +212,7 @@ TAO_Notify_Shutdown_Command::TAO_Notify_Shutdown_Command (void)
 }
 
 int
-TAO_Notify_Shutdown_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_Shutdown_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
 {
   return -1;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h
index fa2bea56446..a86f1661e48 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.h
@@ -58,10 +58,10 @@ public:
                          TAO_Notify_QoSAdmin_i* const qos_properties);
   // Init the task
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // shutdown this task.
 
-  virtual int process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv = 0);
+  virtual int process_event (TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value *tv = 0);
   // Process the command.
 
   virtual void update_admin (TAO_Notify_AdminProperties& admin);
@@ -102,7 +102,7 @@ class TAO_Notify_Export TAO_Notify_Shutdown_Command : public TAO_Notify_Command
 
   TAO_Notify_Shutdown_Command (void);
 
-  virtual int execute (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
   // Returns -1. This signals worker threads to finish servicing requests.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h
index 6160260a456..dd072e486d5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h
@@ -42,41 +42,41 @@ class TAO_Notify_Export TAO_Notify_POA_Factory : public ACE_Service_Object
   //
  public:
   // = POA creation methods.
-  virtual PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa TAO_ENV_ARG_DECL) = 0;
+  virtual PortableServer::POA_ptr create_event_channel_POA (PortableServer::POA_ptr parent_poa ACE_ENV_ARG_DECL) = 0;
   // Create the POA to activate Event Channels in.
 
-  virtual PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0;
+  virtual PortableServer::POA_ptr create_supplier_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL) = 0;
   // Create the POA to activate SA's in.
 
-  virtual PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0;
+  virtual PortableServer::POA_ptr create_consumer_admin_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL) = 0;
   // Create the POA to activate CA's in.
 
-  virtual PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0;
+  virtual PortableServer::POA_ptr create_proxy_pushconsumer_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL) = 0;
   // Create the POA to activate proxy push consumers in.
 
-  virtual PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id TAO_ENV_ARG_DECL) = 0;
+  virtual PortableServer::POA_ptr create_proxy_pushsupplier_POA (PortableServer::POA_ptr parent_poa, CORBA::Long new_poa_id ACE_ENV_ARG_DECL) = 0;
   // Create the POA to activate proxy push suppliers in.
 
   // = Object activation and POA methods
-  virtual CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL) = 0;
+  virtual CORBA::Object_ptr activate_object_with_id (CORBA::Long id, PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL) = 0;
   // Converts <id> to an ObjectId and registers with the POA <poa>.
 
-  virtual CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL) = 0;
+  virtual CORBA::Object_ptr activate_object (PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL) = 0;
   // Registers with the POA <poa>.
 
-  virtual CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant TAO_ENV_ARG_DECL) = 0;
+  virtual CORBA::Object_ptr servant_to_reference (PortableServer::POA_ptr poa,PortableServer::Servant servant ACE_ENV_ARG_DECL) = 0;
   // Registers with the POA <poa>.
 
-  virtual CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0;
+  virtual CORBA::Object_ptr id_to_reference (CORBA::Long id, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) = 0;
   // Look for the Object with id <id> in <poa>.
 
-  virtual void destroy_POA (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0;
+  virtual void destroy_POA (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) = 0;
   // Destroy the <poa>
 
-  virtual void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) = 0;
+  virtual void deactivate_object (CORBA::Object_ptr obj, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL) = 0;
   // Deactivate the object.
 
-  virtual void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr TAO_ENV_ARG_DECL) = 0;
+  virtual void deactivate_object (PortableServer::Servant servant, PortableServer::POA_ptr ACE_ENV_ARG_DECL) = 0;
   // Deactivate the object.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp
index 9a1d5fdb1a9..0eb9eaaba70 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp
@@ -23,14 +23,14 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::TAO_Notify_ProxyConsumer (TAO_Notify_Sup
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
 {
   this->proxy_id_ = proxy_id;
 
   TAO_Notify_CO_Factory* cof =
     TAO_Notify_Factory::get_channel_objects_factory ();
 
-  this->lock_ = cof->create_proxy_consumer_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->lock_ = cof->create_proxy_consumer_lock (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the task to forward filtering commands to:
@@ -39,7 +39,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID pro
     this->event_manager_->resource_factory ();
 
   this->filter_eval_task_ =
-    event_manager_objects_factory->create_source_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER);
+    event_manager_objects_factory->create_source_eval_task (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get hold of the admin properties.
@@ -58,7 +58,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer (void)
   ACE_DECLARE_NEW_CORBA_ENV;
 
   this->event_manager_->unregister_from_subscription_updates (this
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   delete this->lock_;
@@ -67,7 +67,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer (void)
   this->supplier_admin_->_remove_ref ();
 
   // @@: Move this to on_disconnected
-  this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->filter_eval_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_Notify_EMO_Factory* event_manager_objects_factory =
@@ -77,27 +77,27 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer (void)
 }
 
 template <class SERVANT_TYPE> CORBA::Boolean
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event ACE_ENV_ARG_DECL)
 {
   // check if it passes the parent filter.
   CORBA::Boolean bval =
     this->supplier_admin_->get_filter_admin ().match (event
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Boolean ret_val;
 
-  ret_val = this->supplier_admin_->MyOperator (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ret_val = this->supplier_admin_->MyOperator (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (ret_val == CosNotifyChannelAdmin::AND_OP)
     {
-      ret_val = bval && this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER);
+      ret_val = bval && this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   else
     {
-      ret_val = bval || this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER);
+      ret_val = bval || this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -111,7 +111,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::filter_eval_task (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_connected (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get hold of the admin properties.
   TAO_Notify_AdminProperties* const admin_properties =
@@ -124,14 +124,14 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL)
       supplier_count->value () >= admin_properties->max_suppliers ())
     ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of suppliers connected.
 
-  this->event_manager_->register_for_subscription_updates (this TAO_ENV_ARG_PARAMETER);
+  this->event_manager_->register_for_subscription_updates (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   (*supplier_count)++;
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_disconnected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
 {
   // Get hold of the admin properties.
   TAO_Notify_AdminProperties* const admin_properties =
@@ -141,17 +141,17 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
                    ))
 {
-  this->event_manager_->update_publication_list (added, removed TAO_ENV_ARG_PARAMETER);
+  this->event_manager_->update_publication_list (added, removed ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode TAO_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -170,39 +170,39 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::obtain_subscription_types (CosNotifyChan
       // if updates are currently off, switch them on.
       if (this->updates_on_ == 0)
         this->event_manager_->register_for_subscription_updates (this
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
     }
   else
     {
       // if updates are currently on, switch them off.
       if (this->updates_on_ == 1)
         this->event_manager_->unregister_from_subscription_updates (this
-                                                                    TAO_ENV_ARG_PARAMETER);
+                                                                    ACE_ENV_ARG_PARAMETER);
     }
 
   return event_type_seq;
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_ProxyConsumer<SERVANT_TYPE>::MyAdmin (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyConsumer<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->supplier_admin_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->supplier_admin_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxyConsumer<SERVANT_TYPE>::set_qos (
                            const CosNotification::QoSProperties & qos
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     CosNotification::UnsupportedQoS
   ))
 {
   // Call our base class set_qos ().
-  TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (qos TAO_ENV_ARG_PARAMETER);
+  TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Then update our task's qos
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h
index 035f48d0cf1..cb550e3ab1e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h
@@ -52,24 +52,24 @@ public:
   virtual ~TAO_Notify_ProxyConsumer (void);
   // Destructor
 
-  void init (CosNotifyChannelAdmin::ProxyID myID TAO_ENV_ARG_DECL);
+  void init (CosNotifyChannelAdmin::ProxyID myID ACE_ENV_ARG_DECL);
   // Init the Proxy.
 
   // = TAO_Notify_EventSource methods.
-  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event TAO_ENV_ARG_DECL);
+  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event ACE_ENV_ARG_DECL);
   // Evaluates true if this event is acceptable by the Source.
 
   TAO_Notify_Worker_Task* filter_eval_task (void);
   // The Worker task associated with the event listener for filter evaluation.
 
-  virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
   virtual CosNotification::EventTypeSeq * obtain_subscription_types (
     CosNotifyChannelAdmin::ObtainInfoMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -78,7 +78,7 @@ public:
   virtual void offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -89,7 +89,7 @@ public:
   // so we can update the qos on our tasks.
   virtual void set_qos (
     const CosNotification::QoSProperties & qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -98,10 +98,10 @@ public:
 
 protected:
   // = Helper methods
-  void on_connected (TAO_ENV_SINGLE_ARG_DECL);
+  void on_connected (ACE_ENV_SINGLE_ARG_DECL);
   // Derived classes should call this when their suppliers connect.
 
-  void on_disconnected (TAO_ENV_SINGLE_ARG_DECL);
+  void on_disconnected (ACE_ENV_SINGLE_ARG_DECL);
   // Derived classes should call this when their suppliers disconnect.
 
   // = Data members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp
index 009798f4939..567124efd80 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp
@@ -21,7 +21,7 @@ TAO_Notify_ProxyPushConsumer_i::~TAO_Notify_ProxyPushConsumer_i (void)
 }
 
 void
-TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier TAO_ENV_ARG_DECL)
+TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected
@@ -39,7 +39,7 @@ TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSup
         CosEventComm::PushSupplier::_duplicate (push_supplier);
 
       this->notify_push_supplier_ =
-        CosNotifyComm::PushSupplier::_narrow (push_supplier TAO_ENV_ARG_PARAMETER);
+        CosNotifyComm::PushSupplier::_narrow (push_supplier ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!CORBA::is_nil (this->notify_push_supplier_.in ()))
@@ -60,7 +60,7 @@ TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSup
                             CORBA::INTERNAL ());
         ACE_TRY_CHECK;
 
-        this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
@@ -80,7 +80,7 @@ TAO_Notify_ProxyPushConsumer_i::connect_any_push_supplier (CosEventComm::PushSup
 }
 
 void
-TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL)
+TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL)
 {
   {
     ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
@@ -94,7 +94,7 @@ TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq
   ACE_TRY
     {
       this->notify_push_supplier_->subscription_change (added, removed
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
@@ -105,7 +105,7 @@ TAO_Notify_ProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq
 }
 
 void
-TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data TAO_ENV_ARG_DECL)
+TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -125,7 +125,7 @@ TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data TAO_ENV_ARG_DECL)
 
   TAO_Notify_Any* notify_event = new TAO_Notify_Any(data_copy);
 
-  this->event_manager_->process_event (notify_event, this TAO_ENV_ARG_PARAMETER);
+  this->event_manager_->process_event (notify_event, this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   notify_event->_decr_refcnt ();
@@ -133,7 +133,7 @@ TAO_Notify_ProxyPushConsumer_i::push (const CORBA::Any & data TAO_ENV_ARG_DECL)
 
 void
 TAO_Notify_ProxyPushConsumer_i::disconnect_push_consumer (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -141,10 +141,10 @@ TAO_Notify_ProxyPushConsumer_i::disconnect_push_consumer (
 {
   // ask our parent to deactivate us.
   this->supplier_admin_->
-    deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER);
+    deactivate_proxy_pushconsumer (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // = TAO_Notify_CosEC_ProxyPushConsumer_i
@@ -161,32 +161,32 @@ TAO_Notify_CosEC_ProxyPushConsumer_i::~TAO_Notify_CosEC_ProxyPushConsumer_i (voi
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer_i::init (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushConsumer_i::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Pass the default id.
-  this->notify_proxy_.init (0 TAO_ENV_ARG_PARAMETER);
+  this->notify_proxy_.init (0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data TAO_ENV_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->notify_proxy_.push (data TAO_ENV_ARG_PARAMETER);
+  this->notify_proxy_.push (data ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->notify_proxy_.disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->notify_proxy_.disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushConsumer_i::connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier TAO_ENV_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushConsumer_i::connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected))
 {
-  this->notify_proxy_.connect_any_push_supplier (push_supplier TAO_ENV_ARG_PARAMETER);
+  this->notify_proxy_.connect_any_push_supplier (push_supplier ACE_ENV_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h
index 81c2a6a3d64..8da7670887d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h
@@ -55,7 +55,7 @@ public:
   // Destructor
 
   // = Interface methods
-  void push (const CORBA::Any & data TAO_ENV_ARG_DECL)
+  void push (const CORBA::Any & data ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -63,7 +63,7 @@ public:
 
   virtual void connect_any_push_supplier (
     CosEventComm::PushSupplier_ptr push_supplier
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -71,7 +71,7 @@ public:
   ));
 
 virtual void disconnect_push_consumer (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -79,7 +79,7 @@ virtual void disconnect_push_consumer (
 
  protected:
 // = Helper methods
- virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL);
+ virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL);
 
  // = Data members
  CORBA::Boolean notify_style_supplier_;
@@ -113,20 +113,20 @@ public:
   virtual ~TAO_Notify_CosEC_ProxyPushConsumer_i (void);
   // Destructor.
 
-  void init (TAO_ENV_SINGLE_ARG_DECL);
+  void init (ACE_ENV_SINGLE_ARG_DECL);
     // init.
 
   virtual void push (const CORBA::Any &data
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Suppliers call this method to pass data to connected consumers.
 
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Disconnects the supplier from the event communication.
 
   virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosEventChannelAdmin::AlreadyConnected));
   // Connects a push supplier.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp
index 7c45f284d4c..049cc32f249 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp
@@ -20,24 +20,24 @@ TAO_Notify_ProxyPushSupplier_i::~TAO_Notify_ProxyPushSupplier_i (void)
 }
 
 void
-TAO_Notify_ProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
+TAO_Notify_ProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      event.do_push (this->cosec_push_consumer_.in () TAO_ENV_ARG_PARAMETER);
+      event.do_push (this->cosec_push_consumer_.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
     {
       ACE_DEBUG ((LM_DEBUG, "Exception dispatching any event\n"));
       // misbehaving client,
-      this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   ACE_ENDTRY;
 }
 
 void
-TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL)
+TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL)
 {
   {
     ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
@@ -47,7 +47,7 @@ TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq
 
   ACE_TRY
     {
-      this->notify_push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER);
+      this->notify_push_consumer_->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
@@ -58,7 +58,7 @@ TAO_Notify_ProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq
 }
 
 void
-TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer TAO_ENV_ARG_DECL)
+TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected,
@@ -79,7 +79,7 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon
         CosEventComm::PushConsumer::_duplicate (push_consumer);
 
       this->notify_push_consumer_ =
-        CosNotifyComm::PushConsumer::_narrow (push_consumer TAO_ENV_ARG_PARAMETER);
+        CosNotifyComm::PushConsumer::_narrow (push_consumer ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!CORBA::is_nil (this->notify_push_consumer_.in ()))
@@ -101,7 +101,7 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon
                             CORBA::INTERNAL ());
         ACE_CHECK;
 
-        this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
@@ -117,31 +117,31 @@ TAO_Notify_ProxyPushSupplier_i::connect_any_push_consumer (CosEventComm::PushCon
 }
 
 void
-TAO_Notify_ProxyPushSupplier_i::shutdown_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyPushSupplier_i::shutdown_i (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ask our parent to deactivate us.
   this->consumer_admin_->
-    deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER);
+    deactivate_proxy_pushsupplier (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyPushSupplier_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // unregister with CA
-  this->consumer_admin_->unregister_listener (this TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->unregister_listener (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_ProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxyPushSupplier_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Tell the consumer that we're going away ...
   // @@ Later, lookup a "notify_on_disconnect" option.
@@ -153,12 +153,12 @@ TAO_Notify_ProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
       return;
   }
 
-  this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TRY
     {
-      this->cosec_push_consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->cosec_push_consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
@@ -181,25 +181,25 @@ TAO_Notify_CosEC_ProxyPushSupplier_i::~TAO_Notify_CosEC_ProxyPushSupplier_i (voi
 }
 
 void
-TAO_Notify_CosEC_ProxyPushSupplier_i::init (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushSupplier_i::init (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->notify_proxy_.init (0 TAO_ENV_ARG_PARAMETER);
+  this->notify_proxy_.init (0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->notify_proxy_.disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->notify_proxy_.disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_CosEC_ProxyPushSupplier_i::connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer TAO_ENV_ARG_DECL)
+TAO_Notify_CosEC_ProxyPushSupplier_i::connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected,
                      CosEventChannelAdmin::TypeError))
 {
-  this->notify_proxy_.connect_any_push_consumer (push_consumer TAO_ENV_ARG_PARAMETER);
+  this->notify_proxy_.connect_any_push_consumer (push_consumer ACE_ENV_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h
index 97f2fdde840..bf7748e077b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h
@@ -55,7 +55,7 @@ public:
   // = Interface methods
   virtual void connect_any_push_consumer (
     CosEventComm::PushConsumer_ptr push_consumer
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -64,23 +64,23 @@ public:
   ));
 
 virtual void disconnect_push_supplier (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // Shutdown.
 
  protected:
-  void shutdown_i (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown_i (ACE_ENV_SINGLE_ARG_DECL);
   // Shutdown
 
- virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL);
+ virtual void dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL);
   // Deliver the event to the consumer.
 
- virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL);
+ virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL);
   // Deliver the update to the consumer.
 
   // = Data Members.
@@ -114,14 +114,14 @@ public:
   ~TAO_Notify_CosEC_ProxyPushSupplier_i (void);
   // Destructor.
 
-  void init (TAO_ENV_SINGLE_ARG_DECL);
+  void init (ACE_ENV_SINGLE_ARG_DECL);
   // Init.
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Ends the event communication and disposes this object.
 
-  virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer TAO_ENV_ARG_DECL)
+  virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventChannelAdmin::AlreadyConnected,
                      CosEventChannelAdmin::TypeError));
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
index 55009cd0b51..cc540f3a9af 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
@@ -25,9 +25,9 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::TAO_Notify_ProxySupplier (TAO_Notify_Con
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
 {
-  consumer_admin_->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  consumer_admin_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_id_ = proxy_id;
@@ -35,7 +35,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID pro
   TAO_Notify_CO_Factory* cof =
     TAO_Notify_Factory::get_channel_objects_factory ();
 
-  this->lock_ = cof->create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->lock_ = cof->create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_Notify_EMO_Factory* event_manager_objects_factory =
@@ -43,11 +43,11 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID pro
 
   // Create the task to forward filtering/dispatching commands to:
   this->dispatching_task_ =
-    event_manager_objects_factory->create_dispatching_task (TAO_ENV_SINGLE_ARG_PARAMETER);
+    event_manager_objects_factory->create_dispatching_task (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->filter_eval_task_ =
-    event_manager_objects_factory->create_listener_eval_task (TAO_ENV_SINGLE_ARG_PARAMETER);
+    event_manager_objects_factory->create_listener_eval_task (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get hold of the admin properties.
@@ -67,7 +67,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   this->event_manager_->unregister_from_publication_updates (this
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // unsubscribe it to our current subscriptions.
@@ -78,14 +78,14 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void)
   added.length (0);
 
   this->event_manager_->subscribe_for_events (this,
-                                              added, removed TAO_ENV_ARG_PARAMETER);
+                                              added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   delete this->lock_;
 
   this->consumer_admin_->proxy_pushsupplier_destroyed (this->proxy_id_);
 
-  consumer_admin_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  consumer_admin_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_Notify_EMO_Factory* event_manager_objects_factory =
@@ -96,23 +96,23 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void)
 }
 
 template <class SERVANT_TYPE> CORBA::Boolean
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent ACE_ENV_ARG_DECL)
 {
   if (eval_parent == 1)
     {
       CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator =
-        consumer_admin_->MyOperator (TAO_ENV_SINGLE_ARG_PARAMETER);
+        consumer_admin_->MyOperator (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       // Inter-filter group operator.
 
       CORBA::Boolean bval =
-        this->consumer_admin_->get_filter_admin ().match (event TAO_ENV_ARG_PARAMETER);
+        this->consumer_admin_->get_filter_admin ().match (event ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if ((bval == 1 && filter_operator == CosNotifyChannelAdmin::AND_OP) ||
           (bval == 0 && filter_operator == CosNotifyChannelAdmin::OR_OP))
         {
-          bval = this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER);
+          bval = this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
           return bval;
         }
@@ -127,14 +127,14 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::evaluate_filter (TAO_Notify_Event &event
     }
   else
     {
-      int status = this->filter_admin_.match (event TAO_ENV_ARG_PARAMETER);
+      int status = this->filter_admin_.match (event ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       return status;
     }
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event ACE_ENV_ARG_DECL)
 {
   if (this->is_connected_ == 0)
     {
@@ -156,7 +156,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::dispatch_event (TAO_Notify_Event &event
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
                               "dispatching event\n"));
-      this->dispatch_event_i (event TAO_ENV_ARG_PARAMETER);
+      this->dispatch_event_i (event ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -174,7 +174,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::filter_eval_task (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
@@ -183,7 +183,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotificati
   if (this->is_connected_ == 1)
     {
       this->event_manager_->subscribe_for_events (this,
-                                                  added, removed TAO_ENV_ARG_PARAMETER);
+                                                  added, removed ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -199,7 +199,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::subscription_change (const CosNotificati
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get hold of the admin properties.
   TAO_Notify_AdminProperties* const admin_properties =
@@ -213,7 +213,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW (CORBA::IMP_LIMIT ()); // we've reached the limit of consumers connected.
 
   // register with CA
-  this->consumer_admin_->register_listener (this TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->register_listener (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotification::EventTypeSeq added;
@@ -227,17 +227,17 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_connected (TAO_ENV_SINGLE_ARG_DECL)
   this->subscription_list_.populate (added);
 
   this->event_manager_->subscribe_for_events (this,
-                                              added, removed TAO_ENV_ARG_PARAMETER);
+                                              added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->event_manager_->register_for_publication_updates (this TAO_ENV_ARG_PARAMETER);
+  this->event_manager_->register_for_publication_updates (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   (*consumer_count)++;
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (ACE_ENV_SINGLE_ARG_DECL)
 {
   {
     ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
@@ -261,18 +261,18 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL
   this->subscription_list_.populate (removed);
 
   this->event_manager_->subscribe_for_events (this,
-                                              added, removed TAO_ENV_ARG_PARAMETER);
+                                              added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->event_manager_->unregister_from_publication_updates (this TAO_ENV_ARG_PARAMETER);
+  this->event_manager_->unregister_from_publication_updates (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // shutdown the tasks.
 
-  this->dispatching_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->dispatching_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->filter_eval_task_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->filter_eval_task_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get hold of the admin properties.
@@ -283,7 +283,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::on_disconnected (TAO_ENV_SINGLE_ARG_DECL
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ConnectionAlreadyInactive,
@@ -294,7 +294,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::suspend_connection (TAO_ENV_SINGLE_ARG_D
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ConnectionAlreadyActive,
@@ -312,7 +312,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (TAO_ENV_SINGLE_ARG_DE
 
     while (this->event_list_.dequeue_head (event) == 0)
       {
-        this->dispatch_event_i (*event TAO_ENV_ARG_PARAMETER);
+        this->dispatch_event_i (*event ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         delete event;
@@ -321,16 +321,16 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::resume_connection (TAO_ENV_SINGLE_ARG_DE
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::ConsumerAdmin_ptr
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::MyAdmin (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::MyAdmin (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->consumer_admin_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->consumer_admin_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -340,7 +340,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (TAO_ENV_SINGLE_ARG_DECL
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ TAO_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::MappingFilter_ptr /*priority_filter*/ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -349,7 +349,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::priority_filter (CosNotifyFilter::Mappin
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::MappingFilter_ptr
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -359,7 +359,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (TAO_ENV_SINGLE_ARG_DECL
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ TAO_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::MappingFilter_ptr /*lifetime_filter*/ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -368,7 +368,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::Mappin
 }
 
 template <class SERVANT_TYPE> CosNotification::EventTypeSeq*
-TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode TAO_ENV_ARG_DECL)
+TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAdmin::ObtainInfoMode mode ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -387,14 +387,14 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAd
       // if updates are currently off, switch them on.
       if (this->updates_on_ == 0)
         this->event_manager_->register_for_publication_updates (this
-                                                                TAO_ENV_ARG_PARAMETER);
+                                                                ACE_ENV_ARG_PARAMETER);
     }
   else
     {
       // if updates are currently on, switch them off.
       if (this->updates_on_ == 1)
         this->event_manager_->unregister_from_publication_updates (this
-                                                                   TAO_ENV_ARG_PARAMETER);
+                                                                   ACE_ENV_ARG_PARAMETER);
     }
   return event_type_seq;
 }
@@ -402,14 +402,14 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::obtain_offered_types (CosNotifyChannelAd
 template <class SERVANT_TYPE> void
 TAO_Notify_ProxySupplier<SERVANT_TYPE>::set_qos (
                            const CosNotification::QoSProperties & qos
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
     CORBA::SystemException,
     CosNotification::UnsupportedQoS
   ))
 {
   // Call our base class set_qos ().
-  TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (qos TAO_ENV_ARG_PARAMETER);
+  TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Then update our task's qos
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h
index de1cc1522de..4d172d15b13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h
@@ -47,13 +47,13 @@ public:
   virtual ~TAO_Notify_ProxySupplier (void);
   // Destructor
 
-  void init (CosNotifyChannelAdmin::ProxyID myID TAO_ENV_ARG_DECL);
+  void init (CosNotifyChannelAdmin::ProxyID myID ACE_ENV_ARG_DECL);
   // Init the Proxy.
 
   // = Notify_Event_Listener methods
-  virtual void dispatch_event (TAO_Notify_Event &event TAO_ENV_ARG_DECL);
+  virtual void dispatch_event (TAO_Notify_Event &event ACE_ENV_ARG_DECL);
 
-  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent TAO_ENV_ARG_DECL);
+  virtual CORBA::Boolean evaluate_filter (TAO_Notify_Event &event, CORBA::Boolean eval_parent ACE_ENV_ARG_DECL);
 
   virtual TAO_Notify_Worker_Task* event_dispatch_task (void);
   // The Worker task associated with the event listener for event dispatching
@@ -63,14 +63,14 @@ public:
 
   // = Interface methods
   virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr MyAdmin (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void suspend_connection (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -79,7 +79,7 @@ public:
   ));
 
   virtual void resume_connection (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -88,7 +88,7 @@ public:
   ));
 
   virtual CosNotifyFilter::MappingFilter_ptr priority_filter (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -96,14 +96,14 @@ public:
 
   virtual void priority_filter (
     CosNotifyFilter::MappingFilter_ptr priority_filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -111,7 +111,7 @@ public:
 
   virtual void lifetime_filter (
     CosNotifyFilter::MappingFilter_ptr lifetime_filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -119,7 +119,7 @@ public:
 
   virtual CosNotification::EventTypeSeq * obtain_offered_types (
     CosNotifyChannelAdmin::ObtainInfoMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -128,7 +128,7 @@ public:
   virtual void subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -139,7 +139,7 @@ public:
   // so we can update the qos on our tasks.
   virtual void set_qos (
     const CosNotification::QoSProperties & qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -148,13 +148,13 @@ public:
 
  protected:
   // = Helper methods
-  virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL) = 0;
+  virtual void dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL) = 0;
   // Derived classes should implement this.
 
-  void on_connected (TAO_ENV_SINGLE_ARG_DECL);
+  void on_connected (ACE_ENV_SINGLE_ARG_DECL);
   // Derived classes should call this when their consumers connect.
 
-  void on_disconnected (TAO_ENV_SINGLE_ARG_DECL);
+  void on_disconnected (ACE_ENV_SINGLE_ARG_DECL);
   // Derived classes should call this when their consumers disconnect.
 
   // = Data members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp
index 90f946d3ec4..690b25585e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp
@@ -50,19 +50,19 @@ TAO_Notify_Proxy<SERVANT_TYPE>::_decr_refcnt (void)
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy<SERVANT_TYPE>::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_Proxy<SERVANT_TYPE>::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
 {
   this->_incr_refcnt ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy<SERVANT_TYPE>::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_Proxy<SERVANT_TYPE>::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
 {
   this->_decr_refcnt ();
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy<SERVANT_TYPE>::dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list TAO_ENV_ARG_DECL)
+TAO_Notify_Proxy<SERVANT_TYPE>::dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list ACE_ENV_ARG_DECL)
 {
   CosNotification::EventTypeSeq added (added_list.size ());
   CosNotification::EventTypeSeq removed (removed_list.size ());
@@ -70,11 +70,11 @@ TAO_Notify_Proxy<SERVANT_TYPE>::dispatch_update (TAO_Notify_EventType_List& adde
   added_list.populate (added);
   removed_list.populate (removed);
 
-  this->dispatch_update_i (added, removed TAO_ENV_ARG_PARAMETER);
+  this->dispatch_update_i (added, removed ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotifyChannelAdmin::ProxyType
-TAO_Notify_Proxy<SERVANT_TYPE>::MyType (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_Proxy<SERVANT_TYPE>::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -83,7 +83,7 @@ TAO_Notify_Proxy<SERVANT_TYPE>::MyType (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_EN
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ TAO_ENV_ARG_DECL)
+TAO_Notify_Proxy<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSProperties & /*required_qos*/, CosNotification::NamedPropertyRangeSeq_out /*available_qos*/ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
@@ -93,25 +93,25 @@ TAO_Notify_Proxy<SERVANT_TYPE>::validate_event_qos (const CosNotification::QoSPr
 }
 
 template <class SERVANT_TYPE> CosNotification::QoSProperties*
-TAO_Notify_Proxy<SERVANT_TYPE>::get_qos (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy<SERVANT_TYPE>::get_qos (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->qos_admin_.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL)
+TAO_Notify_Proxy<SERVANT_TYPE>::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER);
+  this->qos_admin_.set_qos (qos ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->setup_qos_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->setup_qos_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -119,64 +119,64 @@ template <class SERVANT_TYPE> void
 TAO_Notify_Proxy<SERVANT_TYPE>::validate_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
     )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER);
+  this->qos_admin_.validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterID
-TAO_Notify_Proxy<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL)
+TAO_Notify_Proxy<SERVANT_TYPE>::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER);
+  return this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
 TAO_Notify_Proxy<SERVANT_TYPE>::remove_filter (
     CosNotifyFilter::FilterID filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
                    ))
 {
-  this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER);
+  this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::Filter_ptr
-TAO_Notify_Proxy<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL)
+TAO_Notify_Proxy<SERVANT_TYPE>::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
                    ))
 {
-  return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER);
+  return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> CosNotifyFilter::FilterIDSeq*
-TAO_Notify_Proxy<SERVANT_TYPE>::get_all_filters (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy<SERVANT_TYPE>::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> void
-TAO_Notify_Proxy<SERVANT_TYPE>::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Proxy<SERVANT_TYPE>::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class SERVANT_TYPE> const TAO_Notify_QoSAdmin_i&
@@ -187,9 +187,9 @@ TAO_Notify_Proxy<SERVANT_TYPE>::qos_admin (void) const
 
 template <class SERVANT_TYPE> void
 TAO_Notify_Proxy<SERVANT_TYPE>::setup_qos_policies (
-                                  TAO_ENV_SINGLE_ARG_DECL)
+                                  ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #endif /* TAO_NOTIFY_PROXY_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h
index cbfbb59f1c7..5660c3a0c83 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h
@@ -68,14 +68,14 @@ public:
   // Increment and decrement the reference count.
 
   // = The Servant methods
-  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL);
 
   // = Notify_Update_Listener methods
-  virtual void dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list TAO_ENV_ARG_DECL);
+  virtual void dispatch_update (TAO_Notify_EventType_List& added_list, TAO_Notify_EventType_List& removed_list ACE_ENV_ARG_DECL);
 
   virtual CosNotifyChannelAdmin::ProxyType MyType (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -84,7 +84,7 @@ public:
   virtual void validate_event_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -92,7 +92,7 @@ public:
   ));
 
  virtual CosNotification::QoSProperties * get_qos (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -100,7 +100,7 @@ public:
 
   virtual void set_qos (
     const CosNotification::QoSProperties & qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -110,7 +110,7 @@ public:
   virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -119,7 +119,7 @@ public:
 
   virtual CosNotifyFilter::FilterID add_filter (
     CosNotifyFilter::Filter_ptr new_filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -127,7 +127,7 @@ public:
 
   virtual void remove_filter (
     CosNotifyFilter::FilterID filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -136,7 +136,7 @@ public:
 
   virtual CosNotifyFilter::Filter_ptr get_filter (
     CosNotifyFilter::FilterID filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -144,14 +144,14 @@ public:
   ));
 
   virtual CosNotifyFilter::FilterIDSeq * get_all_filters (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
   virtual void remove_all_filters (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -160,10 +160,10 @@ public:
   const TAO_Notify_QoSAdmin_i& qos_admin (void) const;
 
 protected:
-  virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL) = 0;
+  virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL) = 0;
   // Derived types should implement this to deliver the update.
 
-  virtual void setup_qos_policies (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void setup_qos_policies (ACE_ENV_SINGLE_ARG_DECL);
   // Derived types may implement this if they need to do something
   // directly after setting the qos policies.
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp
index 40580ea329b..97287df8c1d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp
@@ -44,7 +44,7 @@ TAO_Notify_QoSAdmin_i::~TAO_Notify_QoSAdmin_i (void)
 }
 
 CosNotification::QoSProperties * TAO_Notify_QoSAdmin_i::get_qos (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
        CORBA::SystemException
@@ -142,7 +142,7 @@ CosNotification::QoSProperties * TAO_Notify_QoSAdmin_i::get_qos (
 
 void
 TAO_Notify_QoSAdmin_i::set_qos (const CosNotification::QoSProperties & qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -232,7 +232,7 @@ void
 TAO_Notify_QoSAdmin_i::validate_qos (
     const CosNotification::QoSProperties & /*required_qos*/,
     CosNotification::NamedPropertyRangeSeq_out /*available_qos*/
-    TAO_ENV_ARG_DECL_NOT_USED //TAO_ENV_SINGLE_ARG_PARAMETER
+    ACE_ENV_ARG_DECL_NOT_USED //ACE_ENV_SINGLE_ARG_PARAMETER
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h
index 049c0bdf25e..c53a847ca51 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h
@@ -44,7 +44,7 @@ public:
   // Destructor
 
   virtual CosNotification::QoSProperties * get_qos (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -52,7 +52,7 @@ public:
 
   virtual void set_qos (
     const CosNotification::QoSProperties & qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -62,7 +62,7 @@ public:
   virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp
index 3e30a801e72..d85cb9f24b3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp
@@ -20,7 +20,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::~TAO_Notify_SequenceProxyPushConsumer_i
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier TAO_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected
@@ -51,7 +51,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotif
                             CORBA::INTERNAL ());
         ACE_TRY_CHECK;
 
-        this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
@@ -66,12 +66,12 @@ TAO_Notify_SequenceProxyPushConsumer_i::connect_sequence_push_supplier (CosNotif
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->push_supplier_->subscription_change (added, removed
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
@@ -82,7 +82,7 @@ TAO_Notify_SequenceProxyPushConsumer_i::dispatch_update_i (CosNotification::Even
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotification::EventBatch & notifications TAO_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotification::EventBatch & notifications ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -102,24 +102,24 @@ TAO_Notify_SequenceProxyPushConsumer_i::push_structured_events (const CosNotific
     new TAO_Notify_StructuredEvents (notifications);
 
   // Send 'em out
-  this->event_manager_->process_event (notify_events, this TAO_ENV_ARG_PARAMETER);
+  this->event_manager_->process_event (notify_events, this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   notify_events->_decr_refcnt ();
 }
 
 void
-TAO_Notify_SequenceProxyPushConsumer_i::disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequenceProxyPushConsumer_i::disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // ask our parent to deaactivate us.
   this->supplier_admin_->
-    deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER);
+    deactivate_proxy_pushconsumer (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h
index c89f90c755f..8713adf8aa6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h
@@ -52,7 +52,7 @@ public:
   // = interface methods
   virtual void connect_sequence_push_supplier (
     CosNotifyComm::SequencePushSupplier_ptr push_supplier
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -61,7 +61,7 @@ public:
 
   virtual void push_structured_events (
     const CosNotification::EventBatch & notifications
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -69,7 +69,7 @@ public:
   ));
 
   virtual void disconnect_sequence_push_consumer (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -77,7 +77,7 @@ public:
 
 protected:
   // = Helper methods
- virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL);
+ virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL);
   // Sends updates to the supplier.
 
   // = Data members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp
index 453388240c1..68af758ef3a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp
@@ -28,7 +28,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::~TAO_Notify_SequenceProxyPushSupplier_i
 }
 
 void
-TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer TAO_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected,
@@ -60,7 +60,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotif
                             CORBA::INTERNAL ());
         ACE_CHECK;
 
-        this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
@@ -75,7 +75,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::connect_sequence_push_consumer (CosNotif
 
 void
 TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event& events
-                                                          TAO_ENV_ARG_DECL)
+                                                          ACE_ENV_ARG_DECL)
 {
   // If we are in this method then we are a SequenceProxyPushSupplier
   // connected up to a SequenceProxyPushConsumer and the only thing
@@ -102,7 +102,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event& even
                           this->qos_admin (),
                           this->event_cache_,
                           this->from_timeout_
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
         }
       else
         {
@@ -110,7 +110,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event& even
                           this->qos_admin (),
                           this->event_cache_,
                           this->from_timeout_
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
         }
       ACE_TRY_CHECK;
     }
@@ -123,11 +123,11 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event& even
 }
 
 void
-TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL)
+TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      this->push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER);
+      this->push_consumer_->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
@@ -138,22 +138,22 @@ TAO_Notify_SequenceProxyPushSupplier_i::dispatch_update_i (CosNotification::Even
 }
 
 void
-TAO_Notify_SequenceProxyPushSupplier_i::disconnect_sequence_push_supplier(TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequenceProxyPushSupplier_i::disconnect_sequence_push_supplier(ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ask our parent to deactivate us.
   this->consumer_admin_->
-    deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER);
+    deactivate_proxy_pushsupplier (this ACE_ENV_ARG_PARAMETER);
 }
 
 
 void
-TAO_Notify_SequenceProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequenceProxyPushSupplier_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Tell the consumer that we're going away ...
   // @@ Later, lookup a "notify_on_disconnect" option.
@@ -165,12 +165,12 @@ TAO_Notify_SequenceProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
       return;
   }
 
-  this->disconnect_sequence_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->disconnect_sequence_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TRY
     {
-      this->push_consumer_->disconnect_sequence_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->push_consumer_->disconnect_sequence_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
@@ -183,7 +183,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_Notify_SequenceProxyPushSupplier_i::setup_qos_policies (
-                                          TAO_ENV_SINGLE_ARG_DECL)
+                                          ACE_ENV_SINGLE_ARG_DECL)
 {
 # if defined (ACE_CONFIG_WIN32_H)
   ACE_Time_Value interval (
@@ -198,7 +198,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::setup_qos_policies (
       TAO_Notify_CO_Factory* cof =
         TAO_Notify_Factory::get_channel_objects_factory ();
 
-      this->batch_lock_ = cof->create_proxy_supplier_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->batch_lock_ = cof->create_proxy_supplier_lock (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Get back to the reactor to schedule the timer
@@ -243,7 +243,7 @@ TAO_Notify_SequenceProxyPushSupplier_i::handle_timeout (
           // the event cache will be flushed a split second before it
           // normally would.
           this->from_timeout_ = 1;
-          this->dispatch_event (dummy_events TAO_ENV_ARG_PARAMETER);
+          this->dispatch_event (dummy_events ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h
index 1e652f71358..9bf891c40c2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h
@@ -50,7 +50,7 @@ public:
 
   virtual void connect_sequence_push_consumer (
     CosNotifyComm::SequencePushConsumer_ptr push_consumer
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -60,24 +60,24 @@ public:
 
   // @@ Pradeep: more indentation problems....
   virtual void disconnect_sequence_push_supplier (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // Shutdown.
 
 protected:
-  virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL);
+  virtual void dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL);
   // Deliver the event to the consumer.
 
-  virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL);
+  virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL);
   // Deliver the update to the consumer.
 
-  void setup_qos_policies (TAO_ENV_SINGLE_ARG_DECL);
+  void setup_qos_policies (ACE_ENV_SINGLE_ARG_DECL);
   // Do what we need to do after the qos policies are set.
 
   virtual int handle_timeout (const ACE_Time_Value& current_time,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp
index 48619250ed9..d3ba6f93475 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp
@@ -24,16 +24,16 @@ TAO_Notify_Source_Filter_Eval_Command::~TAO_Notify_Source_Filter_Eval_Command ()
 }
 
 int
-TAO_Notify_Source_Filter_Eval_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Source_Filter_Eval_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Boolean result =
-    this->event_source_->evaluate_filter (*this->event_ TAO_ENV_ARG_PARAMETER);
+    this->event_source_->evaluate_filter (*this->event_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result == 1)
     {
       this->event_processor_->
-        lookup_subscriptions (this->event_, this->event_source_ TAO_ENV_ARG_PARAMETER);
+        lookup_subscriptions (this->event_, this->event_source_ ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h
index 50fd2182489..68e9032839c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h
@@ -48,7 +48,7 @@ public:
   ~TAO_Notify_Source_Filter_Eval_Command ();
   // Destructor.
 
-  virtual int execute (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
   // Command callback
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.cpp
index 9c078458fb4..f7a3864d8e3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.cpp
@@ -91,7 +91,7 @@ TAO_Notify_StructuredEvents::event_type (void) const
 
 CORBA::Boolean
 TAO_Notify_StructuredEvents::do_match (CosNotifyFilter::Filter_ptr filter
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
@@ -104,7 +104,7 @@ TAO_Notify_StructuredEvents::do_match (CosNotifyFilter::Filter_ptr filter
   for (CORBA::ULong i = 0; i < length; i++)
     {
       CORBA::Boolean matched = filter->match_structured (this->data_[i]
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (matched)
@@ -124,7 +124,7 @@ TAO_Notify_StructuredEvents::do_match (CosNotifyFilter::Filter_ptr filter
 
 void
 TAO_Notify_StructuredEvents::do_push (CosEventComm::PushConsumer_ptr consumer
-                                      TAO_ENV_ARG_DECL) const
+                                      ACE_ENV_ARG_DECL) const
 {
   CORBA::ULong sending_length  = (this->match_called_ ?
                                          this->matching_.length () :
@@ -134,14 +134,14 @@ TAO_Notify_StructuredEvents::do_push (CosEventComm::PushConsumer_ptr consumer
       CORBA::Any any;
       any <<= this->data_[(this->match_called_ ?
                                   this->matching_[i] : i)];
-      consumer->push (any TAO_ENV_ARG_PARAMETER);
+      consumer->push (any ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_Notify_StructuredEvents::do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer
-                                      TAO_ENV_ARG_DECL) const
+                                      ACE_ENV_ARG_DECL) const
 {
   CORBA::ULong sending_length  = (this->match_called_ ?
                                          this->matching_.length () :
@@ -150,7 +150,7 @@ TAO_Notify_StructuredEvents::do_push (CosNotifyComm::StructuredPushConsumer_ptr
     {
       consumer->push_structured_event (this->data_[(this->match_called_ ?
                                           this->matching_[i] : i)]
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -161,7 +161,7 @@ TAO_Notify_StructuredEvents::do_push (
                             const TAO_Notify_QoSAdmin_i& qos_admin,
                             CosNotification::EventBatch& unsent,
                             int flush_queue
-                            TAO_ENV_ARG_DECL) const
+                            ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
@@ -190,7 +190,7 @@ TAO_Notify_StructuredEvents::do_push (
         {
           matched[i] = unsent[i];
         }
-      consumer->push_structured_events (matched TAO_ENV_ARG_PARAMETER);
+      consumer->push_structured_events (matched ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Shift the rest of the unsent messages to the front.
@@ -229,7 +229,7 @@ TAO_Notify_StructuredEvents::do_push (
                                           this->matching_[index] : index)];
                 start++;
               }
-            consumer->push_structured_events (matched TAO_ENV_ARG_PARAMETER);
+            consumer->push_structured_events (matched ACE_ENV_ARG_PARAMETER);
             ACE_CHECK;
 
             unsent.length (0);
@@ -245,7 +245,7 @@ TAO_Notify_StructuredEvents::do_push (
                                               this->matching_[start] : start)];
                     start++;
                   }
-                consumer->push_structured_events (matched TAO_ENV_ARG_PARAMETER);
+                consumer->push_structured_events (matched ACE_ENV_ARG_PARAMETER);
                 ACE_CHECK;
               }
           }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.h
index 0fbb4bbe639..a41afe4b417 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredEvents.h
@@ -45,14 +45,14 @@ public:
 
   virtual CORBA::Boolean is_special_event_type (void) const;
   virtual const TAO_Notify_EventType& event_type (void) const;
-  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter TAO_ENV_ARG_DECL);
-  virtual void do_push (CosEventComm::PushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
-  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer TAO_ENV_ARG_DECL) const;
+  virtual CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL);
+  virtual void do_push (CosEventComm::PushConsumer_ptr consumer ACE_ENV_ARG_DECL) const;
+  virtual void do_push (CosNotifyComm::StructuredPushConsumer_ptr consumer ACE_ENV_ARG_DECL) const;
   virtual void do_push (CosNotifyComm::SequencePushConsumer_ptr consumer,
                         const TAO_Notify_QoSAdmin_i& qos_admin,
                         CosNotification::EventBatch& unsent,
                         int flush_queue
-                        TAO_ENV_ARG_DECL) const;
+                        ACE_ENV_ARG_DECL) const;
 
 protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp
index c5a6f80b12f..277be4d1b89 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp
@@ -19,7 +19,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::~TAO_Notify_StructuredProxyPushConsume
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier TAO_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected
@@ -46,7 +46,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosN
                             CORBA::INTERNAL ());
         ACE_TRY_CHECK;
 
-        this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
@@ -61,12 +61,12 @@ TAO_Notify_StructuredProxyPushConsumer_i::connect_structured_push_supplier (CosN
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->push_supplier_->subscription_change (added, removed
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
@@ -77,7 +77,7 @@ TAO_Notify_StructuredProxyPushConsumer_i::dispatch_update_i (CosNotification::Ev
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotification::StructuredEvent & notification TAO_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotification::StructuredEvent & notification ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventComm::Disconnected
@@ -100,24 +100,24 @@ TAO_Notify_StructuredProxyPushConsumer_i::push_structured_event (const CosNotifi
   TAO_Notify_StructuredEvent* notify_event =
     new TAO_Notify_StructuredEvent (notification_copy);
 
-  this->event_manager_->process_event (notify_event, this TAO_ENV_ARG_PARAMETER);
+  this->event_manager_->process_event (notify_event, this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   notify_event->_decr_refcnt ();
 }
 
 void
-TAO_Notify_StructuredProxyPushConsumer_i::disconnect_structured_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer_i::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // ask our parent to deactivate us.
   this->supplier_admin_->
-    deactivate_proxy_pushconsumer (this TAO_ENV_ARG_PARAMETER);
+    deactivate_proxy_pushconsumer (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h
index 6f166c499e8..e83adff731d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h
@@ -58,7 +58,7 @@ public:
   // = interface methods
   virtual void connect_structured_push_supplier (
     CosNotifyComm::StructuredPushSupplier_ptr push_supplier
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -67,7 +67,7 @@ public:
 
 virtual void push_structured_event (
     const CosNotification::StructuredEvent & notification
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -75,7 +75,7 @@ virtual void push_structured_event (
   ));
 
   virtual void disconnect_structured_push_consumer (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -83,7 +83,7 @@ virtual void push_structured_event (
 
 protected:
   // = Helper methods
- virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL);
+ virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL);
   // dispatch updates to the supplier.
 
   // = Data members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp
index ab811b694d9..00770c13a3a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp
@@ -18,7 +18,7 @@ TAO_Notify_StructuredProxyPushSupplier_i::~TAO_Notify_StructuredProxyPushSupplie
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer TAO_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosEventChannelAdmin::AlreadyConnected,
@@ -53,7 +53,7 @@ TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosN
                             CORBA::INTERNAL ());
         ACE_CHECK;
 
-        this->on_connected (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->on_connected (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
@@ -70,28 +70,28 @@ TAO_Notify_StructuredProxyPushSupplier_i::connect_structured_push_consumer (CosN
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier_i::dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      event.do_push (this->push_consumer_.in () TAO_ENV_ARG_PARAMETER);
+      event.do_push (this->push_consumer_.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
     {
       ACE_DEBUG ((LM_DEBUG, "Exception dispatching structured event\n"));
       // misbehaving client,
-      this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);  // FUZZ: ignore check_for_ace_check
+      this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);  // FUZZ: ignore check_for_ace_check
     }
   ACE_ENDTRY;
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      this->push_consumer_->offer_change (added, removed TAO_ENV_ARG_PARAMETER);
+      this->push_consumer_->offer_change (added, removed ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -104,31 +104,31 @@ TAO_Notify_StructuredProxyPushSupplier_i::dispatch_update_i (CosNotification::Ev
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier_i::shutdown_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier_i::shutdown_i (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->on_disconnected (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->on_disconnected (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ask our parent to deactivate us.
   this->consumer_admin_->
-    deactivate_proxy_pushsupplier (this TAO_ENV_ARG_PARAMETER);
+    deactivate_proxy_pushsupplier (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier_i::disconnect_structured_push_supplier(TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier_i::disconnect_structured_push_supplier(ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
   // unregister with CA
-  this->consumer_admin_->unregister_listener (this TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->unregister_listener (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_StructuredProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Tell the consumer that we're going away ...
   // @@ Later, lookup a "notify_on_disconnect" option.
@@ -140,12 +140,12 @@ TAO_Notify_StructuredProxyPushSupplier_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
       return;
   }
 
-  this->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TRY
     {
-      this->push_consumer_->disconnect_structured_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->push_consumer_->disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHALL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h
index 0e578846a02..b73ebe944dc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h
@@ -54,7 +54,7 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_No
 
   virtual void connect_structured_push_consumer (
     CosNotifyComm::StructuredPushConsumer_ptr push_consumer
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -63,24 +63,24 @@ class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier_i : public TAO_No
   ));
 
   virtual void disconnect_structured_push_supplier (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // Shutdown.
 
  protected:
   // = Helper methods
-  void shutdown_i (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown_i (ACE_ENV_SINGLE_ARG_DECL);
   // Shutdown
 
-  virtual void dispatch_event_i (TAO_Notify_Event &event TAO_ENV_ARG_DECL);
+  virtual void dispatch_event_i (TAO_Notify_Event &event ACE_ENV_ARG_DECL);
   // Deliver the event to the consumer.
 
-  virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed TAO_ENV_ARG_DECL);
+  virtual void dispatch_update_i (CosNotification::EventTypeSeq added, CosNotification::EventTypeSeq removed ACE_ENV_ARG_DECL);
   // Deliver the update to the consumer.
 
   // = Data Members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
index d3a54d94d95..4e30fc27bc0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
@@ -50,7 +50,7 @@ void
 TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id,
                                   CosNotifyChannelAdmin::InterFilterGroupOperator filter_operator,
                                   PortableServer::POA_ptr my_POA
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   this->my_POA_ = PortableServer::POA::_duplicate (my_POA);
 
@@ -60,12 +60,12 @@ TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id,
   this->poa_factory_ = TAO_Notify_Factory::get_poa_factory ();
 
   this->lock_ = this->channel_objects_factory_->
-    create_supplier_admin_lock (TAO_ENV_SINGLE_ARG_PARAMETER);
+    create_supplier_admin_lock (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_pushconsumer_POA_ = this->poa_factory_->
     create_proxy_pushconsumer_POA (this->my_POA_.in (), my_id
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   my_id_ = my_id;
@@ -73,14 +73,14 @@ TAO_Notify_SupplierAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id,
 }
 
 CosNotifyChannelAdmin::SupplierAdmin_ptr
-TAO_Notify_SupplierAdmin_i::get_ref (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::get_ref (ACE_ENV_SINGLE_ARG_DECL)
 {
   // @@ Pradeep: if you get a chance to quantify this stuff you will
   // notice that this is a very expensive operation, you may want to
   // cache the result if it is invoked very often...
 
   CORBA::Object_var obj = this->poa_factory_->
-    servant_to_reference (this->my_POA_.in (), this TAO_ENV_ARG_PARAMETER);
+    servant_to_reference (this->my_POA_.in (), this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::SupplierAdmin::_nil ());
 
   return CosNotifyChannelAdmin::SupplierAdmin::_narrow (obj.in ());
@@ -102,15 +102,15 @@ TAO_Notify_SupplierAdmin_i::get_filter_admin (void)
 }
 
 void
-TAO_Notify_SupplierAdmin_i::deactivate_proxy_pushconsumer (PortableServer::Servant servant TAO_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::deactivate_proxy_pushconsumer (PortableServer::Servant servant ACE_ENV_ARG_DECL)
 {
   this->poa_factory_->
     deactivate_object (servant, this->proxy_pushconsumer_POA_.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::AdminID
-TAO_Notify_SupplierAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_SupplierAdmin_i::MyID (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -119,16 +119,16 @@ TAO_Notify_SupplierAdmin_i::MyID (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SING
 }
 
 CosNotifyChannelAdmin::EventChannel_ptr
-TAO_Notify_SupplierAdmin_i::MyChannel (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::MyChannel (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return event_channel_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return event_channel_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::InterFilterGroupOperator
-TAO_Notify_SupplierAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+TAO_Notify_SupplierAdmin_i::MyOperator (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -137,7 +137,7 @@ TAO_Notify_SupplierAdmin_i::MyOperator (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_EN
 }
 
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_SupplierAdmin_i::push_consumers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::push_consumers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -146,11 +146,11 @@ TAO_Notify_SupplierAdmin_i::push_consumers (TAO_ENV_SINGLE_ARG_DECL)
                       CORBA::INTERNAL ());
   ACE_CHECK_RETURN (0);
 
-  return this->proxy_pushconsumer_ids_.get_sequence (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->proxy_pushconsumer_ids_.get_sequence (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
-TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::ProxyNotFound
@@ -159,74 +159,74 @@ TAO_Notify_SupplierAdmin_i::get_proxy_consumer (CosNotifyChannelAdmin::ProxyID p
   CORBA::Object_var obj =
     this->poa_factory_->id_to_reference (proxy_id,
                                          proxy_pushconsumer_POA_.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ());
 
   return CosNotifyChannelAdmin::ProxyConsumer::_narrow (obj.in ());
 }
 
 CORBA::Object_ptr
-TAO_Notify_SupplierAdmin_i::obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
 {
   TAO_Notify_SequenceProxyPushConsumer_i* seq_proxy_pushconsumer =
     this->channel_objects_factory_->create_seq_proxy_pushconsumer (this
-                                                                   TAO_ENV_ARG_PARAMETER);
+                                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var proxy_pushconsumer_var (seq_proxy_pushconsumer);
 
-  seq_proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER);
+  seq_proxy_pushconsumer->init (proxy_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return this->poa_factory_->
     activate_object_with_id (proxy_id,
                              this->proxy_pushconsumer_POA_.in (),
                              seq_proxy_pushconsumer
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_SupplierAdmin_i::obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
 {
   TAO_Notify_StructuredProxyPushConsumer_i* struct_proxy_pushconsumer =
     this->channel_objects_factory_->create_struct_proxy_pushconsumer (this
-                                                                      TAO_ENV_ARG_PARAMETER);
+                                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var proxy_pushconsumer_var (struct_proxy_pushconsumer);
 
-  struct_proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER);
+  struct_proxy_pushconsumer->init (proxy_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return this->poa_factory_->
     activate_object_with_id (proxy_id,
                              this->proxy_pushconsumer_POA_.in (),
                              struct_proxy_pushconsumer
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_Notify_SupplierAdmin_i::obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL)
 {
   TAO_Notify_ProxyPushConsumer_i* proxy_pushconsumer =
     this->channel_objects_factory_->create_proxy_pushconsumer (this
-                                                               TAO_ENV_ARG_PARAMETER);
+                                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ServantBase_var proxy_pushconsumer_var (proxy_pushconsumer);
 
-  proxy_pushconsumer->init (proxy_id TAO_ENV_ARG_PARAMETER);
+  proxy_pushconsumer->init (proxy_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return this->poa_factory_->
     activate_object_with_id (proxy_id,
                              this->proxy_pushconsumer_POA_.in (),
                              proxy_pushconsumer
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
-TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id TAO_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelAdmin::ClientType ctype, CosNotifyChannelAdmin::ProxyID_out proxy_id ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::AdminLimitExceeded
@@ -246,7 +246,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA
     {
     case CosNotifyChannelAdmin::ANY_EVENT:
       {
-        obj = this->obtain_proxy_pushconsumer_i (proxy_id TAO_ENV_ARG_PARAMETER);
+        obj = this->obtain_proxy_pushconsumer_i (proxy_id ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ());
       }
       break;
@@ -254,7 +254,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA
     case CosNotifyChannelAdmin::STRUCTURED_EVENT:
       {
         obj = this->obtain_struct_proxy_pushconsumer_i (proxy_id
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ());
       }
       break;
@@ -262,7 +262,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA
     case CosNotifyChannelAdmin::SEQUENCE_EVENT:
       {
         obj = this->obtain_sequence_proxy_pushconsumer_i (proxy_id
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (CosNotifyChannelAdmin::ProxyConsumer::_nil ());
       }
       break;
@@ -274,113 +274,113 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_push_consumer (CosNotifyChannelA
 
   this->proxy_pushconsumer_ids_.next (); // commit the current id.
   return CosNotifyChannelAdmin::ProxyConsumer::_narrow (obj.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SupplierAdmin_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->destory_child_POAs_ = 1;
   if (this->destory_child_POAs_ == 1)
     this->poa_factory_->destroy_POA (this->proxy_pushconsumer_POA_.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // deactivate ourselves
   this->poa_factory_->deactivate_object (this, this->my_POA_.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotification::QoSProperties*
-TAO_Notify_SupplierAdmin_i::get_qos (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::get_qos (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->qos_admin_.get_qos (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->qos_admin_.get_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SupplierAdmin_i::set_qos (const CosNotification::QoSProperties & qos TAO_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::set_qos (const CosNotification::QoSProperties & qos ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.set_qos (qos TAO_ENV_ARG_PARAMETER);
+  this->qos_admin_.set_qos (qos ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SupplierAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos TAO_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::validate_qos (const CosNotification::QoSProperties & required_qos, CosNotification::NamedPropertyRangeSeq_out available_qos ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotification::UnsupportedQoS
                    ))
 {
-  this->qos_admin_.validate_qos (required_qos, available_qos TAO_ENV_ARG_PARAMETER);
+  this->qos_admin_.validate_qos (required_qos, available_qos ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SupplierAdmin_i::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed TAO_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::offer_change (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyComm::InvalidEventType
                    ))
 {
   this->get_event_manager ()->update_publication_list (added,
-                                                       removed TAO_ENV_ARG_PARAMETER);
+                                                       removed ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterID
-TAO_Notify_SupplierAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter TAO_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::add_filter (CosNotifyFilter::Filter_ptr new_filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.add_filter (new_filter TAO_ENV_ARG_PARAMETER);
+  return this->filter_admin_.add_filter (new_filter ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SupplierAdmin_i::remove_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::remove_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
                    ))
 {
-  this->filter_admin_.remove_filter (filter TAO_ENV_ARG_PARAMETER);
+  this->filter_admin_.remove_filter (filter ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::Filter_ptr
-TAO_Notify_SupplierAdmin_i::get_filter (CosNotifyFilter::FilterID filter TAO_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::get_filter (CosNotifyFilter::FilterID filter ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyFilter::FilterNotFound
                    ))
 {
-  return this->filter_admin_.get_filter (filter TAO_ENV_ARG_PARAMETER);
+  return this->filter_admin_.get_filter (filter ACE_ENV_ARG_PARAMETER);
 }
 
 CosNotifyFilter::FilterIDSeq*
-TAO_Notify_SupplierAdmin_i::get_all_filters (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::get_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  return this->filter_admin_.get_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->filter_admin_.get_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_SupplierAdmin_i::remove_all_filters (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::remove_all_filters (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
 {
-  this->filter_admin_.remove_all_filters (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->filter_admin_.remove_all_filters (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_Notify_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -393,14 +393,14 @@ TAO_Notify_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
 
   PortableServer::ServantBase_var proxy_var (cosec_proxy);
 
-  cosec_proxy->init (TAO_ENV_SINGLE_ARG_PARAMETER);
+  cosec_proxy->init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushConsumer::_nil ());
 
   PortableServer::POA_var def_poa =
     this->event_channel_->get_default_POA ();
 
   CORBA::Object_var obj = this->poa_factory_->
-    activate_object (def_poa.in (), cosec_proxy TAO_ENV_ARG_PARAMETER);
+    activate_object (def_poa.in (), cosec_proxy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosEventChannelAdmin::ProxyPushConsumer::_nil ());
 
   return CosEventChannelAdmin::ProxyPushConsumer::_narrow (obj.in ());
@@ -408,7 +408,7 @@ TAO_Notify_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
 
 // = Pull Methods.
 CosNotifyChannelAdmin::ProxyIDSeq*
-TAO_Notify_SupplierAdmin_i::pull_consumers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::pull_consumers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -421,7 +421,7 @@ TAO_Notify_SupplierAdmin_i::pull_consumers (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::ProxyConsumer_ptr
-TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ TAO_ENV_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelAdmin::ClientType /*ctype*/, CosNotifyChannelAdmin::ProxyID_out /*proxy_id*/ ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
                    CosNotifyChannelAdmin::AdminLimitExceeded
@@ -432,7 +432,7 @@ TAO_Notify_SupplierAdmin_i::obtain_notification_pull_consumer (CosNotifyChannelA
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_Notify_SupplierAdmin_i::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SupplierAdmin_i::obtain_pull_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h
index 0bf4940fbb9..3915e4cf514 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h
@@ -64,7 +64,7 @@ public:
   void init (CosNotifyChannelAdmin::AdminID myID,
              CosNotifyChannelAdmin::InterFilterGroupOperator myOperator,
              PortableServer::POA_ptr my_POA
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   //Initialize the Supplier Admin.
 
   // @@ Pradeep: could this method be const?  Try to use const
@@ -73,7 +73,7 @@ public:
   // Get our filter admin.
 
   void deactivate_proxy_pushconsumer (PortableServer::Servant servant
-                                      TAO_ENV_ARG_DECL);
+                                      ACE_ENV_ARG_DECL);
   // Deactivate servant from <proxy_pushconsumer_POA_>.
 
   void proxy_pushconsumer_destroyed (CosNotifyChannelAdmin::ProxyID proxyID);
@@ -81,13 +81,13 @@ public:
 
   // = Interface methods
   virtual CosNotifyChannelAdmin::AdminID MyID (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
-  CosNotifyChannelAdmin::SupplierAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL);
+  CosNotifyChannelAdmin::SupplierAdmin_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL);
   // Return the CORBA object for this servant.
 
   TAO_Notify_Event_Manager* get_event_manager (void);
@@ -96,28 +96,28 @@ public:
   // @@ Pradeep: Don't forget to indent this stuff, at the very least
   // it should not start in the first column!
   virtual CosNotifyChannelAdmin::EventChannel_ptr MyChannel (
-      TAO_ENV_SINGLE_ARG_DECL
+      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
 virtual CosNotifyChannelAdmin::InterFilterGroupOperator MyOperator (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ProxyIDSeq * pull_consumers (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotifyChannelAdmin::ProxyIDSeq * push_consumers (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -125,7 +125,7 @@ virtual CosNotifyChannelAdmin::ProxyIDSeq * push_consumers (
 
 virtual CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer (
     CosNotifyChannelAdmin::ProxyID proxy_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -135,7 +135,7 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr get_proxy_consumer (
 virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_pull_consumer (
     CosNotifyChannelAdmin::ClientType ctype,
     CosNotifyChannelAdmin::ProxyID_out proxy_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -145,7 +145,7 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_pull_consum
 virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_push_consumer (
     CosNotifyChannelAdmin::ClientType ctype,
     CosNotifyChannelAdmin::ProxyID_out proxy_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -153,14 +153,14 @@ virtual CosNotifyChannelAdmin::ProxyConsumer_ptr obtain_notification_push_consum
   ));
 
 virtual void destroy (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosNotification::QoSProperties * get_qos (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -168,7 +168,7 @@ virtual CosNotification::QoSProperties * get_qos (
 
 virtual void set_qos (
     const CosNotification::QoSProperties & qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -178,7 +178,7 @@ virtual void set_qos (
 virtual void validate_qos (
     const CosNotification::QoSProperties & required_qos,
     CosNotification::NamedPropertyRangeSeq_out available_qos
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -188,7 +188,7 @@ virtual void validate_qos (
 virtual void offer_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -197,7 +197,7 @@ virtual void offer_change (
 
 virtual CosNotifyFilter::FilterID add_filter (
     CosNotifyFilter::Filter_ptr new_filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -205,7 +205,7 @@ virtual CosNotifyFilter::FilterID add_filter (
 
 virtual void remove_filter (
     CosNotifyFilter::FilterID filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -214,7 +214,7 @@ virtual void remove_filter (
 
 virtual CosNotifyFilter::Filter_ptr get_filter (
     CosNotifyFilter::FilterID filter
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -222,28 +222,28 @@ virtual CosNotifyFilter::Filter_ptr get_filter (
   ));
 
 virtual CosNotifyFilter::FilterIDSeq * get_all_filters (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual void remove_all_filters (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ));
 
 virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -251,13 +251,13 @@ virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer (
 
 protected:
   // = Helper methods
-  CORBA::Object_ptr obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL);
+  CORBA::Object_ptr obtain_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL);
   // Obtain a proxy pushconsumer object
 
-  CORBA::Object_ptr obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL);
+  CORBA::Object_ptr obtain_struct_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL);
   // Obtain a structured proxy pushconsumer object.
 
-  CORBA::Object_ptr obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id TAO_ENV_ARG_DECL);
+  CORBA::Object_ptr obtain_sequence_proxy_pushconsumer_i (CosNotifyChannelAdmin::ProxyID proxy_id ACE_ENV_ARG_DECL);
   // Obtain a sequence pushconsumer object
 
   // = Data members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp
index bd6586314b6..9df8ecd1499 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp
@@ -22,10 +22,10 @@ TAO_Notify_Update_Dispatch_Command::~TAO_Notify_Update_Dispatch_Command ()
 }
 
 int
-TAO_Notify_Update_Dispatch_Command::execute (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_Update_Dispatch_Command::execute (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->update_listener_->dispatch_update (this->added_, this->removed_
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h
index e32a2c9ae3d..a02113c6653 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h
@@ -46,7 +46,7 @@ class TAO_Notify_Export TAO_Notify_Update_Dispatch_Command : public TAO_Notify_C
 
   ~TAO_Notify_Update_Dispatch_Command ();
 
-  virtual int execute (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
   // Command callback
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp
index 840e27367cc..4c23104c958 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp
@@ -23,14 +23,14 @@ TAO_Notify_Worker_Task::init_task (TAO_Notify_AdminProperties* const,
 }
 
 void
-TAO_Notify_Worker_Task::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_Worker_Task::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
 int
-TAO_Notify_Worker_Task::process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value * /*tv*/)
+TAO_Notify_Worker_Task::process_event (TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value * /*tv*/)
 {
-  int result = mb->execute (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int result = mb->execute (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_Message_Block::release (mb);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h
index 9b1ff867f97..be7ed7c5378 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h
@@ -54,10 +54,10 @@ public:
                          TAO_Notify_QoSAdmin_i* const qos_properties);
   // Init the task
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // shutdown this task.
 
-  virtual int process_event (TAO_Notify_Command *mb TAO_ENV_ARG_DECL, ACE_Time_Value *tv = 0);
+  virtual int process_event (TAO_Notify_Command *mb ACE_ENV_ARG_DECL, ACE_Time_Value *tv = 0);
   // Process the command.
 
   virtual void update_admin (TAO_Notify_AdminProperties& admin);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp
index da75658fe8a..ff9e0e0d862 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp
@@ -22,7 +22,7 @@ PortableServer::ObjectId *
 TAO_POA_Hooks::create_id_for_reference (
     TAO_POA &the_poa,
     CORBA::Object_ptr the_ref
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableServer::NotAGroupObject
@@ -36,18 +36,18 @@ TAO_POA_Hooks::create_id_for_reference (
   // Create a temporary object reference and then get the
   // ObjectId out of it.
   CORBA::Object_var obj_ref = the_poa.create_reference (repository_id
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   PortableServer::ObjectId_var obj_id = the_poa.reference_to_id (obj_ref.in ()
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Associate the object reference with the group reference.
   this->associate_group_with_ref (the_poa,
                                   the_ref,
                                   obj_ref.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return obj_id._retn ();
@@ -114,7 +114,7 @@ int
 TAO_POA_Hooks::create_group_acceptors (CORBA::Object_ptr the_ref,
                                        TAO_PortableGroup_Acceptor_Registry &acceptor_registry,
                                        TAO_ORB_Core &orb_core
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   const TAO_MProfile& profiles = the_ref->_stubobj ()->base_profiles ();
   const TAO_Profile* profile;
@@ -130,7 +130,7 @@ TAO_POA_Hooks::create_group_acceptors (CORBA::Object_ptr the_ref,
         {
           acceptor_registry.open (profile,
                                   orb_core
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
           ++num;
         }
@@ -147,7 +147,7 @@ PortableServer::IDs *
 TAO_POA_Hooks::reference_to_ids (
   TAO_POA &/*the_poa*/,
   CORBA::Object_ptr /*the_ref*/
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableServer::NotAGroupObject
@@ -162,7 +162,7 @@ TAO_POA_Hooks::associate_group_with_ref (
       TAO_POA &the_poa,
       CORBA::Object_ptr group_ref,
       CORBA::Object_ptr obj_ref
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::NotAGroupObject))
 {
@@ -191,7 +191,7 @@ TAO_POA_Hooks::associate_group_with_ref (
   this->create_group_acceptors (group_ref,
                                 this->request_dispatcher_.acceptor_registry_,
                                 the_poa.orb_core ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 
@@ -201,7 +201,7 @@ TAO_POA_Hooks::associate_group_with_ref (
   this->request_dispatcher_.group_map_.add_groupid_objectkey_pair (
                                    group_id._retn (),
                                    key
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
@@ -211,7 +211,7 @@ TAO_POA_Hooks::associate_reference_with_id (
       TAO_POA &the_poa,
       CORBA::Object_ptr ref,
       const PortableServer::ObjectId & oid
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableServer::NotAGroupObject
@@ -222,14 +222,14 @@ TAO_POA_Hooks::associate_reference_with_id (
   // it is much easier to extract the object key from the
   // reference.
   CORBA::Object_var obj_ref = the_poa.id_to_reference (oid
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Associate the object reference with the group reference.
   this->associate_group_with_ref (the_poa,
                                   ref,
                                   obj_ref.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -238,7 +238,7 @@ TAO_POA_Hooks::disassociate_reference_with_id (
       TAO_POA &/*the_poa*/,
       CORBA::Object_ptr /*ref*/,
       const PortableServer::ObjectId & /*oid*/
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableServer::NotAGroupObject
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h
index 46a1e55f737..bfcdcdfdb2e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h
@@ -49,7 +49,7 @@ public:
   virtual PortableServer::ObjectId * create_id_for_reference (
       TAO_POA &the_poa,
       CORBA::Object_ptr the_ref
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -59,7 +59,7 @@ public:
   virtual PortableServer::IDs * reference_to_ids (
       TAO_POA &the_poa,
       CORBA::Object_ptr the_ref
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -70,7 +70,7 @@ public:
       TAO_POA &the_poa,
       CORBA::Object_ptr ref,
       const PortableServer::ObjectId & oid
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -81,7 +81,7 @@ public:
       TAO_POA &the_poa,
       CORBA::Object_ptr ref,
       const PortableServer::ObjectId & oid
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -99,7 +99,7 @@ protected:
   int create_group_acceptors (CORBA::Object_ptr the_ref,
                               TAO_PortableGroup_Acceptor_Registry &acceptor_registry,
                               TAO_ORB_Core &orb_core
-                              TAO_ENV_ARG_DECL);
+                              ACE_ENV_ARG_DECL);
 
   /// Helper function to associate group references with
   /// object references.
@@ -107,7 +107,7 @@ protected:
         TAO_POA &the_poa,
         CORBA::Object_ptr group_ref,
         CORBA::Object_ptr obj_ref
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableServer::NotAGroupObject));
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
index ff6909d98a8..b0c22ac01b0 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -35,7 +35,7 @@ TAO_PortableGroup_Acceptor_Registry::~TAO_PortableGroup_Acceptor_Registry (void)
 void
 TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile,
                                            TAO_ORB_Core &orb_core
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
 {
   Entry *entry;
 
@@ -66,7 +66,7 @@ TAO_PortableGroup_Acceptor_Registry::open (const TAO_Profile* profile,
               this->open_i (profile,
                             orb_core,
                             factory
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
 
               // found = 1;  // A usable protocol was found.
@@ -83,7 +83,7 @@ void
 TAO_PortableGroup_Acceptor_Registry::open_i (const TAO_Profile* profile,
                                              TAO_ORB_Core &orb_core,
                                              TAO_ProtocolFactorySetItor &factory
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
 {
   TAO_Acceptor *acceptor = (*factory)->factory ()->make_acceptor ();
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
index ff1e71bfc11..7c2ca835ed8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
@@ -67,7 +67,7 @@ public:
   /// Open an acceptor based on a tagged profile.
   void open (const TAO_Profile* profile,
              TAO_ORB_Core &orb_core
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
   /// Close all open acceptors.
   int close_all (void);
@@ -81,7 +81,7 @@ protected:
   void open_i (const TAO_Profile* profile,
                TAO_ORB_Core &orb_core,
                TAO_ProtocolFactorySetItor &factory
-               TAO_ENV_ARG_DECL);
+               ACE_ENV_ARG_DECL);
 
   /// Find an acceptor by using a profile.
   int find (const TAO_Profile* profile,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index ff890a90c4e..d64270a8a82 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -37,7 +37,7 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
       orb_initializer = temp_orb_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index f17c6673349..a3cadc7b45d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -26,13 +26,13 @@ TAO_PortableGroup_ORBInitializer::TAO_PortableGroup_ORBInitializer ()
 void
 TAO_PortableGroup_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // orb_core() TAO extension.
   TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (tao_info.in ()))
@@ -76,7 +76,7 @@ TAO_PortableGroup_ORBInitializer::pre_init (
 void
 TAO_PortableGroup_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
index d87e8c01871..0ee3a735d33 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h
@@ -45,11 +45,11 @@ public:
   TAO_PortableGroup_ORBInitializer ();
 
   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/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
index 9902278a780..df24bdce259 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
@@ -18,7 +18,7 @@ void
 PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
                                             TAO_ServerRequest &request,
                                             CORBA::Object_out forward_to
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check if the request contains a tagged profile
@@ -39,7 +39,7 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
                                      orb_core,
                                      request,
                                      forward_to
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           return;
@@ -52,6 +52,6 @@ PortableGroup_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
   orb_core->adapter_registry ()->dispatch (request.object_key (),
                                            request,
                                            forward_to
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
index 6bcc6a1a8c3..a80cba11a8c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
@@ -47,7 +47,7 @@ public:
   virtual void dispatch (TAO_ORB_Core *orb_core,
                          TAO_ServerRequest &request,
                          CORBA::Object_out forward_to
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index 675b3986154..77d982f4c97 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -44,7 +44,7 @@ TAO_Portable_Group_Map::~TAO_Portable_Group_Map (void)
 void
 TAO_Portable_Group_Map::add_groupid_objectkey_pair (PortableGroup::TagGroupTaggedComponent *group_id,
                                                     const TAO_ObjectKey &key
-                                                    TAO_ENV_ARG_DECL)
+                                                    ACE_ENV_ARG_DECL)
 {
   Map_Entry *new_entry;
 
@@ -96,7 +96,7 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair (PortableGroup::TagGroupTagge
 void
 TAO_Portable_Group_Map::remove_groupid_objectkey_pair (const PortableGroup::TagGroupTaggedComponent* /*group_id*/,
                                                        const TAO_ObjectKey &/*key*/
-                                                       TAO_ENV_ARG_DECL_NOT_USED)
+                                                       ACE_ENV_ARG_DECL_NOT_USED)
 {
 
 }
@@ -107,7 +107,7 @@ TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_
                                   TAO_ORB_Core *orb_core,
                                   TAO_ServerRequest &request,
                                   CORBA::Object_out forward_to
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   // Look up the GroupId.
   Map_Entry *entry;
@@ -129,7 +129,7 @@ TAO_Portable_Group_Map::dispatch (PortableGroup::TagGroupTaggedComponent* group_
           orb_core->adapter_registry ()->dispatch (entry->key,
                                                    request,
                                                    forward_to
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Reset the read pointer in the message block.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
index da5d24348e3..b903f1d6a1e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
@@ -83,13 +83,13 @@ public:
   /// This function takes ownership of the memory pointed to be group_id
   void add_groupid_objectkey_pair (PortableGroup::TagGroupTaggedComponent *group_id,
                                    const TAO_ObjectKey &key
-                                   TAO_ENV_ARG_DECL);
+                                   ACE_ENV_ARG_DECL);
 
 
   /// Remove a GroupId->ObjectKey mapping from the map.
   void remove_groupid_objectkey_pair (const PortableGroup::TagGroupTaggedComponent* group_id,
                                       const TAO_ObjectKey &key
-                                      TAO_ENV_ARG_DECL);
+                                      ACE_ENV_ARG_DECL);
 
   /// Dispatch a request to all of the ObjectIds that belong to
   /// the specified group.
@@ -97,7 +97,7 @@ public:
                                     TAO_ORB_Core *orb_core,
                                     TAO_ServerRequest &request,
                                     CORBA::Object_out forward_to
-                                    TAO_ENV_ARG_DECL);
+                                    ACE_ENV_ARG_DECL);
 
   /// Id hash map.
   typedef ACE_Hash_Map_Manager_Ex<
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index 49ad5487662..d364e2abfc4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -88,7 +88,7 @@ TAO_UIPMC_Connector::close (void)
 int
 TAO_UIPMC_Connector::connect (TAO_GIOP_Invocation *invocation,
                               TAO_Transport_Descriptor_Interface *desc
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
 {
   TAO_Transport *&transport = invocation->transport ();
   // ACE_Time_Value *max_wait_time = invocation->max_wait_time ();
@@ -182,7 +182,7 @@ TAO_UIPMC_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_UIPMC_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UIPMC_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
index d010698dc8c..00ee0ad7582 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
@@ -53,7 +53,7 @@ public:
   int close (void);
   int connect (TAO_GIOP_Invocation *invocation,
                TAO_Transport_Descriptor_Interface *desc
-               TAO_ENV_ARG_DECL);
+               ACE_ENV_ARG_DECL);
   int preconnect (const char *preconnections);
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -64,7 +64,7 @@ public:
 protected:
   /// = More TAO_Connector methods, please check the documentation on
   ///   Pluggable.h
-  virtual TAO_Profile * make_profile (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Obtain UIPMC properties that must be used by this connector, i.e.,
   /// initialize <uipmc_properties_>.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index 7fd2df47ffd..b232cb7842a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -74,7 +74,7 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const CORBA::Octet class_d_address[4],
 
 TAO_UIPMC_Profile::TAO_UIPMC_Profile (const char *string,
                                       TAO_ORB_Core *orb_core
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
   : TAO_Profile (TAO_TAG_UIPMC_PROFILE,
                  orb_core,
                  TAO_GIOP_Message_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)),
@@ -83,7 +83,7 @@ TAO_UIPMC_Profile::TAO_UIPMC_Profile (const char *string,
     tagged_profile_ ()
 {
   this->add_group_component ();
-  this->parse_string (string TAO_ENV_ARG_PARAMETER);
+  this->parse_string (string ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   addressing_mode_ = default_addressing_mode_;
 }
@@ -177,7 +177,7 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr)
 
 void
 TAO_UIPMC_Profile::parse_string (const char *string
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   // Remove the "N.n@" version prefix, if it exists, and verify the
   // version is one that we accept.
@@ -400,7 +400,7 @@ TAO_UIPMC_Profile::is_equivalent (const TAO_Profile *other_profile)
 
 CORBA::ULong
 TAO_UIPMC_Profile::hash (CORBA::ULong max
-                         TAO_ENV_ARG_DECL_NOT_USED)
+                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = this->endpoint_.hash ();
@@ -430,7 +430,7 @@ TAO_UIPMC_Profile::endpoint_count (void)
 }
 
 char *
-TAO_UIPMC_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // @@ Frank: Update to pull out GroupID information...
 
@@ -664,7 +664,7 @@ void
 TAO_UIPMC_Profile::request_target_specifier (
                       TAO_Target_Specification &target_spec,
                       TAO_Target_Specification::TAO_Target_Address required_type
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   // Fill out the target specifier based on the required type.
   switch (required_type)
@@ -695,7 +695,7 @@ TAO_UIPMC_Profile::supports_multicast (void) const
 
 void
 TAO_UIPMC_Profile::addressing_mode (CORBA::Short addr
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   // ** See race condition note about addressing mode in Profile.h **
   switch (addr)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index 06fcd82e543..b5dd69c96ee 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -68,7 +68,7 @@ public:
   /// Create object using a string ior.
   TAO_UIPMC_Profile (const char *string,
                      TAO_ORB_Core *orb_core
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Destructor is to be called only through <_decr_refcnt>.
   ~TAO_UIPMC_Profile (void);
@@ -76,7 +76,7 @@ public:
   /// Initialize this object using the given input string.
   /// Url-style string contain only one endpoint.
   virtual void parse_string (const char *string
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /**
    * Return a string representation for this profile.
@@ -84,7 +84,7 @@ public:
    * This is used to create url-style reference.  Only one
    * endpoint is included into the string.
    */
-  virtual char * to_string (TAO_ENV_SINGLE_ARG_DECL);
+  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Initialize this object using the given CDR octet string.
   virtual int decode (TAO_InputCDR& cdr);
@@ -134,7 +134,7 @@ public:
 
   /// Return a hash value for this object.
   virtual CORBA::ULong hash (CORBA::ULong max
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Please refer to Profile.h for the documentation of this
   /// function.
@@ -146,7 +146,7 @@ public:
   virtual void request_target_specifier (
                       TAO_Target_Specification &target_spec,
                       TAO_Target_Specification::TAO_Target_Address required_type
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
   /// Returns true since this profile can specify multicast endpoints.
   virtual int supports_multicast (void) const;
@@ -162,7 +162,7 @@ public:
   /// Set and validate the addressing mode if the remote ORB returns an
   /// exception.
   virtual void addressing_mode (CORBA::Short addr_mode
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 8a2eee3b877..41256ad7ba6 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -98,7 +98,7 @@ TAO_PropertySetFactory::~TAO_PropertySetFactory (void)
 // things.
 
 CosPropertyService::PropertySet_ptr
-TAO_PropertySetFactory::create_propertyset (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertySetFactory::create_propertyset (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // New a TAO_PropertySet.
@@ -109,7 +109,7 @@ TAO_PropertySetFactory::create_propertyset (TAO_ENV_SINGLE_ARG_DECL)
   size_t cur_len = this->propertyset_products_.length ();
   this->propertyset_products_.length (cur_len + 1);
   this->propertyset_products_[cur_len] = new_set;
-  return new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // Allows a client to create a new TAO_PropertySet with specific
@@ -118,7 +118,7 @@ TAO_PropertySetFactory::create_propertyset (TAO_ENV_SINGLE_ARG_DECL)
 CosPropertyService::PropertySet_ptr
 TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
                                                         const CosPropertyService::Properties &allowed_properties
-                                                        TAO_ENV_ARG_DECL)
+                                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::ConstraintNotSupported))
 {
@@ -131,7 +131,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySet (allowed_property_types,
                                        allowed_properties
-                                       TAO_ENV_ARG_PARAMETER),
+                                       ACE_ENV_ARG_PARAMETER),
                       0);
       ACE_TRY_CHECK;
 
@@ -141,7 +141,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
       this->propertyset_products_[products_len] = new_set;
 
       // All done.
-      propset_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propset_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ex)
@@ -171,7 +171,7 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
 
 CosPropertyService::PropertySet_ptr
 TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties
-                                                    TAO_ENV_ARG_DECL)
+                                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -183,7 +183,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr
       // New a TAO_PropertySet.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySet (initial_properties
-                                       TAO_ENV_ARG_PARAMETER),
+                                       ACE_ENV_ARG_PARAMETER),
                       0);
       ACE_TRY_CHECK;
 
@@ -193,7 +193,7 @@ TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Pr
       this->propertyset_products_[products_len] = new_set;
 
       // All done.
-      propset_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propset_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CosPropertyService::MultipleExceptions, ex)
@@ -241,7 +241,7 @@ TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void)
 // delete all these New'ed things.
 
 CosPropertyService::PropertySetDef_ptr
-TAO_PropertySetDefFactory::create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertySetDefFactory::create_propertysetdef (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // New a TAO_PropertySetDef.
@@ -254,7 +254,7 @@ TAO_PropertySetDefFactory::create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL)
   this->propertysetdef_products_[cur_len] = new_set;
 
   CosPropertyService::PropertySetDef_ptr propsetdef_ptr =
-    new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return propsetdef_ptr;
@@ -263,7 +263,7 @@ TAO_PropertySetDefFactory::create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL)
 CosPropertyService::PropertySetDef_ptr
 TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
                                                               const CosPropertyService::PropertyDefs &allowed_property_defs
-                                                              TAO_ENV_ARG_DECL)
+                                                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::ConstraintNotSupported))
 {
@@ -276,7 +276,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySetDef (allowed_property_types,
                                           allowed_property_defs
-                                          TAO_ENV_ARG_PARAMETER),
+                                          ACE_ENV_ARG_PARAMETER),
                       0);
       ACE_TRY_CHECK;
 
@@ -286,7 +286,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
       this->propertysetdef_products_[products_len] = new_set;
 
       // All done. Return the pointer.
-      propsetdef_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propsetdef_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ex)
@@ -316,7 +316,7 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
 
 CosPropertyService::PropertySetDef_ptr
 TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs
-                                                          TAO_ENV_ARG_DECL)
+                                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -328,7 +328,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi
       // New a TAO_PropertySet using these lengths.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySetDef (initial_property_defs
-                                          TAO_ENV_ARG_PARAMETER),
+                                          ACE_ENV_ARG_PARAMETER),
                       0);
       ACE_TRY_CHECK;
 
@@ -338,7 +338,7 @@ TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyServi
       this->propertysetdef_products_[products_len] = new_set;
 
       // All done.
-      propsetdef_ptr = new_set->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propsetdef_ptr = new_set->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CosPropertyService::MultipleExceptions, ex)
@@ -379,7 +379,7 @@ TAO_PropertySet::TAO_PropertySet (void)
 
 TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
                                       const CosPropertyService::Properties allowed_properties
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
   : allowed_property_types_ (allowed_property_types),
     allowed_property_names_ (allowed_properties.length ())
 {
@@ -397,7 +397,7 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
   ACE_TRY
     {
       this->define_properties (allowed_properties
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -414,7 +414,7 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
 
 TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
                                       const CORBA::ULong number_of_allowed_properties
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
   : allowed_property_types_ (allowed_property_types),
     allowed_property_names_ (number_of_allowed_properties)
 {
@@ -425,14 +425,14 @@ TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowe
 
 
 TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   // Define all the initial properties in the Property Set. All take
   // *normal* modes.
   ACE_TRY
     {
       this->define_properties (initial_properties
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -461,7 +461,7 @@ TAO_PropertySet::~TAO_PropertySet (void)
 void
 TAO_PropertySet::define_property (const char *property_name,
                                   const CORBA::Any &property_value
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName,
                    CosPropertyService::ConflictingProperty,
@@ -544,7 +544,7 @@ TAO_PropertySet::define_property (const char *property_name,
 CORBA::Boolean
 TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   // If the sequence is empty, no constraints.
   if (this->allowed_property_types_.length () == 0)
@@ -559,7 +559,7 @@ TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
       ACE_TRY
         {
           ret_val = this->allowed_property_types_[ti]->equal (type
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (ret_val == 1)
@@ -608,7 +608,7 @@ TAO_PropertySet::is_property_allowed (const char* property_name)
 
 void
 TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -625,7 +625,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
           // Define this property.
           this->define_property (nproperties [pi].property_name.in (),
                                  nproperties [pi].property_value
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
@@ -691,7 +691,7 @@ TAO_PropertySet::define_properties (const CosPropertyService::Properties &nprope
 
 
 CORBA::ULong
-TAO_PropertySet::get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PropertySet::get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->hash_table_.current_size ();
@@ -707,7 +707,7 @@ void
 TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
                                              CosPropertyService::PropertyNames_out property_names,
                                              CosPropertyService::PropertyNamesIterator_out rest
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocating storage is a must.
@@ -715,7 +715,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
            CosPropertyService::PropertyNames);
 
   size_t num_of_properties =
-    this->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (num_of_properties == 0)
@@ -773,13 +773,13 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
 
       // Get the Interface ptr.
       CosPropertyService::PropertyNamesIterator_ptr iterator_ptr =
-        names_iterator->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        names_iterator->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // POA stuff todo here, since we have <destroy> method in the
       // <NamesIterator> interface.
       // Give ownership of this servant to the POA.
-      names_iterator->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      names_iterator->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Init the out parameter.
@@ -792,7 +792,7 @@ TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
 
 CORBA::Any *
 TAO_PropertySet::get_property_value (const char *property_name
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::PropertyNotFound,
                    CosPropertyService::InvalidPropertyName))
@@ -829,7 +829,7 @@ TAO_PropertySet::get_property_value (const char *property_name
 CORBA::Boolean
 TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &property_names,
                                  CosPropertyService::Properties_out nproperties
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -853,7 +853,7 @@ TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &proper
   for (size_t i = 0; i < n; i++)
     {
       any_ptr = get_property_value (property_names [i]
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (any_ptr != 0)
@@ -885,7 +885,7 @@ void
 TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
                                      CosPropertyService::Properties_out nproperties,
                                      CosPropertyService::PropertiesIterator_out rest
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -960,13 +960,13 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
 
       // Get the interface ptr.
       CosPropertyService::PropertiesIterator_ptr iterator_ptr =
-        iterator->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        iterator->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // POA stuff todo here, since we have <destroy> method in the
       // <NamesIterator> interface.
       // Give ownership of this servant to the POA.
-      iterator->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      iterator->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Init the out parameter.
@@ -979,7 +979,7 @@ TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
 
 void
 TAO_PropertySet::delete_property (const char *property_name
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::PropertyNotFound,
                    CosPropertyService::InvalidPropertyName,
@@ -1019,7 +1019,7 @@ TAO_PropertySet::delete_property (const char *property_name
 
 void
 TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -1037,7 +1037,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
         {
           // Delete this property.
           this->delete_property (property_names[pi]
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
@@ -1089,7 +1089,7 @@ TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &pro
 
 
 CORBA::Boolean
-TAO_PropertySet::delete_all_properties (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet::delete_all_properties (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get all the property names in a names' sequence.
@@ -1101,13 +1101,13 @@ TAO_PropertySet::delete_all_properties (TAO_ENV_SINGLE_ARG_DECL)
   CosPropertyService::PropertyNamesIterator_out iter_out (iter_ptr);
   CosPropertyService::PropertyNamesIterator_var iter;
 
-  CORBA::ULong size = this->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong size = this->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   this->get_all_property_names (size,
                                 names_out,
                                 iter_out
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Get the out values on to the var varibles.
@@ -1116,7 +1116,7 @@ TAO_PropertySet::delete_all_properties (TAO_ENV_SINGLE_ARG_DECL)
 
   // Delete all these properties.
   this->delete_properties (names.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // All properties deleted.
@@ -1128,7 +1128,7 @@ TAO_PropertySet::delete_all_properties (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_PropertySet::is_property_defined (const char *property_name
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName))
 {
@@ -1159,10 +1159,10 @@ TAO_PropertySetDef::TAO_PropertySetDef (void)
 
 TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types,
                                         const CosPropertyService::PropertyDefs allowed_property_defs
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
   : TAO_PropertySet(allowed_property_types,
                     allowed_property_defs.length ()
-                    TAO_ENV_ARG_PARAMETER)
+                    ACE_ENV_ARG_PARAMETER)
 {
   // Set the length of the allowed property names.
   this->allowed_property_names_.length (allowed_property_defs.length ());
@@ -1176,7 +1176,7 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes
   ACE_TRY
     {
       this->define_properties_with_modes (allowed_property_defs
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1190,10 +1190,10 @@ TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes
 // Constructor that the factory uses.
 
 TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   this->define_properties_with_modes (initial_property_defs
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1206,7 +1206,7 @@ TAO_PropertySetDef::~TAO_PropertySetDef (void)
 // Return the sequence that is there in side.
 void
 TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types
-                                                TAO_ENV_ARG_DECL_NOT_USED)
+                                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Copy contents of the sequence.
@@ -1216,7 +1216,7 @@ TAO_PropertySetDef::get_allowed_property_types (CosPropertyService::PropertyType
 
 void
 TAO_PropertySetDef::get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We have all the names, get the values and the modes from the Hash
@@ -1240,7 +1240,7 @@ void
 TAO_PropertySetDef::define_property_with_mode (const char *property_name,
                                                const CORBA::Any &property_value,
                                                CosPropertyService::PropertyModeType property_mode
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName,
                    CosPropertyService::ConflictingProperty,
@@ -1322,7 +1322,7 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
 // MultipleExceptions sequence and raise that.
 void
 TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs
-                                                  TAO_ENV_ARG_DECL)
+                                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -1341,7 +1341,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           this->define_property_with_mode (property_defs[i].property_name,
                                            property_defs[i].property_value,
                                            property_defs[i].property_mode
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
@@ -1415,7 +1415,7 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
 // PropertyNotFound exceptions.
 CosPropertyService::PropertyModeType
 TAO_PropertySetDef::get_property_mode (const char *property_name
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::PropertyNotFound,
                    CosPropertyService::InvalidPropertyName))
@@ -1453,7 +1453,7 @@ TAO_PropertySetDef::get_property_mode (const char *property_name
 CORBA::Boolean
 TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames &property_names,
                                         CosPropertyService::PropertyModes_out property_modes
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -1481,7 +1481,7 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
         {
           // Invoke get_property_mode for this name.
           mode = this->get_property_mode (property_names[i]
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Store the mode in the out sequence.
@@ -1513,7 +1513,7 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
 void
 TAO_PropertySetDef::set_property_mode (const char *property_name,
                                        CosPropertyService::PropertyModeType property_mode
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::InvalidPropertyName,
                    CosPropertyService::PropertyNotFound,
@@ -1607,7 +1607,7 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
 
 void
 TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosPropertyService::MultipleExceptions))
 {
@@ -1624,7 +1624,7 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
         {
           this->set_property_mode (property_modes[i].property_name,
                                    property_modes[i].property_mode
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosPropertyService::PropertyNotFound, ex)
@@ -1689,7 +1689,7 @@ TAO_PropertyNamesIterator::~TAO_PropertyNamesIterator (void)
 // one exists.
 
 void
-TAO_PropertyNamesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PropertyNamesIterator::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->iterator_ = this->iterator_.map ().begin ();
@@ -1702,7 +1702,7 @@ TAO_PropertyNamesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Boolean
 TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   COSPROPERTY_HASH_ENTRY *entry_ptr;
@@ -1721,7 +1721,7 @@ TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name
 CORBA::Boolean
 TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
                                    CosPropertyService::PropertyNames_out property_names
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -1754,22 +1754,22 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
 }
 
 void
-TAO_PropertyNamesIterator::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertyNamesIterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
   // on this servant are complete.
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1785,7 +1785,7 @@ TAO_PropertiesIterator::~TAO_PropertiesIterator (void)
 }
 
 void
-TAO_PropertiesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PropertiesIterator::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->iterator_ = this->iterator_.map ().begin ();
@@ -1793,7 +1793,7 @@ TAO_PropertiesIterator::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Boolean
 TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   COSPROPERTY_HASH_ENTRY *entry_ptr;
@@ -1816,7 +1816,7 @@ TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty
 CORBA::Boolean
 TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
                                 CosPropertyService::Properties_out nproperties
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate memory for the out parameter.
@@ -1857,22 +1857,22 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
 }
 
 void
-TAO_PropertiesIterator::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertiesIterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA.  Because of reference counting, the POA
   // will automatically delete the servant when all pending requests
   // on this servant are complete.
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index 2e55d30489e..66f85f5542a 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -126,7 +126,7 @@ public:
   // Destructor.
 
   virtual CosPropertyService::PropertySet_ptr
-  create_propertyset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  create_propertyset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a  new TAO_PropertySet object. "The property set returned
   // will *not* have any initial properties."
@@ -134,7 +134,7 @@ public:
   virtual CosPropertyService::PropertySet_ptr
   create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
                                   const CosPropertyService::Properties &allowed_properties
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::ConstraintNotSupported));
     // Allows a client to create a new TAO_PropertySet with specific
@@ -142,7 +142,7 @@ public:
 
   virtual CosPropertyService::PropertySet_ptr
   create_initial_propertyset (const CosPropertyService::Properties &initial_properties
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Allows a client to create a new TAO_PropertySet with specific
@@ -179,14 +179,14 @@ public:
   // Destructor.
 
   virtual CosPropertyService::PropertySetDef_ptr
-  create_propertysetdef (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  create_propertysetdef (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new TAO_PropertySetDef object.
 
   virtual CosPropertyService::PropertySetDef_ptr
   create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
                                      const CosPropertyService::PropertyDefs &allowed_property_defs
-                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::ConstraintNotSupported));
   // Allows a client to create a new TAO_PropertySetDef with specific
@@ -194,7 +194,7 @@ public:
 
   virtual CosPropertyService::PropertySetDef_ptr
   create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Allows a client to create a new TAO_PropertySetDef with specific
@@ -227,16 +227,16 @@ public:
 
   TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
                    const CosPropertyService::Properties allowed_properties
-                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Init values that the PropertySetFactory will want to specify.
 
   TAO_PropertySet (const CosPropertyService::Properties initial_properties
-                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // PropertySetFactory needs this constructor.
 
   TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
                    const CORBA::ULong number_of_allowed_propertydefs
-                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // PropertySetDef's construction needs this.
 
   virtual ~TAO_PropertySet (void);
@@ -244,7 +244,7 @@ public:
 
   virtual void define_property (const char *property_name,
                                 const CORBA::Any &property_value
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::ConflictingProperty,
@@ -256,12 +256,12 @@ public:
   // property name, duplicate name, type code over writing etc.
 
   virtual void define_properties (const CosPropertyService::Properties &nproperties
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Define a sequence of properties at a time.
 
-  virtual CORBA::ULong get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::ULong get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the number of properties that are currently defined in the
   // PropertySet.
@@ -269,13 +269,13 @@ public:
   virtual void get_all_property_names (CORBA::ULong how_many,
                                        CosPropertyService::PropertyNames_out property_names,
                                        CosPropertyService::PropertyNamesIterator_out rest
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get the names of all the properties that are currently defined in
   // the property set.
 
   virtual CORBA::Any *get_property_value (const char *property_name
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName));
@@ -283,21 +283,21 @@ public:
 
   virtual CORBA::Boolean get_properties (const CosPropertyService::PropertyNames &property_names,
                                          CosPropertyService::Properties_out nproperties
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Get all names and their property values.
 
   virtual void get_all_properties (CORBA::ULong how_many,
                                    CosPropertyService::Properties_out nproperties,
                                    CosPropertyService::PropertiesIterator_out rest
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns all of the property names currently defined in the
   // PropertySet. If the PropertySet contains more than how_many
   // property names, then the remaining property names are put into the PropertyNamesIterator.
 
   virtual void delete_property (const char *property_name
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName,
@@ -305,17 +305,17 @@ public:
   // Delete a property given a name.
 
   virtual void delete_properties (const CosPropertyService::PropertyNames &property_names
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Delete all the these properties from this property set.
 
-  virtual CORBA::Boolean delete_all_properties (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean delete_all_properties (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Delete everything from this property set.
 
   virtual CORBA::Boolean is_property_defined (const char *property_name
-                                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName));
   // Tell whether this property is defined or no. Forget about the
@@ -382,18 +382,18 @@ public:
 
   TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types,
                       const CosPropertyService::PropertyDefs allowed_property
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   // The factory uses this constructor.
 
   TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   // This is also for the factory.
 
   virtual ~TAO_PropertySetDef (void);
   // Destructor.
 
   virtual void get_allowed_property_types (CosPropertyService::PropertyTypes_out property_types
-                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Indicates which types of properties are supported by this
   // PropertySet. If the output sequence is empty, then there is no
@@ -402,7 +402,7 @@ public:
   // get_allowed_properties output sequence is not empty.
 
   virtual void get_allowed_properties (CosPropertyService::PropertyDefs_out property_defs
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Indicates which properties are supported by this PropertySet. If
@@ -413,7 +413,7 @@ public:
   virtual void define_property_with_mode (const char *property_name,
                                           const CORBA::Any &property_value,
                                           CosPropertyService::PropertyModeType property_mode
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::ConflictingProperty,
@@ -430,14 +430,14 @@ public:
   // exception is thrown.
 
   virtual void define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs
-                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // This operation will modify or add each of the properties in the
   // Properties parameter to the PropertySet.
 
   virtual CosPropertyService::PropertyModeType get_property_mode (const char *property_name
-                                                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::PropertyNotFound,
                      CosPropertyService::InvalidPropertyName));
@@ -446,7 +446,7 @@ public:
 
   virtual CORBA::Boolean get_property_modes (const CosPropertyService::PropertyNames &property_names,
                                              CosPropertyService::PropertyModes_out property_modes
-                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Batch operation for getting the property. Invoke
   // get_property_mode for each name.  Return value False indicates
@@ -458,7 +458,7 @@ public:
 
   virtual void set_property_mode (const char *property_name,
                                   CosPropertyService::PropertyModeType property_mode
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::InvalidPropertyName,
                      CosPropertyService::PropertyNotFound,
@@ -475,7 +475,7 @@ public:
   // raised.
 
   virtual void set_property_modes (const CosPropertyService::PropertyModes &property_modes
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions));
   // Batch operation for setting the property. Raises
@@ -505,13 +505,13 @@ public:
   virtual ~TAO_PropertyNamesIterator (void);
   // Destructor.
 
-  virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void reset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The reset operation resets the position in an iterator to the
   // first property name, if one exists.
 
   virtual CORBA::Boolean next_one (CORBA::String_out property_name
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_one operation returns true if an item exists at the
   // current position in the iterator with an output parameter of a
@@ -520,7 +520,7 @@ public:
 
   virtual CORBA::Boolean next_n (CORBA::ULong how_many,
                                  CosPropertyService::PropertyNames_out property_names
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_n operation returns true if an item exists at the
   // current position in the iterator and the how_many parameter was
@@ -528,7 +528,7 @@ public:
   // with at most the how_many number of names. A return of false
   // signifies no more items in the iterator.
 
-  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));
   // Destroys the iterator.
 private:
@@ -568,12 +568,12 @@ public:
   virtual ~TAO_PropertiesIterator (void);
   // Destructor.
 
-  virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void reset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Resets the position in an iterator to the first property, if one exists.
 
   virtual CORBA::Boolean next_one (CosPropertyService::Property_out aproperty
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_one operation returns true if an item exists at the
   // current position in the iterator with an output parameter of a
@@ -582,7 +582,7 @@ public:
 
   virtual CORBA::Boolean next_n (CORBA::ULong how_many,
                                  CosPropertyService::Properties_out nproperties
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_n operation returns true if an item exists at the
   // current position in the iterator and the how_many parameter was
@@ -590,7 +590,7 @@ public:
   // at most the how_many number of properties. A return of false
   // signifies no more items in the iterator.
 
-  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));
   // Destroys the iterator.
 
diff --git a/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp b/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp
index 66a03582d03..e42168ee991 100644
--- a/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp
@@ -19,7 +19,7 @@ TAO_LB_ReplicaLocator::preinvoke (
       PortableServer::POA_ptr /* adapter */,
       const char * /* operation */,
       PortableServer::ServantLocator::Cookie & /* the_cookie */
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -27,7 +27,7 @@ TAO_LB_ReplicaLocator::preinvoke (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   CORBA::Object_var replica =
-    this->load_balancer_->replica (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->load_balancer_->replica (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Throw a forward exception to force the client to redirect its
@@ -44,7 +44,7 @@ TAO_LB_ReplicaLocator::postinvoke (
     const char * /* operation */,
     PortableServer::ServantLocator::Cookie /* the_cookie */,
     PortableServer::Servant /* the_servant */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // No-op
diff --git a/TAO/orbsvcs/orbsvcs/ReplicaLocator.h b/TAO/orbsvcs/orbsvcs/ReplicaLocator.h
index 9031dbb51fc..0507fd23d50 100644
--- a/TAO/orbsvcs/orbsvcs/ReplicaLocator.h
+++ b/TAO/orbsvcs/orbsvcs/ReplicaLocator.h
@@ -50,7 +50,7 @@ public:
       PortableServer::POA_ptr adapter,
       const char *operation,
       PortableServer::ServantLocator::Cookie & the_cookie
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
 
@@ -60,7 +60,7 @@ public:
       const char *operation,
       PortableServer::ServantLocator::Cookie the_cookie,
       PortableServer::Servant the_servant
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp
index bfc9d025ba7..f111819e7f8 100644
--- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.cpp
@@ -23,7 +23,7 @@ TAO_LB_ReplicaProxy::TAO_LB_ReplicaProxy (void)
 
 void
 TAO_LB_ReplicaProxy::current_load (CORBA::Float load
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Ossama: this is the point were the load dampening should
@@ -35,11 +35,11 @@ TAO_LB_ReplicaProxy::current_load (CORBA::Float load
   this->current_load_ = load;
   // ACE_DEBUG ((LM_DEBUG, "Load[%x] = %f\n", long(this), load));
 
-  this->balancer_->load_changed (this TAO_ENV_ARG_PARAMETER);
+  this->balancer_->load_changed (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+TAO_LB_ReplicaProxy::disconnect (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected,
                    CORBA::SystemException))
 {
@@ -49,7 +49,7 @@ TAO_LB_ReplicaProxy::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->connected_)
     {
-      this->balancer_->disconnect (this TAO_ENV_ARG_PARAMETER);
+      this->balancer_->disconnect (this ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->connected_ = 0;
@@ -64,7 +64,7 @@ void
 TAO_LB_ReplicaProxy::connect (TAO_LB_LoadBalancer *balancer,
                               LoadBalancing::ReplicaControl_ptr control,
                               CORBA::Object_ptr replica
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                    LoadBalancing::ReplicaProxy::NilReplica,
                    CORBA::SystemException))
diff --git a/TAO/orbsvcs/orbsvcs/ReplicaProxy.h b/TAO/orbsvcs/orbsvcs/ReplicaProxy.h
index 9eb629ea29f..8f29e644a6d 100644
--- a/TAO/orbsvcs/orbsvcs/ReplicaProxy.h
+++ b/TAO/orbsvcs/orbsvcs/ReplicaProxy.h
@@ -55,7 +55,7 @@ public:
   // Return a reference to the Replica.
 
   virtual void current_load (CORBA::Float load
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Send the value of the current load on the Object being load
   // balanced, where the definition of "load" is load balancing
@@ -69,7 +69,7 @@ public:
   // without affecting the client, or detect rapid raises in load and
   // react proactively to those...
 
-  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NotConnected,
                      CORBA::SystemException));
   // Send a request to disconnect from the LoadBalancer.
@@ -93,7 +93,7 @@ private:
   void connect (TAO_LB_LoadBalancer *balancer,
                 LoadBalancing::ReplicaControl_ptr control,
                 CORBA::Object_ptr replica
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((LoadBalancing::ReplicaProxy::NilControl,
                      LoadBalancing::ReplicaProxy::NilReplica,
                      CORBA::SystemException));
diff --git a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp
index 4da47b060d7..d587a309dfa 100644
--- a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp
@@ -39,7 +39,7 @@ TAO_LB_Round_Robin_Strategy::~TAO_LB_Round_Robin_Strategy (void)
 }
 
 CORBA::Object_ptr
-TAO_LB_Round_Robin_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL)
+TAO_LB_Round_Robin_Strategy::replica (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
diff --git a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h
index 93887fc6ac0..988e18ea25e 100644
--- a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h
@@ -60,7 +60,7 @@ public:
   // Destructor
 
   // = The Load_Balancing_Strategy methods
-  virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Object_ptr replica (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual int insert (TAO_LB_ReplicaProxy *);
   virtual int remove (TAO_LB_ReplicaProxy *);
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 1faa1a245f8..181011de6f0 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -29,7 +29,7 @@ ACE_Runtime_Scheduler (int config_count,
 
 RtecScheduler::handle_t
 ACE_Runtime_Scheduler::create (const char *entry_point
-                               TAO_ENV_ARG_DECL_NOT_USED)
+                               ACE_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME))
 {
@@ -48,10 +48,10 @@ ACE_Runtime_Scheduler::create (const char *entry_point
 
 RtecScheduler::handle_t
 ACE_Runtime_Scheduler::lookup (const char * entry_point
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return create (entry_point TAO_ENV_ARG_PARAMETER);
+  return create (entry_point ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -59,7 +59,7 @@ ACE_Runtime_Scheduler::lookup (const char * entry_point
 
 RtecScheduler::RT_Info *
 ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
@@ -110,7 +110,7 @@ ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle,
                                  RtecScheduler::Quantum_t quantum,
                                  CORBA::Long threads,
                                  RtecScheduler::Info_Type_t info_type
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -147,7 +147,7 @@ ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
                                  RtecScheduler::OS_Priority& o_priority,
                                  RtecScheduler::Preemption_Subpriority_t& subpriority,
                                  RtecScheduler::Preemption_Priority_t& p_priority
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
@@ -170,22 +170,22 @@ ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
                                              RtecScheduler::OS_Priority& priority,
                                              RtecScheduler::Preemption_Subpriority_t& subpriority,
                                              RtecScheduler::Preemption_Priority_t& p_priority
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
 {
-  RtecScheduler::handle_t handle = lookup (entry_point TAO_ENV_ARG_PARAMETER);
+  RtecScheduler::handle_t handle = lookup (entry_point ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (handle < -1)
-    // The exception was thrown or is in TAO_ENV_SINGLE_ARG_PARAMETER already.
+    // The exception was thrown or is in ACE_ENV_SINGLE_ARG_PARAMETER already.
     return;
   this->priority (handle,
                   priority,
                   subpriority,
                   p_priority
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -197,7 +197,7 @@ ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                        RtecScheduler::handle_t /* dependency */,
                                        CORBA::Long /* number_of_calls */,
                                        RtecScheduler::Dependency_Type_t /* dependency_type */
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -232,7 +232,7 @@ ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */,
                                            RtecScheduler::RT_Info_Set_out /* infos */,
                                            RtecScheduler::Config_Info_Set_out /* configs */,
                                            RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -251,7 +251,7 @@ void
 ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                                RtecScheduler::OS_Priority& priority,
                                                RtecScheduler::Dispatching_Type_t & d_type
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::NOT_SCHEDULED,
                       RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
@@ -284,7 +284,7 @@ ACE_Runtime_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priorit
 // to the number returned, inclusive.
 
 RtecScheduler::Preemption_Priority_t
-ACE_Runtime_Scheduler::last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL)
+ACE_Runtime_Scheduler::last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index 61c7f6de038..1b85939bc90 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -40,7 +40,7 @@ public:
   // Constructor. Initialize the data from the POD_RT_Info array.
 
   virtual RtecScheduler::handle_t create (const char * entry_point
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME));
   // Create an RT_Info.  In the config run scheduler this actually constructs
@@ -48,13 +48,13 @@ public:
   // it's not present.
 
   virtual RtecScheduler::handle_t lookup (const char * entry_point
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException));
   // Lookup a handle for an RT_Info, and return its handle, or an error
   // value if it's not present.
 
   virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Return a pointer to the RT_Info corresponding to the passed handle.
@@ -69,7 +69,7 @@ public:
                     RtecScheduler::Quantum_t quantum,
                     CORBA::Long threads,
                     RtecScheduler::Info_Type_t info_type
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // Set characteristics of the RT_Info corresponding to the passed handle.
@@ -78,7 +78,7 @@ public:
                          RtecScheduler::OS_Priority& o_priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                          RtecScheduler::Preemption_Priority_t& p_priority
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -89,7 +89,7 @@ public:
                                      RtecScheduler::OS_Priority& o_priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -100,7 +100,7 @@ public:
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
                                RtecScheduler::Dependency_Type_t dependency_type
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
   // In the config run scheduler, this method registers a dependency between
@@ -111,7 +111,7 @@ public:
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Config_Info_Set_out configs,
                                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -123,13 +123,13 @@ public:
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& o_priority,
                                        RtecScheduler::Dispatching_Type_t & d_type
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // Provides the thread priority and queue type for the given priority level.
 
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL)
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED));
   // Returns the last priority number assigned to an operation in the
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index 5742ba7d84f..c8fa5d4df4a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -119,7 +119,7 @@ int
 TAO_IIOP_SSL_Connector::connect (
   TAO_GIOP_Invocation *invocation,
   TAO_Transport_Descriptor_Interface *desc
-  TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
index e4e999675f5..634cedd3a73 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.h
@@ -53,7 +53,7 @@ public:
   int close (void);
   int connect (TAO_GIOP_Invocation *invocation,
                TAO_Transport_Descriptor_Interface *desc
-               TAO_ENV_ARG_DECL);
+               ACE_ENV_ARG_DECL);
 
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index a556252a79c..0f5907519f2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -122,7 +122,7 @@ TAO_SSLIOP_Connector::close (void)
 int
 TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
                                TAO_Transport_Descriptor_Interface *desc
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
@@ -149,12 +149,12 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
   // policy for the current object.
   CORBA::Policy_var policy =
     invocation->stub ()->get_policy (Security::SecEstablishTrustPolicy
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   SecurityLevel2::EstablishTrustPolicy_var trust_policy =
     SecurityLevel2::EstablishTrustPolicy::_narrow (policy.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // We use a pointer and temporary to make it obvious to determine
@@ -164,7 +164,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
   Security::EstablishTrust trust = { 0 , 0 };
   if (!CORBA::is_nil (trust_policy.in ()))
     {
-      trust = trust_policy->trust (TAO_ENV_SINGLE_ARG_PARAMETER);
+      trust = trust_policy->trust (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -197,12 +197,12 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
   // Check if the user overrode the default Quality-of-Protection for
   // the current object.
   policy = invocation->stub ()->get_policy (Security::SecQOPPolicy
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   SecurityLevel2::QOPPolicy_var qop_policy =
     SecurityLevel2::QOPPolicy::_narrow (policy.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Temporary variable used to avoid overwriting the default value
@@ -211,7 +211,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
 
   if (!CORBA::is_nil (qop_policy.in ()))
     {
-      qop = qop_policy->qop (TAO_ENV_SINGLE_ARG_PARAMETER);
+      qop = qop_policy->qop (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -239,7 +239,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
     {
       return this->iiop_connect (ssl_endpoint,
                                  invocation
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
     }
 
   return this->ssliop_connect (ssl_endpoint,
@@ -247,7 +247,7 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
                                trust,
                                invocation,
                                desc
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -270,7 +270,7 @@ TAO_SSLIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_SSLIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SSLIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -294,7 +294,7 @@ TAO_SSLIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL)
 int
 TAO_SSLIOP_Connector::iiop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint,
                                     TAO_GIOP_Invocation *invocation
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   const SSLIOP::SSL &ssl_component = ssl_endpoint->ssl_component ();
 
@@ -329,7 +329,7 @@ TAO_SSLIOP_Connector::iiop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint,
   // Note that the IIOP-only transport descriptor is used!
   return this->TAO_IIOP_SSL_Connector::connect (invocation,
                                                 &iiop_desc
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
 }
 
 int
@@ -338,7 +338,7 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint,
                                       const Security::EstablishTrust &trust,
                                       TAO_GIOP_Invocation *invocation,
                                       TAO_Transport_Descriptor_Interface *desc
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   TAO_Transport *&transport = invocation->transport ();
   ACE_Time_Value *max_wait_time = invocation->max_wait_time ();
@@ -486,7 +486,7 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint,
       TAO_SSLIOP_Credentials_var credentials =
         this->retrieve_credentials (invocation->stub (),
                                     svc_handler->peer ().ssl ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       svc_handler = safe_handler.release ();
@@ -569,18 +569,18 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint,
 TAO_SSLIOP_Credentials *
 TAO_SSLIOP_Connector::retrieve_credentials (TAO_Stub *stub,
                                             SSL *ssl
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
 {
   // Check if the user overrode the default invocation credentials.
   CORBA::Policy_var policy =
     stub->get_policy (Security::SecInvocationCredentialsPolicy
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ());
 
   SecurityLevel2::InvocationCredentialsPolicy_var creds_policy =
     SecurityLevel2::InvocationCredentialsPolicy::_narrow (
       policy.in ()
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ());
 
   TAO_SSLIOP_Credentials_var ssliop_credentials;
@@ -590,7 +590,7 @@ TAO_SSLIOP_Connector::retrieve_credentials (TAO_Stub *stub,
   if (!CORBA::is_nil (creds_policy.in ()))
     {
       SecurityLevel2::CredentialsList_var creds_list =
-        creds_policy->creds (TAO_ENV_SINGLE_ARG_PARAMETER);
+        creds_policy->creds (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ());
 
       if (creds_list->length () > 0)
@@ -603,7 +603,7 @@ TAO_SSLIOP_Connector::retrieve_credentials (TAO_Stub *stub,
 
           ssliop_credentials =
             TAO_SSLIOP_Credentials::_narrow (credentials
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (TAO_SSLIOP_Credentials::_nil ());
 
           if (!CORBA::is_nil (ssliop_credentials.in ()))
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
index 2842d3a062f..3d6175aa057 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -60,7 +60,7 @@ public:
   virtual int close (void);
   virtual int connect (TAO_GIOP_Invocation *invocation,
                        TAO_Transport_Descriptor_Interface *desc
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   virtual TAO_Profile *create_profile (TAO_InputCDR& cdr);
   //@}
 
@@ -71,7 +71,7 @@ protected:
    *
    * Please check the documentation in Pluggable.h.
    */
-  virtual TAO_Profile * make_profile (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
 
   /// IIOP-specific connection establishment.
   /**
@@ -79,7 +79,7 @@ protected:
    */
   int iiop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint,
                     TAO_GIOP_Invocation *invocation
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
 
   /// SSLIOP-specific connection establishment.
   int ssliop_connect (TAO_SSLIOP_Endpoint *ssliop_endpoint,
@@ -87,14 +87,14 @@ protected:
                       const Security::EstablishTrust &trust,
                       TAO_GIOP_Invocation *invocation,
                       TAO_Transport_Descriptor_Interface *desc
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
   /// Retrieve SSLIOP credentials from the policy overrides list and
   /// set up the underlying SSL connection to use the X.509
   /// certificates stored within them.
   TAO_SSLIOP_Credentials * retrieve_credentials (TAO_Stub *stub,
                                                  SSL *ssl
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
index 62015c21e9a..07ed18f146f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -40,7 +40,7 @@ TAO_SSLIOP_Credentials::~TAO_SSLIOP_Credentials (void)
 }
 
 SecurityLevel2::Credentials_ptr
-TAO_SSLIOP_Credentials::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SSLIOP_Credentials::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_SSLIOP_Credentials *c = 0;
@@ -58,20 +58,20 @@ TAO_SSLIOP_Credentials::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_SSLIOP_Credentials::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SSLIOP_Credentials::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 Security::InvocationCredentialsType
-TAO_SSLIOP_Credentials::credentials_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SSLIOP_Credentials::credentials_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Security::SecOwnCredentials;
 }
 
 Security::AuthenticationStatus
-TAO_SSLIOP_Credentials::authentication_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SSLIOP_Credentials::authentication_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Is the following statement correct?
@@ -83,7 +83,7 @@ TAO_SSLIOP_Credentials::authentication_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-TAO_SSLIOP_Credentials::mechanism (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SSLIOP_Credentials::mechanism (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @todo Is the following correct?
@@ -97,7 +97,7 @@ TAO_SSLIOP_Credentials::mechanism (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 Security::AssociationOptions
 TAO_SSLIOP_Credentials::accepting_options_supported (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->accepting_options_supported_;
@@ -106,7 +106,7 @@ TAO_SSLIOP_Credentials::accepting_options_supported (
 void
 TAO_SSLIOP_Credentials::accepting_options_supported (
     Security::AssociationOptions accepting_options_supported
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @todo Verify that the given accepting options are valid
@@ -130,7 +130,7 @@ TAO_SSLIOP_Credentials::accepting_options_supported (
 
 Security::AssociationOptions
 TAO_SSLIOP_Credentials::accepting_options_required (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->accepting_options_required_;
@@ -139,7 +139,7 @@ TAO_SSLIOP_Credentials::accepting_options_required (
 void
 TAO_SSLIOP_Credentials::accepting_options_required (
     Security::AssociationOptions accepting_options_required
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // "accepting_options_required" should not have "more" capability
@@ -158,7 +158,7 @@ TAO_SSLIOP_Credentials::accepting_options_required (
 
 Security::AssociationOptions
 TAO_SSLIOP_Credentials::invocation_options_supported (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->invocation_options_supported_;
@@ -167,7 +167,7 @@ TAO_SSLIOP_Credentials::invocation_options_supported (
 void
 TAO_SSLIOP_Credentials::invocation_options_supported (
     Security::AssociationOptions invocation_options_supported
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ((invocation_options_supported & ::TAO_SSLIOP_DISALLOWED_ASSOCIATIONS)
@@ -183,7 +183,7 @@ TAO_SSLIOP_Credentials::invocation_options_supported (
 
 Security::AssociationOptions
 TAO_SSLIOP_Credentials::invocation_options_required (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->invocation_options_required_;
@@ -192,7 +192,7 @@ TAO_SSLIOP_Credentials::invocation_options_required (
 void
 TAO_SSLIOP_Credentials::invocation_options_required (
     Security::AssociationOptions invocation_options_required
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if ((invocation_options_required & ::TAO_SSLIOP_DISALLOWED_ASSOCIATIONS)
@@ -210,7 +210,7 @@ CORBA::Boolean
 TAO_SSLIOP_Credentials::get_security_feature (
     Security::CommunicationDirection /* direction */,
     Security::SecurityFeature /* feature */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -225,7 +225,7 @@ CORBA::Boolean
 TAO_SSLIOP_Credentials::set_attributes (
     const Security::AttributeList & /* requested_attributes */,
     Security::AttributeList_out /* actual_attributes */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -239,7 +239,7 @@ TAO_SSLIOP_Credentials::set_attributes (
 Security::AttributeList *
 TAO_SSLIOP_Credentials::get_attributes (
     const Security::AttributeTypeList & /* attributes */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -253,7 +253,7 @@ TAO_SSLIOP_Credentials::get_attributes (
 CORBA::Boolean
 TAO_SSLIOP_Credentials::is_valid (
     Security::UtcT_out expiry_time
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   X509 *x = this->x509_.in ();
@@ -301,7 +301,7 @@ TAO_SSLIOP_Credentials::is_valid (
 
 CORBA::Boolean
 TAO_SSLIOP_Credentials::refresh (const CORBA::Any & /* refresh_data */
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Until it is clear the code below is correct, throw a
@@ -416,15 +416,15 @@ TAO_SSLIOP_Credentials::hash (void) const
 
 TAO_SSLIOP_Credentials_ptr
 TAO_SSLIOP_Credentials::_narrow (CORBA::Object_ptr obj
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   return TAO_SSLIOP_Credentials::_unchecked_narrow (obj
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_SSLIOP_Credentials_ptr
 TAO_SSLIOP_Credentials::_unchecked_narrow (CORBA::Object_ptr obj
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     return TAO_SSLIOP_Credentials::_nil ();
@@ -512,10 +512,10 @@ tao_TAO_SSLIOP_Credentials_nil (
 TAO_SSLIOP_Credentials_ptr
 tao_TAO_SSLIOP_Credentials_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return TAO_SSLIOP_Credentials::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return TAO_SSLIOP_Credentials::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -637,10 +637,10 @@ TAO_SSLIOP_Credentials_var::tao_nil (void)
 ::TAO_SSLIOP_Credentials_ptr
 TAO_SSLIOP_Credentials_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::TAO_SSLIOP_Credentials::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::TAO_SSLIOP_Credentials::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
index b3ec3619e01..68f70b49f06 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -58,7 +58,7 @@ public:
   static TAO_SSLIOP_Credentials_ptr tao_nil (void);
   static TAO_SSLIOP_Credentials_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -109,11 +109,11 @@ public:
   /// Return a duplicate (specifically a deep copy) of this credential
   /// object.
   virtual SecurityLevel2::Credentials_ptr copy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the invocation credentials type this object is.
@@ -133,79 +133,79 @@ public:
    * (i.e. Security::SecTargetCredentials) is returned.
    */
   virtual Security::InvocationCredentialsType credentials_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::AuthenticationStatus authentication_state (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * mechanism (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::AssociationOptions accepting_options_supported (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void accepting_options_supported (
       Security::AssociationOptions accepting_options_supported
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::AssociationOptions accepting_options_required (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void accepting_options_required (
       Security::AssociationOptions accepting_options_required
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::AssociationOptions invocation_options_supported (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void invocation_options_supported (
       Security::AssociationOptions invocation_options_supported
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::AssociationOptions invocation_options_required (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void invocation_options_required (
       Security::AssociationOptions invocation_options_required
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean get_security_feature (
       Security::CommunicationDirection direction,
       Security::SecurityFeature feature
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean set_attributes (
       const Security::AttributeList & requested_attributes,
       Security::AttributeList_out actual_attributes
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::AttributeList * get_attributes (
       const Security::AttributeTypeList & attributes
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Verify that this credential is still valid.
   virtual CORBA::Boolean is_valid (
       Security::UtcT_out expiry_time
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean refresh (
       const CORBA::Any & refresh_data
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
@@ -244,12 +244,12 @@ public:
 
   static TAO_SSLIOP_Credentials_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
 
   static TAO_SSLIOP_Credentials_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
 
   static TAO_SSLIOP_Credentials_ptr _nil (void)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index 896c4041c50..b7289fb5256 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -29,7 +29,7 @@ TAO_SSLIOP_Current::~TAO_SSLIOP_Current (void)
 
 SSLIOP::ASN_1_Cert *
 TAO_SSLIOP_Current::get_peer_certificate (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    SSLIOP::Current::NoContext))
 {
@@ -63,7 +63,7 @@ TAO_SSLIOP_Current::get_peer_certificate (
 
 SSLIOP::SSL_Cert *
 TAO_SSLIOP_Current::get_peer_certificate_chain (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    SSLIOP::Current::NoContext))
 {
@@ -96,7 +96,7 @@ TAO_SSLIOP_Current::get_peer_certificate_chain (
 }
 
 CORBA::Boolean
-TAO_SSLIOP_Current::no_context (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SSLIOP_Current::no_context (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (this->implementation () == 0 ? 1 : 0);
@@ -132,15 +132,15 @@ TAO_SSLIOP_Current::teardown (TAO_SSLIOP_Current_Impl *prev_impl,
 TAO_SSLIOP_Current_ptr
 TAO_SSLIOP_Current::_narrow (
   CORBA::Object_ptr obj
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
-  return TAO_SSLIOP_Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return TAO_SSLIOP_Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_SSLIOP_Current_ptr
 TAO_SSLIOP_Current::_unchecked_narrow (
   CORBA::Object_ptr obj
-  TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     return TAO_SSLIOP_Current::_nil ();
@@ -247,10 +247,10 @@ tao_TAO_SSLIOP_Current_nil (
 TAO_SSLIOP_Current_ptr
 tao_TAO_SSLIOP_Current_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return TAO_SSLIOP_Current::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return TAO_SSLIOP_Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -375,10 +375,10 @@ TAO_SSLIOP_Current_var::tao_nil (void)
 ::TAO_SSLIOP_Current_ptr
 TAO_SSLIOP_Current_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::TAO_SSLIOP_Current::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::TAO_SSLIOP_Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index 7c27bf20d1d..a3798369bac 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -63,7 +63,7 @@ public:
   /// Return the peer certificate associated with the current
   /// request.
   virtual SSLIOP::ASN_1_Cert * get_peer_certificate (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      SSLIOP::Current::NoContext));
 
@@ -75,7 +75,7 @@ public:
   /// certficate.  However, the certificate chain on the server side
   /// does NOT contain the peer (client) certificate.
   virtual SSLIOP::SSL_Cert * get_peer_certificate_chain (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      SSLIOP::Current::NoContext));
 
@@ -84,7 +84,7 @@ public:
   /// means of determining whether or not SSL session state is
   /// available.
   virtual CORBA::Boolean no_context (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the TSS slot ID assigned to this object.
@@ -118,12 +118,12 @@ public:
 
   static TAO_SSLIOP_Current_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static TAO_SSLIOP_Current_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static TAO_SSLIOP_Current_ptr _nil (void)
@@ -197,7 +197,7 @@ public:
   static TAO_SSLIOP_Current_ptr tao_nil (void);
   static TAO_SSLIOP_Current_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index e65c3d59886..2264ace46b3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -23,7 +23,7 @@ TAO_SSLIOP_Current_Impl::~TAO_SSLIOP_Current_Impl (void)
 Security::AttributeList *
 TAO_SSLIOP_Current_Impl::get_attributes (
     const Security::AttributeTypeList &attributes
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong len = attributes.length ();
@@ -126,7 +126,7 @@ TAO_SSLIOP_Current_Impl::get_attributes (
 
 SecurityLevel2::ReceivedCredentials_ptr
 TAO_SSLIOP_Current_Impl::received_credentials (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_SSLIOP_X509_var cert = ::SSL_get_peer_certificate (this->ssl_);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
index db6de036f3d..29d834ea4ef 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
@@ -50,13 +50,13 @@ public:
   /// SecurityLevel1::Current::get_attributes() method.
   virtual Security::AttributeList * get_attributes (
       const Security::AttributeTypeList &attributes
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// SSLIOP-specific version of the
   /// SecurityLevel2::Current::received_credentials() method.
   virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the SSL peer certificate associated with the
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 0900543150e..a2778ea49eb 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -212,7 +212,7 @@ TAO_SSLIOP_Protocol_Factory::init (int argc,
 int
 TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // @todo: This hard-coding should be fixed once SECIOP is
@@ -231,7 +231,7 @@ TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void)
       PortableInterceptor::ORBInitializer_var initializer = tmp;
 
       PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register the SSLIOP ORB initializer.
@@ -249,7 +249,7 @@ TAO_SSLIOP_Protocol_Factory::register_orb_initializer (void)
       initializer = tmp;
 
       PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index f708da783fa..e10055a6dab 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -25,7 +25,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::
 
 char *
 TAO_SSLIOP_Server_Invocation_Interceptor::name (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("TAO_SSLIOP_Server_Invocation_Interceptor");
@@ -33,7 +33,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::name (
 
 void
 TAO_SSLIOP_Server_Invocation_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -42,7 +42,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::destroy (
 void
 TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -56,7 +56,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts (
   //          accept or reject requests on a per-object basis
   //          instead on a per-endpoint basis.
   CORBA::Boolean no_ssl =
-    this->ssliop_current_->no_context (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->ssliop_current_->no_context (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (no_ssl && this->qop_ != Security::SecQOPNoProtection)
@@ -70,7 +70,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts (
       // exception.  Otherwise, it will return a DER encoded X509
       // certificate.
       SSLIOP::ASN_1_Cert_var cert =
-        this->ssliop_current_->get_peer_certificate (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->ssliop_current_->get_peer_certificate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // @@ The following debugging code works but I don't think that
@@ -128,7 +128,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts (
 void
 TAO_SSLIOP_Server_Invocation_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -137,7 +137,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::receive_request (
 void
 TAO_SSLIOP_Server_Invocation_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -145,7 +145,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::send_reply (
 void
 TAO_SSLIOP_Server_Invocation_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -154,7 +154,7 @@ TAO_SSLIOP_Server_Invocation_Interceptor::send_exception (
 void
 TAO_SSLIOP_Server_Invocation_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index e71ec09950f..433244598e1 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -61,38 +61,38 @@ public:
    * PortableInterceptor::ServerRequestInterceptor interface.
    */
   //@{
-  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));
 
-  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 receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
       PortableInterceptor::ServerRequestInfo_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/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index a4bf5a6112a..129bc080131 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -27,12 +27,12 @@ TAO_SSLIOP_ORBInitializer::TAO_SSLIOP_ORBInitializer (Security::QOP qop)
 void
 TAO_SSLIOP_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ORBInitInfo_var tao_info =
     TAO_ORBInitInfo::_narrow (info
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (tao_info.in ()))
@@ -63,14 +63,14 @@ TAO_SSLIOP_ORBInitializer::pre_init (
   // Register the SSLIOP::Current object reference with the ORB.
   info->register_initial_reference ("SSLIOPCurrent",
                                     ssliop_current.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_SSLIOP_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Note we do not store the SSLIOP::Current as a class member since
@@ -84,11 +84,11 @@ TAO_SSLIOP_ORBInitializer::post_init (
   // pre_init() method.
 
   CORBA::Object_var obj =
-    info->resolve_initial_references ("SSLIOPCurrent" TAO_ENV_ARG_PARAMETER);
+    info->resolve_initial_references ("SSLIOPCurrent" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   SSLIOP::Current_var ssliop_current =
-    SSLIOP::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+    SSLIOP::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (ssliop_current.in ()))
@@ -99,7 +99,7 @@ TAO_SSLIOP_ORBInitializer::post_init (
 
       if (tao_current != 0)
         {
-          size_t slot = this->get_tss_slot_id (info TAO_ENV_ARG_PARAMETER);
+          size_t slot = this->get_tss_slot_id (info ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           tao_current->tss_slot (slot);
@@ -128,27 +128,27 @@ TAO_SSLIOP_ORBInitializer::post_init (
   // Register the SSLIOP secure invocation server request interceptor
   // with the ORB.
   info->add_server_request_interceptor (si_interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Register the SSLIOP-specific vault with the
   // PrincipalAuthenticator.
   obj = info->resolve_initial_references ("SecurityManager"
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   SecurityLevel2::SecurityManager_var manager =
     SecurityLevel2::SecurityManager::_narrow (obj.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   SecurityLevel2::PrincipalAuthenticator_var pa =
-    manager->principal_authenticator (TAO_ENV_SINGLE_ARG_PARAMETER);
+    manager->principal_authenticator (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_PrincipalAuthenticator_var tao_pa =
     TAO_PrincipalAuthenticator::_narrow (pa.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   SecurityReplaceable::Vault_ptr vault;
@@ -160,25 +160,25 @@ TAO_SSLIOP_ORBInitializer::post_init (
   SecurityReplaceable::Vault_var safe_vault = vault;       // :-)
 
   tao_pa->register_vault (vault
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 size_t
 TAO_SSLIOP_ORBInitializer::get_tss_slot_id (
   PortableInterceptor::ORBInitInfo_ptr info
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   // Obtain the Security Service TSS slot ID from the SecurityCurrent
   // object.
   CORBA::Object_var obj =
     info->resolve_initial_references ("SecurityCurrent"
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   SecurityLevel2::Current_var current =
     SecurityLevel2::Current::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Security_Current *security_current =
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
index 874ec46fa91..1c610432e8e 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h
@@ -53,11 +53,11 @@ public:
   TAO_SSLIOP_ORBInitializer (Security::QOP qop);
 
   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));
 
 private:
@@ -65,7 +65,7 @@ private:
   // Obtain the TSS slot ID assigned to the "SSLIOPCurrent" object.
   size_t get_tss_slot_id (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp
index a28808b374b..08c2f808c35 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.cpp
@@ -14,7 +14,7 @@ TAO_SSLIOP_ReceivedCredentials::TAO_SSLIOP_ReceivedCredentials (X509 *cert,
 }
 
 SecurityLevel2::Credentials_ptr
-TAO_SSLIOP_ReceivedCredentials::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SSLIOP_ReceivedCredentials::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_SSLIOP_ReceivedCredentials *c = 0;
@@ -33,7 +33,7 @@ TAO_SSLIOP_ReceivedCredentials::copy (TAO_ENV_SINGLE_ARG_DECL)
 
 Security::InvocationCredentialsType
 TAO_SSLIOP_ReceivedCredentials::credentials_type (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Security::SecReceivedCredentials;
@@ -41,7 +41,7 @@ TAO_SSLIOP_ReceivedCredentials::credentials_type (
 
 SecurityLevel2::Credentials_ptr
 TAO_SSLIOP_ReceivedCredentials::accepting_credentials (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -54,7 +54,7 @@ TAO_SSLIOP_ReceivedCredentials::accepting_credentials (
 
 Security::AssociationOptions
 TAO_SSLIOP_ReceivedCredentials::association_options_used (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -69,7 +69,7 @@ TAO_SSLIOP_ReceivedCredentials::association_options_used (
 
 Security::DelegationState
 TAO_SSLIOP_ReceivedCredentials::delegation_state (
-  TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // It is not possible to perform credentials delegation with SSLIOP,
@@ -80,7 +80,7 @@ TAO_SSLIOP_ReceivedCredentials::delegation_state (
 
 Security::DelegationMode
 TAO_SSLIOP_ReceivedCredentials::delegation_mode (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // SSLIOP does not support delegation.
@@ -91,16 +91,16 @@ TAO_SSLIOP_ReceivedCredentials::delegation_mode (
 
 TAO_SSLIOP_ReceivedCredentials_ptr
 TAO_SSLIOP_ReceivedCredentials::_narrow (CORBA::Object_ptr obj
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
 {
   return
     TAO_SSLIOP_ReceivedCredentials::_unchecked_narrow (obj
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_SSLIOP_ReceivedCredentials_ptr
 TAO_SSLIOP_ReceivedCredentials::_unchecked_narrow (CORBA::Object_ptr obj
-                                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                                   ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     return TAO_SSLIOP_ReceivedCredentials::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h
index 820dce9b20a..778a6ac28ae 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ReceivedCredentials.h
@@ -52,11 +52,11 @@ public:
    */
   //@{
   virtual SecurityLevel2::Credentials_ptr copy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::InvocationCredentialsType credentials_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -68,19 +68,19 @@ public:
    */
   //@{
   virtual SecurityLevel2::Credentials_ptr accepting_credentials (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::AssociationOptions association_options_used (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::DelegationState delegation_state (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::DelegationMode delegation_mode (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -97,12 +97,12 @@ public:
 
   static TAO_SSLIOP_ReceivedCredentials_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
 
   static TAO_SSLIOP_ReceivedCredentials_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
 
   static TAO_SSLIOP_ReceivedCredentials_ptr _nil (void)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
index 4fd1c9b7c59..eff8dbf4820 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -15,7 +15,7 @@ TAO_SSLIOP_TargetCredentials::TAO_SSLIOP_TargetCredentials (X509 *cert,
 }
 
 SecurityLevel2::Credentials_ptr
-TAO_SSLIOP_TargetCredentials::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SSLIOP_TargetCredentials::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_SSLIOP_TargetCredentials *c = 0;
@@ -34,7 +34,7 @@ TAO_SSLIOP_TargetCredentials::copy (TAO_ENV_SINGLE_ARG_DECL)
 
 Security::InvocationCredentialsType
 TAO_SSLIOP_TargetCredentials::credentials_type (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Security::SecTargetCredentials;
@@ -42,7 +42,7 @@ TAO_SSLIOP_TargetCredentials::credentials_type (
 
 SecurityLevel2::Credentials_ptr
 TAO_SSLIOP_TargetCredentials::initiating_credentials (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -55,7 +55,7 @@ TAO_SSLIOP_TargetCredentials::initiating_credentials (
 
 Security::AssociationOptions
 TAO_SSLIOP_TargetCredentials::association_options_used (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -70,16 +70,16 @@ TAO_SSLIOP_TargetCredentials::association_options_used (
 
 TAO_SSLIOP_TargetCredentials_ptr
 TAO_SSLIOP_TargetCredentials::_narrow (CORBA::Object_ptr obj
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   return
     TAO_SSLIOP_TargetCredentials::_unchecked_narrow (obj
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_SSLIOP_TargetCredentials_ptr
 TAO_SSLIOP_TargetCredentials::_unchecked_narrow (CORBA::Object_ptr obj
-                                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     return TAO_SSLIOP_TargetCredentials::_nil ();
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
index c7057863cf6..7bf32d6c168 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
@@ -50,11 +50,11 @@ public:
    */
   //@{
   virtual SecurityLevel2::Credentials_ptr copy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::InvocationCredentialsType credentials_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -66,11 +66,11 @@ public:
    */
   //@{
   virtual SecurityLevel2::Credentials_ptr initiating_credentials (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::AssociationOptions association_options_used (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -87,12 +87,12 @@ public:
 
   static TAO_SSLIOP_TargetCredentials_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
 
   static TAO_SSLIOP_TargetCredentials_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
 
   static TAO_SSLIOP_TargetCredentials_ptr _nil (void)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
index 17f3c2aa201..834df616b15 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -19,7 +19,7 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core,
                                       TAO_IIOP_Properties *tcp_properties,
                                       TAO_SSLIOP_Connection_Handler_State &s)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Go straight to the object_ref_table in the ORB Core to avoid
@@ -29,12 +29,12 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core,
       CORBA::Object_var obj =
         orb_core->object_ref_table ().resolve_initial_references (
           "SSLIOPCurrent"
-          TAO_ENV_ARG_PARAMETER);
+          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       SSLIOP::Current_var current =
         SSLIOP::Current::_narrow (obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (current.in ()))
@@ -42,7 +42,7 @@ TAO_SSLIOP_Util::setup_handler_state (TAO_ORB_Core *orb_core,
 
       TAO_SSLIOP_Current_var tao_current =
         TAO_SSLIOP_Current::_narrow (current.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (tao_current.in ()))
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp
index be9c69c55d8..b98f379155f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.cpp
@@ -67,7 +67,7 @@ TAO_SSLIOP_Vault::~TAO_SSLIOP_Vault (void)
 Security::AuthenticationMethodList *
 TAO_SSLIOP_Vault::get_supported_authen_methods (
     const char * /* mechanism */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -79,7 +79,7 @@ TAO_SSLIOP_Vault::get_supported_authen_methods (
 }
 
 Security::OIDList *
-TAO_SSLIOP_Vault::supported_mech_oids (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SSLIOP_Vault::supported_mech_oids (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -100,7 +100,7 @@ TAO_SSLIOP_Vault::acquire_credentials (
     SecurityLevel2::Credentials_out creds,
     CORBA::Any_out /* continuation_data */,
     CORBA::Any_out /* auth_specific_data */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check if we support the given mechanism.
@@ -147,7 +147,7 @@ TAO_SSLIOP_Vault::continue_credentials_acquisition (
     SecurityLevel2::Credentials_ptr /* creds */,
     CORBA::Any_out /* continuation_data */,
     CORBA::Any_out /* auth_specific_data */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -161,7 +161,7 @@ TAO_SSLIOP_Vault::continue_credentials_acquisition (
 IOP::TaggedComponentList *
 TAO_SSLIOP_Vault::create_ior_components (
     SecurityLevel2::Credentials_ptr /* creds_list */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -184,7 +184,7 @@ TAO_SSLIOP_Vault::init_security_context (
     const Security::ChannelBindings & /* chan_binding */,
     Security::OpaqueBuffer_out /* security_token */,
     SecurityReplaceable::ClientSecurityContext_out /* security_context */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -201,7 +201,7 @@ TAO_SSLIOP_Vault::accept_security_context (
     const Security::ChannelBindings & /* chan_bindings */,
     const Security::Opaque & /* in_token */,
     Security::Opaque_out /* out_token */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -214,7 +214,7 @@ TAO_SSLIOP_Vault::accept_security_context (
 
 Security::MechandOptionsList *
 TAO_SSLIOP_Vault::get_supported_mechs (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h
index b8d61031994..ab699654a5a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Vault.h
@@ -66,11 +66,11 @@ public:
 
   virtual Security::AuthenticationMethodList * get_supported_authen_methods (
       const char * mechanism
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::OIDList * supported_mech_oids (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Authenticate the principal, request privileges and create
@@ -93,7 +93,7 @@ public:
       SecurityLevel2::Credentials_out creds,
       CORBA::Any_out continuation_data,
       CORBA::Any_out auth_specific_data
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::AuthenticationStatus continue_credentials_acquisition (
@@ -101,12 +101,12 @@ public:
         SecurityLevel2::Credentials_ptr creds,
         CORBA::Any_out continuation_data,
         CORBA::Any_out auth_specific_data
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IOP::TaggedComponentList * create_ior_components (
       SecurityLevel2::Credentials_ptr creds_list
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::AssociationStatus init_security_context (
@@ -120,7 +120,7 @@ public:
       const Security::ChannelBindings & chan_binding,
       Security::OpaqueBuffer_out security_token,
       SecurityReplaceable::ClientSecurityContext_out security_context
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::AssociationStatus accept_security_context (
@@ -128,11 +128,11 @@ public:
       const Security::ChannelBindings & chan_bindings,
       const Security::Opaque & in_token,
       Security::Opaque_out out_token
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Security::MechandOptionsList * get_supported_mechs (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index 8fdf9cde9ee..9b2933bf66b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -34,7 +34,7 @@ ACE_Config_Scheduler::~ACE_Config_Scheduler (void)
 
 RtecScheduler::handle_t
 ACE_Config_Scheduler::create (const char * entry_point
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME))
 {
@@ -86,7 +86,7 @@ ACE_Config_Scheduler::create (const char * entry_point
 
 RtecScheduler::handle_t
 ACE_Config_Scheduler::lookup (const char * entry_point
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecScheduler::RT_Info* rt_info = 0;
@@ -108,7 +108,7 @@ ACE_Config_Scheduler::lookup (const char * entry_point
 
 RtecScheduler::RT_Info*
 ACE_Config_Scheduler::get (RtecScheduler::handle_t handle
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
@@ -144,7 +144,7 @@ void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
                                 RtecScheduler::Quantum_t quantum,
                                 CORBA::Long threads,
                                 RtecScheduler::Info_Type_t info_type
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -176,7 +176,7 @@ void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
                                      RtecScheduler::OS_Priority& priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
@@ -193,14 +193,14 @@ void ACE_Config_Scheduler::entry_point_priority (const char * entry_point,
                                                  RtecScheduler::OS_Priority& priority,
                                                  RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                                  RtecScheduler::Preemption_Priority_t& p_priority
-                                                 TAO_ENV_ARG_DECL)
+                                                 ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED))
 {
-  this->priority (lookup (entry_point TAO_ENV_ARG_PARAMETER),
+  this->priority (lookup (entry_point ACE_ENV_ARG_PARAMETER),
                   priority, p_subpriority, p_priority
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
 }
 
 void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle,
@@ -208,7 +208,7 @@ void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle,
                                            CORBA::Long number_of_calls,
                                            RtecScheduler::Dependency_Type_t
                                              dependency_type
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -244,7 +244,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
                                                RtecScheduler::RT_Info_Set_out infos,
                                                RtecScheduler::Config_Info_Set_out configs,
                                                RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                               TAO_ENV_ARG_DECL_NOT_USED)
+                                               ACE_ENV_ARG_DECL_NOT_USED)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -445,7 +445,7 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
 void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                                    RtecScheduler::OS_Priority& priority,
                                                    RtecScheduler::Dispatching_Type_t & d_type
-                                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                                   ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
@@ -462,7 +462,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
 
 
 RtecScheduler::Preemption_Priority_t
-ACE_Config_Scheduler::last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ACE_Config_Scheduler::last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index ab2efe18810..7288bb466dc 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -37,15 +37,15 @@ public:
   virtual ~ACE_Config_Scheduler (void);
 
   virtual RtecScheduler::handle_t create (const char * entry_point
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
 
   virtual RtecScheduler::handle_t lookup (const char * entry_point
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException));
 
   virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void set (RtecScheduler::handle_t handle,
@@ -58,14 +58,14 @@ public:
                     RtecScheduler::Quantum_t quantum,
                     CORBA::Long threads,
                     RtecScheduler::Info_Type_t info_type
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
 
   virtual void priority (RtecScheduler::handle_t handle,
                          RtecScheduler::OS_Priority& priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                          RtecScheduler::Preemption_Priority_t& p_priority
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -74,7 +74,7 @@ public:
                                      RtecScheduler::OS_Priority& priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -83,7 +83,7 @@ public:
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
                                RtecScheduler::Dependency_Type_t dependency_type
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK));
 
@@ -92,7 +92,7 @@ public:
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Config_Info_Set_out configs,
                                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
@@ -101,14 +101,14 @@ public:
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& priority,
                                        RtecScheduler::Dispatching_Type_t & d_type
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
                     RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // provide the thread priority and queue type for the given priority level
 
   virtual RtecScheduler::Preemption_Priority_t
-      last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL)
+      last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED));
   // Returns the last priority number assigned to an operation in the
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index 22449341278..cd0d5ef21a5 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -88,7 +88,7 @@ TAO_Reconfig_Scheduler (int config_count,
       this->init (config_count, config_infos,
                   rt_info_count, rt_infos,
                   dependency_count, dependency_infos,
-                  stability_flags TAO_ENV_ARG_PARAMETER);
+                  stability_flags ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, corba_sysex)
@@ -110,7 +110,7 @@ init (int config_count,
       int dependency_count,
       ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
       u_long stability_flags
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::UNKNOWN_TASK,
@@ -124,7 +124,7 @@ init (int config_count,
   int result = 0;
 
   // Clear out the previous entries, if any.
-  this->close (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // (Re)initialize using the new settings.
@@ -185,7 +185,7 @@ init (int config_count,
     {
       new_rt_info = create_i (rt_info [num_rt_infos].entry_point,
                               rt_info [num_rt_infos].handle
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       // Fill in the portions to which the user has access.
@@ -218,7 +218,7 @@ init (int config_count,
                             dependency_info [dependency_count_].info_depended_on,
                             dependency_info [dependency_count_].number_of_calls,
                             dependency_info [dependency_count_].dependency_type
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
 
@@ -233,7 +233,7 @@ init (int config_count,
 
 // Closes the scheduler, releasing all current resources.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
-TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::close (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE))
@@ -306,7 +306,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 create (const char *entry_point
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::DUPLICATE_NAME,
                       RtecScheduler::INTERNAL,
@@ -317,7 +317,7 @@ create (const char *entry_point
   ACE_CHECK_RETURN (0);
 
   RtecScheduler::handle_t handle = next_handle_;
-  create_i (entry_point, handle TAO_ENV_ARG_PARAMETER);
+  create_i (entry_point, handle ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (handle);
 
   // Set affected stability flags.
@@ -335,7 +335,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 lookup (const char * entry_point
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE))
@@ -345,7 +345,7 @@ lookup (const char * entry_point
   ACE_CHECK_RETURN (0);
 
   RtecScheduler::handle_t handle;
-  handle = this->lookup_i (entry_point TAO_ENV_ARG_PARAMETER);
+  handle = this->lookup_i (entry_point ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (handle);
 
   return handle;
@@ -358,7 +358,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::RT_Info *
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 get (RtecScheduler::handle_t handle
-     TAO_ENV_ARG_DECL)
+     ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE))
@@ -402,7 +402,7 @@ set (RtecScheduler::handle_t handle,
      RtecScheduler::Quantum_t quantum,
      CORBA::Long threads,
      RtecScheduler::Info_Type_t info_type
-     TAO_ENV_ARG_DECL)
+     ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::INTERNAL,
@@ -506,7 +506,7 @@ priority (RtecScheduler::handle_t handle,
           RtecScheduler::OS_Priority& o_priority,
           RtecScheduler::Preemption_Subpriority_t& subpriority,
           RtecScheduler::Preemption_Priority_t& p_priority
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -545,7 +545,7 @@ entry_point_priority (const char * entry_point,
                       RtecScheduler::OS_Priority& priority,
                       RtecScheduler::Preemption_Subpriority_t& subpriority,
                       RtecScheduler::Preemption_Priority_t& p_priority
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -556,14 +556,14 @@ entry_point_priority (const char * entry_point,
   ACE_CHECK;
 
   RtecScheduler::handle_t handle =
-    this->lookup_i (entry_point TAO_ENV_ARG_PARAMETER);
+    this->lookup_i (entry_point ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->priority_i (handle,
                   priority,
                   subpriority,
                   p_priority
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -577,7 +577,7 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc
                 RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
                 CORBA::Long number_of_calls,
                 RtecScheduler::Dependency_Type_t dependency_type
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
                       RtecScheduler::UNKNOWN_TASK))
@@ -588,7 +588,7 @@ add_dependency (RtecScheduler::handle_t handle /* RT_Info that has the dependenc
 
   // Delegate to the internal method.
   add_dependency_i (handle, dependency, number_of_calls,
-                    dependency_type TAO_ENV_ARG_PARAMETER);
+                    dependency_type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Since the call graph topology has changed, set *all*
@@ -611,7 +611,7 @@ compute_scheduling (CORBA::Long minimum_priority,
                     RtecScheduler::RT_Info_Set_out infos,
                     RtecScheduler::Config_Info_Set_out configs,
                     RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -640,16 +640,16 @@ compute_scheduling (CORBA::Long minimum_priority,
   if (this->stability_flags_ & SCHED_PROPAGATION_NOT_STABLE)
     {
       // Traverse dependency graph, assigning a topological ordering and identifying threads.
-      dfs_traverse_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      dfs_traverse_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Sort an array of RT_info handles in topological order, check
       // for loops using the strongly connected components algorithm.
-      detect_cycles_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      detect_cycles_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Propagate effective execution time and period, set total frame size.
-      propagate_characteristics_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propagate_characteristics_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -658,14 +658,14 @@ compute_scheduling (CORBA::Long minimum_priority,
       // Sort operations by urgency (done by strategy), then
       // assign priorities and subpriorities in one pass.
       // Sets last scheduled priority.
-      assign_priorities_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      assign_priorities_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   if (this->stability_flags_ & SCHED_UTILIZATION_NOT_STABLE)
     {
       // Compute utilization, set last feasible priority.
-      compute_utilization_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      compute_utilization_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -737,7 +737,7 @@ TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                         RtecScheduler::OS_Priority& t_priority,
                         RtecScheduler::Dispatching_Type_t & d_type
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::NOT_SCHEDULED,
                       RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -773,7 +773,7 @@ dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::Preemption_Priority_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL)
+last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::NOT_SCHEDULED))
@@ -803,7 +803,7 @@ RtecScheduler::RT_Info *
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 create_i (const char *entry_point,
           RtecScheduler::handle_t handle
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::INTERNAL))
@@ -986,7 +986,7 @@ template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
 RtecScheduler::handle_t
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
 lookup_i (const char * entry_point
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
@@ -1009,7 +1009,7 @@ priority_i (RtecScheduler::handle_t handle,
             RtecScheduler::OS_Priority& o_priority,
             RtecScheduler::Preemption_Subpriority_t& subpriority,
             RtecScheduler::Preemption_Priority_t& p_priority
-            TAO_ENV_ARG_DECL)
+            ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK,
                       RtecScheduler::NOT_SCHEDULED))
@@ -1041,7 +1041,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                   RtecScheduler::handle_t dependency /* RT_Info on which it depends */,
                   CORBA::Long number_of_calls,
                   RtecScheduler::Dependency_Type_t dependency_type
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNKNOWN_TASK))
@@ -1065,7 +1065,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         calling_dependency_set_map_,   // calling map
                         number_of_calls,
                         dependency_type
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Add the called dependency map entry
@@ -1074,7 +1074,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         called_dependency_set_map_,    // called map
                         number_of_calls,
                         dependency_type
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       break;
@@ -1089,7 +1089,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         calling_dependency_set_map_,   // calling map
                         number_of_calls,
                         dependency_type
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Add the called dependency map entry
@@ -1098,7 +1098,7 @@ add_dependency_i (RtecScheduler::handle_t handle /* RT_Info that has the depende
                         called_dependency_set_map_,    // called map
                         number_of_calls,
                         dependency_type
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       break;
@@ -1124,7 +1124,7 @@ map_dependency_i (RtecScheduler::handle_t key,
                                           ACE_LOCK> & map,
                   CORBA::Long number_of_calls,
                   RtecScheduler::Dependency_Type_t dependency_type
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK))
 {
@@ -1162,7 +1162,7 @@ map_dependency_i (RtecScheduler::handle_t key,
 // has_unresolved_remote_dependencies_, has_unresolved_local_dependencies_,
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-dfs_traverse_i (TAO_ENV_SINGLE_ARG_DECL)
+dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL))
 {
@@ -1197,7 +1197,7 @@ dfs_traverse_i (TAO_ENV_SINGLE_ARG_DECL)
 // checks for loops, marks unresolved remote dependencies.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-detect_cycles_i (TAO_ENV_SINGLE_ARG_DECL)
+detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::CYCLIC_DEPENDENCIES))
@@ -1237,7 +1237,7 @@ detect_cycles_i (TAO_ENV_SINGLE_ARG_DECL)
 // Propagates effective execution time and period, sets total frame size.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-propagate_characteristics_i (TAO_ENV_SINGLE_ARG_DECL)
+propagate_characteristics_i (ACE_ENV_SINGLE_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES,
@@ -1275,7 +1275,7 @@ propagate_characteristics_i (TAO_ENV_SINGLE_ARG_DECL)
 // Sets last scheduled priority.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-assign_priorities_i (TAO_ENV_SINGLE_ARG_DECL)
+assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::DUPLICATE_NAME))
@@ -1383,7 +1383,7 @@ assign_priorities_i (TAO_ENV_SINGLE_ARG_DECL)
 // Compute utilization, set last feasible priority.
 template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> void
 TAO_Reconfig_Scheduler<RECONFIG_SCHED_STRATEGY, ACE_LOCK>::
-compute_utilization_i (TAO_ENV_SINGLE_ARG_DECL)
+compute_utilization_i (ACE_ENV_SINGLE_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index 3d5e7c090fd..d067452daf6 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -94,7 +94,7 @@ public:
             int dependency_count,
             ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
             u_long stability_flags
-            TAO_ENV_ARG_DECL)
+            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::UNKNOWN_TASK,
@@ -102,14 +102,14 @@ public:
                      RtecScheduler::INTERNAL));
   // Initializes the scheduler with the passed information.
 
-  void close (TAO_ENV_SINGLE_ARG_DECL)
+  void close (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE));
   // Closes the scheduler, releasing all current resources.
 
   virtual RtecScheduler::handle_t create (const char * entry_point
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::INTERNAL,
@@ -120,7 +120,7 @@ public:
   // is thrown.
 
   virtual RtecScheduler::handle_t lookup (const char * entry_point
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UNKNOWN_TASK,
                     RtecScheduler::SYNCHRONIZATION_FAILURE));
@@ -128,7 +128,7 @@ public:
   // value if it's not present.
 
   virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE));
@@ -144,7 +144,7 @@ public:
                     RtecScheduler::Quantum_t quantum,
                     CORBA::Long threads,
                     RtecScheduler::Info_Type_t info_type
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::INTERNAL,
@@ -155,7 +155,7 @@ public:
                          RtecScheduler::OS_Priority& o_priority,
                          RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                          RtecScheduler::Preemption_Priority_t& p_priority
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -167,7 +167,7 @@ public:
                                      RtecScheduler::OS_Priority& o_priority,
                                      RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                                      RtecScheduler::Preemption_Priority_t& p_priority
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -179,7 +179,7 @@ public:
                                RtecScheduler::handle_t dependency,
                                CORBA::Long number_of_calls,
                                RtecScheduler::Dependency_Type_t dependency_type
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_TASK));
@@ -190,7 +190,7 @@ public:
                                    RtecScheduler::RT_Info_Set_out infos,
                                    RtecScheduler::Config_Info_Set_out configs,
                                    RtecScheduler::Scheduling_Anomaly_Set_out anomalies
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
@@ -206,14 +206,14 @@ public:
   virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                        RtecScheduler::OS_Priority& o_priority,
                                        RtecScheduler::Dispatching_Type_t & d_type
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::NOT_SCHEDULED,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
   // Provides the thread priority and queue type for the given priority level.
 
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (TAO_ENV_SINGLE_ARG_DECL)
+  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::SYNCHRONIZATION_FAILURE,
                      RtecScheduler::NOT_SCHEDULED));
@@ -288,7 +288,7 @@ protected:
 
   virtual RtecScheduler::RT_Info * create_i (const char * entry_point,
                                              RtecScheduler::handle_t handle
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::DUPLICATE_NAME,
                      RtecScheduler::INTERNAL));
@@ -310,7 +310,7 @@ protected:
   // Internal method to set characteristics of the passed RT_Info.
 
   virtual RtecScheduler::handle_t lookup_i (const char * entry_point
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC((CORBA::SystemException,
                     RtecScheduler::UNKNOWN_TASK));
   // Internal method to look up a handle for an RT_Info, and return
@@ -320,7 +320,7 @@ protected:
                            RtecScheduler::OS_Priority& o_priority,
                            RtecScheduler::Preemption_Subpriority_t& p_subpriority,
                            RtecScheduler::Preemption_Priority_t& p_priority
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK,
                      RtecScheduler::NOT_SCHEDULED));
@@ -331,7 +331,7 @@ protected:
                                  RtecScheduler::handle_t dependency,
                                  CORBA::Long number_of_calls,
                                  RtecScheduler::Dependency_Type_t dependency_type
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::UNKNOWN_TASK));
@@ -349,33 +349,33 @@ protected:
                                           ACE_LOCK> &map,
                   CORBA::Long number_of_calls,
                   RtecScheduler::Dependency_Type_t dependency_type
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::UNKNOWN_TASK));
   // This method installs a dependency in a dependency set map.
 
 
-  virtual void dfs_traverse_i (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void dfs_traverse_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL));
   // Traverses dependency graph, assigning a topological ordering.
   // Resets DFS map entries, do DFS traversal, constructs DFS map.
 
-  virtual void detect_cycles_i (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void detect_cycles_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::CYCLIC_DEPENDENCIES));
   // Sorts an array of RT_info handles in topological order, then
   // checks for loops, marks unresolved remote dependencies.
 
-  virtual void propagate_characteristics_i (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void propagate_characteristics_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                       RtecScheduler::INTERNAL,
                       RtecScheduler::UNRESOLVED_LOCAL_DEPENDENCIES,
                       RtecScheduler::THREAD_SPECIFICATION));
   // Propagates effective execution time and period, sets total frame size.
 
-  virtual void assign_priorities_i (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void assign_priorities_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL,
                      RtecScheduler::DUPLICATE_NAME));
@@ -383,7 +383,7 @@ protected:
   // assign priorities and subpriorities in one pass.
   // Sets last scheduled priority.
 
-  virtual void compute_utilization_i (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void compute_utilization_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RtecScheduler::INTERNAL));
   // Compute utilization, set last feasible priority.
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 7c83d45c13d..091f2d250c9 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -86,10 +86,10 @@ static_server (void)
                        ACE_Null_Mutex>::instance ()) == 0)
         return 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      server_ = ace_scheduler_factory_data->scheduler_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server_ = ace_scheduler_factory_data->scheduler_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -122,7 +122,7 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming,
     // config runs.
     return 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CosNaming::Name schedule_name (1);
@@ -130,12 +130,12 @@ ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming,
       schedule_name[0].id = CORBA::string_dup (name);
       CORBA::Object_var objref =
         naming->resolve (schedule_name
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server_ =
         RtecScheduler::Scheduler::_narrow(objref.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp
index 33af822572f..0e88335606d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp
@@ -17,14 +17,14 @@ TAO_EstablishTrustPolicy::~TAO_EstablishTrustPolicy (void)
 }
 
 CORBA::PolicyType
-TAO_EstablishTrustPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EstablishTrustPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Security::SecEstablishTrustPolicy;
 }
 
 CORBA::Policy_ptr
-TAO_EstablishTrustPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_EstablishTrustPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_EstablishTrustPolicy *policy = 0;
@@ -41,13 +41,13 @@ TAO_EstablishTrustPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_EstablishTrustPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EstablishTrustPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 Security::EstablishTrust
-TAO_EstablishTrustPolicy::trust (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_EstablishTrustPolicy::trust (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->trust_;
diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h
index 5fd059b6a07..d83f0efe367 100644
--- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h
@@ -51,20 +51,20 @@ public:
    * @name CORBA::Policy Methods
    */
   //@{
-  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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));
   //@}
 
   /// Return the "establish trust" value associated with this
   /// policy.
   virtual Security::EstablishTrust trust (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp
index 9d724bd1bf1..08842a884d3 100644
--- a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.cpp
@@ -20,14 +20,14 @@ TAO_InvocationCredentialsPolicy::~TAO_InvocationCredentialsPolicy (void)
 
 CORBA::PolicyType
 TAO_InvocationCredentialsPolicy::policy_type (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Security::SecInvocationCredentialsPolicy;
 }
 
 CORBA::Policy_ptr
-TAO_InvocationCredentialsPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_InvocationCredentialsPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_InvocationCredentialsPolicy *policy = 0;
@@ -45,13 +45,13 @@ TAO_InvocationCredentialsPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_InvocationCredentialsPolicy::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 SecurityLevel2::CredentialsList *
-TAO_InvocationCredentialsPolicy::creds (TAO_ENV_SINGLE_ARG_DECL)
+TAO_InvocationCredentialsPolicy::creds (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   SecurityLevel2::CredentialsList *creds = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h
index 8f9fa4ef129..6482e1815a4 100644
--- a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h
@@ -57,20 +57,20 @@ public:
    */
   //@{
   virtual CORBA::PolicyType policy_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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));
   //@}
 
   /// Return the list of invocation credentials associated with this
   /// policy.
   virtual SecurityLevel2::CredentialsList * creds (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp
index b5be5045b7a..d5cb2b2d989 100644
--- a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.cpp
@@ -17,14 +17,14 @@ TAO_MechanismPolicy::~TAO_MechanismPolicy (void)
 }
 
 CORBA::PolicyType
-TAO_MechanismPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_MechanismPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Security::SecMechanismsPolicy;
 }
 
 CORBA::Policy_ptr
-TAO_MechanismPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_MechanismPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_MechanismPolicy *policy = 0;
@@ -41,13 +41,13 @@ TAO_MechanismPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_MechanismPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_MechanismPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 Security::MechanismTypeList *
-TAO_MechanismPolicy::mechanisms (TAO_ENV_SINGLE_ARG_DECL)
+TAO_MechanismPolicy::mechanisms (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Security::MechanismTypeList *mechs = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h
index 7a61ec97227..0e2785c53f9 100644
--- a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h
@@ -52,19 +52,19 @@ public:
    * @name CORBA::Policy Methods
    */
   //@{
-  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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));
   //@}
 
   /// Return the list of mechanism types associated with this policy.
   virtual Security::MechanismTypeList mechanisms (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp
index 8d7ae7ea699..f5f8d674bc3 100644
--- a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.cpp
@@ -32,7 +32,7 @@ TAO_PrincipalAuthenticator::~TAO_PrincipalAuthenticator (void)
 Security::AuthenticationMethodList *
 TAO_PrincipalAuthenticator::get_supported_authen_methods (
     const char * /* mechanism */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #if 0
@@ -77,7 +77,7 @@ TAO_PrincipalAuthenticator::authenticate (
     SecurityLevel2::Credentials_out creds,
     CORBA::Any_out continuation_data,
     CORBA::Any_out auth_specific_data
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Security::AuthenticationStatus status = Security::SecAuthFailure;
@@ -100,7 +100,7 @@ TAO_PrincipalAuthenticator::authenticate (
                                            creds,
                                            continuation_data,
                                            auth_specific_data
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (Security::SecAuthFailure);
 
       if (status == Security::SecAuthSuccess
@@ -111,7 +111,7 @@ TAO_PrincipalAuthenticator::authenticate (
   if (status == Security::SecAuthSuccess)
     {
       this->security_manager_->add_own_credentials (creds
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (Security::SecAuthFailure);
     }
 
@@ -124,7 +124,7 @@ TAO_PrincipalAuthenticator::continue_authentication (
     SecurityLevel2::Credentials_ptr creds,
     CORBA::Any_out continuation_data,
     CORBA::Any_out auth_specific_data
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Security::AuthenticationStatus status = Security::SecAuthFailure;
@@ -144,7 +144,7 @@ TAO_PrincipalAuthenticator::continue_authentication (
                                                  creds,
                                                  continuation_data,
                                                  auth_specific_data
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (Security::SecAuthFailure);
 
       if (status == Security::SecAuthSuccess
@@ -155,7 +155,7 @@ TAO_PrincipalAuthenticator::continue_authentication (
   if (status == Security::SecAuthSuccess)
     {
       this->security_manager_->add_own_credentials (creds
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (Security::SecAuthFailure);
     }
 
@@ -165,7 +165,7 @@ TAO_PrincipalAuthenticator::continue_authentication (
 void
 TAO_PrincipalAuthenticator::register_vault (
   SecurityReplaceable::Vault_ptr vault
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   if (!CORBA::is_nil (vault))
     {
@@ -207,10 +207,10 @@ tao_TAO_PrincipalAuthenticator_nil (
 TAO_PrincipalAuthenticator_ptr
 tao_TAO_PrincipalAuthenticator_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return TAO_PrincipalAuthenticator::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return TAO_PrincipalAuthenticator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -333,10 +333,10 @@ TAO_PrincipalAuthenticator_var::tao_nil (void)
 ::TAO_PrincipalAuthenticator_ptr
 TAO_PrincipalAuthenticator_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::TAO_PrincipalAuthenticator::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::TAO_PrincipalAuthenticator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -410,17 +410,17 @@ TAO_PrincipalAuthenticator_out::operator-> (void)
 TAO_PrincipalAuthenticator_ptr
 TAO_PrincipalAuthenticator::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   return
     TAO_PrincipalAuthenticator::_unchecked_narrow (obj
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_PrincipalAuthenticator_ptr
 TAO_PrincipalAuthenticator::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
 {
   if (CORBA::is_nil (obj))
diff --git a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h
index 82b6feb7269..36601d95469 100644
--- a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h
+++ b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h
@@ -62,7 +62,7 @@ public:
   /// mechanism.
   virtual Security::AuthenticationMethodList * get_supported_authen_methods (
       const char * mechanism
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Authenticate the principal, request privileges and create
@@ -85,7 +85,7 @@ public:
       SecurityLevel2::Credentials_out creds,
       CORBA::Any_out continuation_data,
       CORBA::Any_out auth_specific_data
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Continue partially completed authentication process.
@@ -94,7 +94,7 @@ public:
       SecurityLevel2::Credentials_ptr creds,
       CORBA::Any_out continuation_data,
       CORBA::Any_out auth_specific_data
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -105,7 +105,7 @@ public:
    * @note This is a TAO-specific extension.
    */
   void register_vault (SecurityReplaceable::Vault_ptr vault
-                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * @name Downcast Related Methods
@@ -126,12 +126,12 @@ public:
 
   static TAO_PrincipalAuthenticator_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
 
   static TAO_PrincipalAuthenticator_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
 
   static TAO_PrincipalAuthenticator_ptr _nil (void)
@@ -193,7 +193,7 @@ public:
   static TAO_PrincipalAuthenticator_ptr tao_nil (void);
   static TAO_PrincipalAuthenticator_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp
index 7cf77b5dc24..647c40061fc 100644
--- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp
@@ -16,14 +16,14 @@ TAO_QOPPolicy::~TAO_QOPPolicy (void)
 }
 
 CORBA::PolicyType
-TAO_QOPPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_QOPPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Security::SecQOPPolicy;
 }
 
 CORBA::Policy_ptr
-TAO_QOPPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_QOPPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_QOPPolicy *policy = 0;
@@ -40,13 +40,13 @@ TAO_QOPPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_QOPPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_QOPPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 Security::QOP
-TAO_QOPPolicy::qop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_QOPPolicy::qop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->qop_;
diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h
index 0579628d355..8af3d440076 100644
--- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h
@@ -51,19 +51,19 @@ public:
    * @name CORBA::Policy Methods
    */
   //@{
-  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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));
   //@}
 
   /// Return the Quality-of-Protection value associated with this
   /// policy.
-  virtual Security::QOP qop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual Security::QOP qop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp
index ed5f8993976..28ccaa60bbd 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.cpp
@@ -21,7 +21,7 @@ TAO_SecurityManager::~TAO_SecurityManager (void)
 }
 
 Security::MechandOptionsList *
-TAO_SecurityManager::supported_mechanisms (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SecurityManager::supported_mechanisms (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -33,7 +33,7 @@ TAO_SecurityManager::supported_mechanisms (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 SecurityLevel2::CredentialsList *
-TAO_SecurityManager::own_credentials (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SecurityManager::own_credentials (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
@@ -55,7 +55,7 @@ TAO_SecurityManager::own_credentials (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 SecurityLevel2::RequiredRights_ptr
-TAO_SecurityManager::required_rights_object (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SecurityManager::required_rights_object (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -67,7 +67,7 @@ TAO_SecurityManager::required_rights_object (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 SecurityLevel2::PrincipalAuthenticator_ptr
-TAO_SecurityManager::principal_authenticator (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SecurityManager::principal_authenticator (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
@@ -98,7 +98,7 @@ TAO_SecurityManager::principal_authenticator (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 SecurityLevel2::AccessDecision_ptr
-TAO_SecurityManager::access_decision (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SecurityManager::access_decision (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -110,7 +110,7 @@ TAO_SecurityManager::access_decision (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 SecurityLevel2::AuditDecision_ptr
-TAO_SecurityManager::audit_decision (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SecurityManager::audit_decision (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -123,7 +123,7 @@ TAO_SecurityManager::audit_decision (TAO_ENV_SINGLE_ARG_DECL)
 
 SecurityLevel2::TargetCredentials_ptr
 TAO_SecurityManager::get_target_credentials (CORBA::Object_ptr /* obj_ref */
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -137,7 +137,7 @@ TAO_SecurityManager::get_target_credentials (CORBA::Object_ptr /* obj_ref */
 void
 TAO_SecurityManager::remove_own_credentials (
     SecurityLevel2::Credentials_ptr creds
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
@@ -172,7 +172,7 @@ TAO_SecurityManager::remove_own_credentials (
 
 CORBA::Policy_ptr
 TAO_SecurityManager::get_security_policy (CORBA::PolicyType /* policy_type */
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -185,7 +185,7 @@ TAO_SecurityManager::get_security_policy (CORBA::PolicyType /* policy_type */
 
 void
 TAO_SecurityManager::add_own_credentials (SecurityLevel2::Credentials_ptr creds
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h
index 9260e4f3565..15667932dc1 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h
@@ -52,13 +52,13 @@ public:
   /// Return a sequence containing the security mechanisms supported
   /// by the Security Service.
   virtual Security::MechandOptionsList * supported_mechanisms (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the list of Credentials currently associated with the
   /// application itself, i.e. its own credentials.
   virtual SecurityLevel2::CredentialsList * own_credentials (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return a reference to the RequiredRights object.
@@ -68,7 +68,7 @@ public:
    * control.
    */
   virtual SecurityLevel2::RequiredRights_ptr required_rights_object (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return a reference to the PrincipalAuthenticator object.
@@ -77,7 +77,7 @@ public:
    * create credentials for them.
    */
   virtual SecurityLevel2::PrincipalAuthenticator_ptr principal_authenticator (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return a reference to the AccessDecision object.
@@ -86,7 +86,7 @@ public:
    * of objects.
    */
   virtual SecurityLevel2::AccessDecision_ptr access_decision (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return a reference to the AuditDecision object.
@@ -95,14 +95,14 @@ public:
    * be audited for a given object.
    */
   virtual SecurityLevel2::AuditDecision_ptr audit_decision (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the TargetCredentials associated with the given object
   /// reference.
   virtual SecurityLevel2::TargetCredentials_ptr get_target_credentials (
       CORBA::Object_ptr obj_ref
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Remove the given credential from the application's own
@@ -114,14 +114,14 @@ public:
    */
   virtual void remove_own_credentials (
       SecurityLevel2::Credentials_ptr creds
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the security policy currently in effect corresponding to
   /// the given policy type.
   virtual CORBA::Policy_ptr get_security_policy (
       CORBA::PolicyType policy_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -138,7 +138,7 @@ public:
    * when credentials are created and authenticated.
    */
   void add_own_credentials (SecurityLevel2::Credentials_ptr creds
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   //@}
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
index bccb5842a4d..d0cb2584117 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -26,7 +26,7 @@ TAO_Security_Current::~TAO_Security_Current (void)
 Security::AttributeList *
 TAO_Security_Current::get_attributes (
     const Security::AttributeTypeList &attributes
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Security_Current_Impl *impl = this->implementation ();
@@ -37,12 +37,12 @@ TAO_Security_Current::get_attributes (
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 
-  return impl->get_attributes (attributes TAO_ENV_ARG_PARAMETER);
+  return impl->get_attributes (attributes ACE_ENV_ARG_PARAMETER);
 }
 
 SecurityLevel2::ReceivedCredentials_ptr
 TAO_Security_Current::received_credentials (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Security_Current_Impl *impl = this->implementation ();
@@ -53,7 +53,7 @@ TAO_Security_Current::received_credentials (
   if (impl == 0)
     ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 
-  return impl->received_credentials (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return impl->received_credentials (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
@@ -61,7 +61,7 @@ TAO_Security_Current::init (void)
 {
   int result = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       int argc = 0;
@@ -69,7 +69,7 @@ TAO_Security_Current::init (void)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             this->orb_id_.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->orb_core_ = orb.in ()->orb_core ();
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
index 2dd683bf77c..afe05f12842 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
@@ -63,7 +63,7 @@ public:
   /// given attribute type list associated with the current request.
   virtual Security::AttributeList * get_attributes (
       const Security::AttributeTypeList & attributes
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -77,7 +77,7 @@ public:
   /// Return the Credentials received from the client associate with
   /// the current request.
   virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index a911373a459..6de0cea0c47 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -53,7 +53,7 @@ public:
   /// given attribute type list associated with the current request.
   virtual Security::AttributeList * get_attributes (
       const Security::AttributeTypeList & attributes
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   //@}
 
@@ -67,7 +67,7 @@ public:
   /// Return the Credentials received from the client associate with
   /// the current request.
   virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index c7377f36b48..552bd7a9e6f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -17,13 +17,13 @@ ACE_RCSID (TAO_Security,
 void
 TAO_Security_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // allocate_tss_slot_id() TAO extension.
   TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (tao_info.in ()))
@@ -41,10 +41,10 @@ TAO_Security_ORBInitializer::pre_init (
   // Reserve a TSS slot in the ORB core internal TSS resources for the
   // thread-specific portion of Security::Current.
   size_t tss_slot = tao_info->allocate_tss_slot_id (0
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var orb_id = info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the SecurityLevel2::Current object.
@@ -64,7 +64,7 @@ TAO_Security_ORBInitializer::pre_init (
   // ORB.
   info->register_initial_reference ("SecurityCurrent",
                                     security_current.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the SecurityLevel2::SecurityManager object.
@@ -85,25 +85,25 @@ TAO_Security_ORBInitializer::pre_init (
   // ORB.
   info->register_initial_reference ("SecurityManager",
                                     security_manager.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_Security_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_Security_ORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   // Register the security policy factories.
 
@@ -121,37 +121,37 @@ TAO_Security_ORBInitializer::register_policy_factories (
   type = Security::SecQOPPolicy;
   info->register_policy_factory (type,
                                  policy_factory
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = Security::SecMechanismsPolicy;
   info->register_policy_factory (type,
                                  policy_factory
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = Security::SecInvocationCredentialsPolicy;
   info->register_policy_factory (type,
                                  policy_factory
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = Security::SecFeaturePolicy;   // Deprecated
   info->register_policy_factory (type,
                                  policy_factory
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = Security::SecDelegationDirectivePolicy;
   info->register_policy_factory (type,
                                  policy_factory
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = Security::SecEstablishTrustPolicy;
   info->register_policy_factory (type,
                                  policy_factory
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // ----------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
index af1aecce473..d7d0d4490e5 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h
@@ -48,11 +48,11 @@ class TAO_Security_Export TAO_Security_ORBInitializer
 public:
 
   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));
 
 private:
@@ -60,7 +60,7 @@ private:
   /// Register Security policy factories.
   void register_policy_factories (
          PortableInterceptor::ORBInitInfo_ptr info
-         TAO_ENV_ARG_DECL);
+         ACE_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 6d69fbbcd95..ee11a590271 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -15,7 +15,7 @@ CORBA::Policy_ptr
 TAO_Security_PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &value
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
index f0f5b66640e..d5c4a57571b 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h
@@ -43,7 +43,7 @@ public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                            const CORBA::Any & value
-                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index f1e64ebe556..0da9f75664f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -19,7 +19,7 @@ TAO_TIO::~TAO_TIO (void)
 // This is the get method for the attribute time interval.
 
 TimeBase::IntervalT
-TAO_TIO::time_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TIO::time_interval (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_time_interval;
@@ -34,7 +34,7 @@ TAO_TIO::time_interval (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 CosTime::OverlapType
 TAO_TIO::spans (CosTime::UTO_ptr uto,
                 CosTime::TIO_out overlap
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
@@ -47,19 +47,19 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
       TimeBase::TimeT up1 =
         this->time_interval ().upper_bound;
 
-      TimeBase::TimeT tmp1 = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER);
+      TimeBase::TimeT tmp1 = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      TimeBase::TimeT tmp2 = uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      TimeBase::TimeT tmp2 = uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TimeBase::TimeT lb2 = tmp1 - tmp2;
 
 
-      tmp1 = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER);
+      tmp1 = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      tmp2 = uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      tmp2 = uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TimeBase::TimeT up2 = tmp1 + tmp2;
@@ -155,7 +155,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
 CosTime::OverlapType
 TAO_TIO::overlaps (CosTime::TIO_ptr tio,
                    CosTime::TIO_out overlap
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio_i = 0;
@@ -254,7 +254,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
 }
 
 CosTime::UTO_ptr
-TAO_TIO::time (TAO_ENV_SINGLE_ARG_DECL)
+TAO_TIO::time (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index a9ed61cf860..a6dc5388edc 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -46,13 +46,13 @@ public:
   // Destructor.
 
   virtual TimeBase::IntervalT  time_interval (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This is the get method for the attribute time interval.
 
   virtual CosTime::OverlapType spans (CosTime::UTO_ptr time,
                                       CosTime::TIO_out overlap
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns a value of type OverlapType depending on
   // how the interval in the object and the time range represented by
@@ -63,7 +63,7 @@ public:
 
   virtual CosTime::OverlapType overlaps (CosTime::TIO_ptr interval,
                                          CosTime::TIO_out overlap
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This operation returns a value of type OverlapType depending on
   // how the interval in the object and interval in the parameter TIO
@@ -71,7 +71,7 @@ public:
   // parameter overlap contains the overlap interval, otherwise the
   // out parameter contains the gap between the two intervals.
 
-  virtual CosTime::UTO_ptr time (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CosTime::UTO_ptr time (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a UTO in which the inaccuracy interval is equal to the
   // time interval in the TIO and time value is the midpoint of the
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index 2f9616ef174..30344431070 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -37,7 +37,7 @@ TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void)
 // in a UTO.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Clerk::universal_time (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Time_Service_Clerk::universal_time (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
@@ -59,7 +59,7 @@ TAO_Time_Service_Clerk::universal_time (TAO_ENV_SINGLE_ARG_DECL)
 // implemented currently.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Clerk::secure_universal_time (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Time_Service_Clerk::secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
@@ -72,7 +72,7 @@ CosTime::UTO_ptr
 TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
                                             TimeBase::InaccuracyT inaccuracy,
                                             TimeBase::TdfT tdf
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -90,7 +90,7 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
 
 CosTime::UTO_ptr
 TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -116,7 +116,7 @@ TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc
 CosTime::TIO_ptr
 TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower,
                                       TimeBase::TimeT upper
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index 083f8a8c3b6..16de6ba9bc0 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -57,13 +57,13 @@ public:
   ~TAO_Time_Service_Clerk (void);
   // Destructor.
 
-  virtual CosTime::UTO_ptr universal_time (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CosTime::UTO_ptr universal_time (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable));
   // This operation returns the global time and an estimate of
   // inaccuracy in a UTO.
 
-  virtual CosTime::UTO_ptr secure_universal_time (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CosTime::UTO_ptr secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable));
   // This operation returns the global time in a UTO only if the time
@@ -74,18 +74,18 @@ public:
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
                                                TimeBase::InaccuracyT inaccuracy,
                                                TimeBase::TdfT tdf
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This creates a new UTO based on the given parameters.
 
   virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This creates a new UTO given a time in the UtcT form.
 
   virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower,
                                          TimeBase::TimeT upper
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This creates a new TIO with the given parameters.
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index 5ba026e5798..9fc02513790 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -19,7 +19,7 @@ TAO_Time_Service_Server::~TAO_Time_Service_Server (void)
 // inaccuracy in a UTO.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Server::universal_time (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Time_Service_Server::universal_time (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
@@ -74,7 +74,7 @@ TAO_Time_Service_Server::universal_time (TAO_ENV_SINGLE_ARG_DECL)
 // implemented currently.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Server::secure_universal_time (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Time_Service_Server::secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable))
 {
@@ -87,7 +87,7 @@ CosTime::UTO_ptr
 TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
                                              TimeBase::InaccuracyT inaccuracy,
                                              TimeBase::TdfT tdf
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -107,7 +107,7 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
 
 CosTime::UTO_ptr
 TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_UTO *uto = 0;
@@ -126,7 +126,7 @@ TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc
 CosTime::TIO_ptr
 TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower,
                                        TimeBase::TimeT upper
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index 62215491365..095e3be0a68 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -45,13 +45,13 @@ public:
   ~TAO_Time_Service_Server (void);
   // Destructor.
 
-  virtual CosTime::UTO_ptr universal_time (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CosTime::UTO_ptr universal_time (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable));
   // This operation returns the current system time and an estimate of
   // inaccuracy in a UTO.
 
-  virtual CosTime::UTO_ptr secure_universal_time (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CosTime::UTO_ptr secure_universal_time (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTime::TimeUnavailable));
   // This operation returns the current time in a UTO only if the time
@@ -61,18 +61,18 @@ public:
   virtual CosTime::UTO_ptr new_universal_time (TimeBase::TimeT time,
                                                TimeBase::InaccuracyT inaccuracy,
                                                TimeBase::TdfT tdf
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This creates a new UTO based on the given parameters.
 
   virtual CosTime::UTO_ptr uto_from_utc (const TimeBase::UtcT &utc
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This creates a new UTO given a time in the UtcT form.
 
   virtual CosTime::TIO_ptr new_interval (TimeBase::TimeT lower,
                                          TimeBase::TimeT upper
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This creates a new TIO with the given parameters.
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index 5b2595df2fd..defc778d3db 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -42,7 +42,7 @@ TAO_UTO::~TAO_UTO (void)
 // Get Method for the readonly attribute time.
 
 TimeBase::TimeT
-TAO_UTO::time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_.time;
@@ -51,7 +51,7 @@ TAO_UTO::time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Get method for the readonly attribute inaccuracy.
 
 TimeBase::InaccuracyT
-TAO_UTO::inaccuracy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::inaccuracy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Construct the Inaccuracy from the
@@ -66,7 +66,7 @@ TAO_UTO::inaccuracy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Get method for the readonly attribute tdf.
 
 TimeBase::TdfT
-TAO_UTO::tdf (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::tdf (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_.tdf;
@@ -75,7 +75,7 @@ TAO_UTO::tdf (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Get method for the readonly attribute utc_time.
 
 TimeBase::UtcT
-TAO_UTO::utc_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::utc_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return attr_utc_time_;
@@ -85,7 +85,7 @@ TAO_UTO::utc_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 // the Base Time, UTC and Distributed Time Sync. Algos. [3].
 
 CosTime::UTO_ptr
-TAO_UTO::absolute_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UTO::absolute_time (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
@@ -97,20 +97,20 @@ TAO_UTO::absolute_time (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 CosTime::TimeComparison
 TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
                        CosTime::UTO_ptr uto
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      TimeBase::TimeT uto_time = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER);
+      TimeBase::TimeT uto_time = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
        TimeBase::InaccuracyT this_inaccuracy =
-         this->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER);
+         this->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
        ACE_TRY_CHECK;
 
        TimeBase::InaccuracyT uto_inaccuracy =
-         uto->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER);
+         uto->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
        ACE_TRY_CHECK;
 
       if (comparison_type == CosTime::MidC)
@@ -172,14 +172,14 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
 
 CosTime::TIO_ptr
 TAO_UTO::time_to_interval (CosTime::UTO_ptr uto
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
 
   ACE_TRY
     {
-      TimeBase::TimeT uto_time = uto->time (TAO_ENV_SINGLE_ARG_PARAMETER);
+      TimeBase::TimeT uto_time = uto->time (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->time () > uto_time)
@@ -216,7 +216,7 @@ TAO_UTO::time_to_interval (CosTime::UTO_ptr uto
 // time value in the UTO.
 
 CosTime::TIO_ptr
-TAO_UTO::interval (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UTO::interval (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TIO *tio = 0;
@@ -224,7 +224,7 @@ TAO_UTO::interval (TAO_ENV_SINGLE_ARG_DECL)
   ACE_TRY
     {
       TimeBase::TimeT this_inaccuracy =
-          this->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TimeBase::TimeT lower =
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
index 4c57b221c4c..3c742d610cd 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -56,24 +56,24 @@ public:
   // Destructor.
 
   virtual TimeBase::TimeT time (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // For the readonly attribute <time>.
 
-  virtual TimeBase::InaccuracyT  inaccuracy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual TimeBase::InaccuracyT  inaccuracy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // For the readonly attribute <inaccuracy>.
 
-  virtual TimeBase::TdfT tdf (TAO_ENV_SINGLE_ARG_DECL)
+  virtual TimeBase::TdfT tdf (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // For the readonly attribute <tdf>, which is the "time displacement
   // factor".
 
-  virtual TimeBase::UtcT utc_time (TAO_ENV_SINGLE_ARG_DECL)
+  virtual TimeBase::UtcT utc_time (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // For the readonly attribute <utc_time>.
 
-  CosTime::UTO_ptr absolute_time (TAO_ENV_SINGLE_ARG_DECL)
+  CosTime::UTO_ptr absolute_time (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Absolute time = Relative time + Base time.
   // ?? Find out more about the Base Time, UTC and
@@ -81,13 +81,13 @@ public:
 
   CosTime::TimeComparison compare_time (CosTime::ComparisonType comparison_type,
                                         CosTime::UTO_ptr uto
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Compares the time contained in the object with the time in the
   // supplied uto according to the supplied comparison type.
 
   CosTime::TIO_ptr time_to_interval (CosTime::UTO_ptr
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a TIO representing the time interval between the time in
   // the object and the time in the UTO passed as a parameter. The
@@ -95,7 +95,7 @@ public:
   // two UTOs. Inaccuracies are ignored.  Note the result of this
   // operation is meaningless if the base times of UTOs are different.
 
-  CosTime::TIO_ptr interval (TAO_ENV_SINGLE_ARG_DECL)
+  CosTime::TIO_ptr interval (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a TIO object representing the error interval around the
   // time value in the UTO.
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index 7b7dac9aa22..88503f94415 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -52,7 +52,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
 
           // This is a remote call.
           CosTime::UTO_var UTO_server =
-            (*value)->universal_time (TAO_ENV_SINGLE_ARG_PARAMETER);
+            (*value)->universal_time (ACE_ENV_SINGLE_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -83,7 +83,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
                       (UTO_server->utc_time ()).tdf));
           #endif
 
-          CORBA::ULongLong curr_server_time = UTO_server->time (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::ULongLong curr_server_time = UTO_server->time (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           sum += curr_server_time;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
index 85267dc9f6c..af62d1644bb 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(Trader, Constraint_Interpreter, "$Id$")
 TAO_Constraint_Interpreter::
 TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
                             const char* constraints
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                    CORBA::NO_MEMORY))
   : TAO_Interpreter ()
@@ -38,7 +38,7 @@ TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeSt
 TAO_Constraint_Interpreter::
 TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
                            const char* constraints
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                    CORBA::NO_MEMORY))
 {
@@ -79,7 +79,7 @@ TAO_Constraint_Interpreter::evaluate (TAO_Constraint_Evaluator& evaluator)
 TAO_Preference_Interpreter::
 TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
                            const char* preference
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                    CORBA::NO_MEMORY))
     : TAO_Interpreter ()
@@ -106,7 +106,7 @@ TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeSt
 TAO_Preference_Interpreter::
 TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
                            const char* preference
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                    CORBA::NO_MEMORY))
     : TAO_Interpreter ()
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index e34d1af6cf1..fbac7c13a9c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -49,13 +49,13 @@ public:
   // = Initialization and termination methods.
   TAO_Constraint_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
                               const char* constraints
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                      CORBA::NO_MEMORY));
 
   TAO_Constraint_Interpreter (TAO_Constraint_Validator& validator,
                               const char* constraints
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalConstraint,
                      CORBA::NO_MEMORY));
   // This constructor builds an expression tree representing the
@@ -92,13 +92,13 @@ public:
   // = Initialization and termination methods.
   TAO_Preference_Interpreter (const CosTradingRepos::ServiceTypeRepository::TypeStruct& ts,
                               const char* preference
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                      CORBA::NO_MEMORY));
 
   TAO_Preference_Interpreter (TAO_Constraint_Validator& validator,
                               const char* preference
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPreference,
                      CORBA::NO_MEMORY));
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index e7bc02db9c9..fc823d74205 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -39,7 +39,7 @@ TAO_Binary_Constraint::~TAO_Binary_Constraint (void)
 
 // Dispatch table for the accept method
 static int (*dispatch_table[]) (TAO_Constraint_Visitor*,
-				 TAO_Binary_Constraint*)=
+                                 TAO_Binary_Constraint*)=
 {
   TAO_Binary_Constraint::visit_greater_than,
   TAO_Binary_Constraint::visit_greater_than_equal,
@@ -77,7 +77,7 @@ TAO_Binary_Constraint::accept (TAO_Constraint_Visitor* visitor)
 int
 TAO_Binary_Constraint::
 visit_or (TAO_Constraint_Visitor* visitor,
-		  TAO_Binary_Constraint* expr)
+                  TAO_Binary_Constraint* expr)
 {
   return visitor->visit_or (expr);
 }
@@ -93,7 +93,7 @@ visit_and (TAO_Constraint_Visitor* visitor,
 int
 TAO_Binary_Constraint::
 visit_less_than (TAO_Constraint_Visitor* visitor,
-		TAO_Binary_Constraint* expr)
+                TAO_Binary_Constraint* expr)
 {
   return visitor->visit_less_than (expr);
 }
@@ -101,7 +101,7 @@ visit_less_than (TAO_Constraint_Visitor* visitor,
 int
 TAO_Binary_Constraint::
 visit_less_than_equal (TAO_Constraint_Visitor* visitor,
-		      TAO_Binary_Constraint* expr)
+                      TAO_Binary_Constraint* expr)
 {
   return visitor->visit_less_than_equal (expr);
 }
@@ -109,7 +109,7 @@ visit_less_than_equal (TAO_Constraint_Visitor* visitor,
 int
 TAO_Binary_Constraint::
 visit_greater_than (TAO_Constraint_Visitor* visitor,
-		   TAO_Binary_Constraint* expr)
+                   TAO_Binary_Constraint* expr)
 {
   return visitor->visit_greater_than (expr);
 }
@@ -117,7 +117,7 @@ visit_greater_than (TAO_Constraint_Visitor* visitor,
 int
 TAO_Binary_Constraint::
 visit_greater_than_equal (TAO_Constraint_Visitor* visitor,
-			 TAO_Binary_Constraint* expr)
+                         TAO_Binary_Constraint* expr)
 {
   return visitor->visit_greater_than_equal (expr);
 }
@@ -125,7 +125,7 @@ visit_greater_than_equal (TAO_Constraint_Visitor* visitor,
 int
 TAO_Binary_Constraint::
 visit_equal (TAO_Constraint_Visitor* visitor,
-	    TAO_Binary_Constraint* expr)
+            TAO_Binary_Constraint* expr)
 {
   return visitor->visit_equal (expr);
 }
@@ -133,7 +133,7 @@ visit_equal (TAO_Constraint_Visitor* visitor,
 int
 TAO_Binary_Constraint::
 visit_not_equal (TAO_Constraint_Visitor* visitor,
-		TAO_Binary_Constraint* expr)
+                TAO_Binary_Constraint* expr)
 {
   return visitor->visit_not_equal (expr);
 }
@@ -141,7 +141,7 @@ visit_not_equal (TAO_Constraint_Visitor* visitor,
 int
 TAO_Binary_Constraint::
 visit_add (TAO_Constraint_Visitor* visitor,
-	  TAO_Binary_Constraint* expr)
+          TAO_Binary_Constraint* expr)
 {
   return visitor->visit_add (expr);
 }
@@ -149,7 +149,7 @@ visit_add (TAO_Constraint_Visitor* visitor,
 int
 TAO_Binary_Constraint::
 visit_sub (TAO_Constraint_Visitor* visitor,
-	  TAO_Binary_Constraint* expr)
+          TAO_Binary_Constraint* expr)
 {
   return visitor->visit_sub (expr);
 }
@@ -157,7 +157,7 @@ visit_sub (TAO_Constraint_Visitor* visitor,
 int
 TAO_Binary_Constraint::
 visit_mult (TAO_Constraint_Visitor* visitor,
-	   TAO_Binary_Constraint* expr)
+           TAO_Binary_Constraint* expr)
 {
   return visitor->visit_mult (expr);
 }
@@ -165,7 +165,7 @@ visit_mult (TAO_Constraint_Visitor* visitor,
 int
 TAO_Binary_Constraint::
 visit_div (TAO_Constraint_Visitor* visitor,
-	  TAO_Binary_Constraint* expr)
+          TAO_Binary_Constraint* expr)
 {
   return visitor->visit_div (expr);
 }
@@ -173,7 +173,7 @@ visit_div (TAO_Constraint_Visitor* visitor,
 int
 TAO_Binary_Constraint::
 visit_twiddle (TAO_Constraint_Visitor* visitor,
-	      TAO_Binary_Constraint* expr)
+              TAO_Binary_Constraint* expr)
 {
   return visitor->visit_twiddle (expr);
 }
@@ -181,7 +181,7 @@ visit_twiddle (TAO_Constraint_Visitor* visitor,
 int
 TAO_Binary_Constraint::
 visit_in (TAO_Constraint_Visitor* visitor,
-	 TAO_Binary_Constraint* expr)
+         TAO_Binary_Constraint* expr)
 {
   return visitor->visit_in (expr);
 }
@@ -201,7 +201,7 @@ TAO_Binary_Constraint::right_operand (void) const
 
 TAO_Unary_Constraint::
 TAO_Unary_Constraint (TAO_Expression_Type op_type,
-		     TAO_Constraint* operand)
+                     TAO_Constraint* operand)
   : op_ (op_type),
     operand_ (operand)
 {
@@ -294,7 +294,7 @@ TAO_Literal_Constraint (CORBA::Any* any)
   CORBA::TCKind corba_type = CORBA::tk_null;
   ACE_TRY
     {
-      corba_type = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      corba_type = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -311,46 +311,46 @@ TAO_Literal_Constraint (CORBA::Any* any)
     case TAO_SIGNED:
       this->op_.integer_ = 0;
       if (corba_type == CORBA::tk_short)
-	{
-	  CORBA::Short sh;
-	  any_ref >>= sh;
-	  this->op_.integer_ = (CORBA::Long) sh;
-	}
+        {
+          CORBA::Short sh;
+          any_ref >>= sh;
+          this->op_.integer_ = (CORBA::Long) sh;
+        }
       else
-	any_ref >>= this->op_.integer_;
+        any_ref >>= this->op_.integer_;
       break;
     case TAO_UNSIGNED:
       this->op_.uinteger_ = 0;
       if (corba_type == CORBA::tk_ushort)
-	{
-	  CORBA::UShort sh;
-	  any_ref >>= sh;
-	  this->op_.uinteger_ = (CORBA::ULong) sh;
-	}
+        {
+          CORBA::UShort sh;
+          any_ref >>= sh;
+          this->op_.uinteger_ = (CORBA::ULong) sh;
+        }
       else
-	any_ref >>= this->op_.uinteger_;
+        any_ref >>= this->op_.uinteger_;
       break;
     case TAO_DOUBLE:
       if (corba_type == CORBA::tk_float)
-	{
-	  CORBA::Float fl;
+        {
+          CORBA::Float fl;
           (*any) >>= fl;
-	  this->op_.double_ = (CORBA::Double) fl;
-	}
+          this->op_.double_ = (CORBA::Double) fl;
+        }
       else
         (*any) >>= this->op_.double_;
       break;
     case TAO_BOOLEAN:
       {
-	CORBA_Any::to_boolean tmp (this->op_.bool_);
+        CORBA_Any::to_boolean tmp (this->op_.bool_);
         (*any) >>= tmp;
       }
     break;
     case TAO_STRING:
       {
-	const char* s;
-	any_ref >>= s;
-	this->op_.str_ = CORBA::string_dup (s);
+        const char* s;
+        any_ref >>= s;
+        this->op_.str_ = CORBA::string_dup (s);
       }
     break;
     case TAO_SEQUENCE:
@@ -487,7 +487,7 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
   CORBA::TCKind kind = CORBA::tk_null;
   ACE_TRY
     {
-      kind = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      kind = type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -525,9 +525,9 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
         CORBA::TCKind kind = CORBA::tk_void;
         ACE_TRY_EX (label2)
           {
-            CORBA::TypeCode_var typecode = type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+            CORBA::TypeCode_var typecode = type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK_EX (label2);
-            kind = typecode->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+            kind = typecode->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK_EX (label2);;
           }
         ACE_CATCHANY
@@ -537,8 +537,8 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
         ACE_ENDTRY;
         // Since this is a "top level try block, no need to check again.
 
-	if (kind == CORBA::tk_sequence)
-	  return_value = TAO_SEQUENCE;
+        if (kind == CORBA::tk_sequence)
+          return_value = TAO_SEQUENCE;
       }
     break;
     default:
@@ -550,7 +550,7 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
 
 int
 operator== (const TAO_Literal_Constraint& left,
-	    const TAO_Literal_Constraint& right)
+            const TAO_Literal_Constraint& right)
 {
   int return_value = 0;
   TAO_Expression_Type widest_type =
@@ -581,7 +581,7 @@ operator== (const TAO_Literal_Constraint& left,
 
 int
 operator!= (const TAO_Literal_Constraint& left,
-	    const TAO_Literal_Constraint& right)
+            const TAO_Literal_Constraint& right)
 {
   int return_value = 0;
   TAO_Expression_Type widest_type =
@@ -611,7 +611,7 @@ operator!= (const TAO_Literal_Constraint& left,
 
 int
 operator< (const TAO_Literal_Constraint& left,
-	   const TAO_Literal_Constraint& right)
+           const TAO_Literal_Constraint& right)
 {
   int return_value = 0;
   TAO_Expression_Type widest_type =
@@ -641,7 +641,7 @@ operator< (const TAO_Literal_Constraint& left,
 
 int
 operator<= (const TAO_Literal_Constraint& left,
-	    const TAO_Literal_Constraint& right)
+            const TAO_Literal_Constraint& right)
 {
   int return_value = 0;
   TAO_Expression_Type widest_type =
@@ -668,7 +668,7 @@ operator<= (const TAO_Literal_Constraint& left,
 
 int
 operator> (const TAO_Literal_Constraint& left,
-	   const TAO_Literal_Constraint& right)
+           const TAO_Literal_Constraint& right)
 {
   int return_value = 0;
   TAO_Expression_Type widest_type =
@@ -695,7 +695,7 @@ operator> (const TAO_Literal_Constraint& left,
 
 int
 operator>= (const TAO_Literal_Constraint& left,
-	    const TAO_Literal_Constraint& right)
+            const TAO_Literal_Constraint& right)
 {
   int return_value = 0;
   TAO_Expression_Type widest_type =
@@ -729,7 +729,7 @@ operator== (CORBA::Double left, const TAO_Literal_Constraint& right)
 
 int
 operator== (const TAO_String_Manager& left,
-	    const TAO_Literal_Constraint& right)
+            const TAO_Literal_Constraint& right)
 {
   int result =  0;
 
@@ -742,7 +742,7 @@ operator== (const TAO_String_Manager& left,
 
 TAO_Literal_Constraint
 operator+ (const TAO_Literal_Constraint& left,
-	   const TAO_Literal_Constraint& right)
+           const TAO_Literal_Constraint& right)
 {
   TAO_Expression_Type widest_type =
     TAO_Literal_Constraint::widest_type (left, right);
@@ -751,18 +751,18 @@ operator+ (const TAO_Literal_Constraint& left,
     {
     case TAO_DOUBLE:
       {
-	CORBA::Double result = (CORBA::Double) left + (CORBA::Double) right;
-	return TAO_Literal_Constraint ((CORBA::Double) result);
+        CORBA::Double result = (CORBA::Double) left + (CORBA::Double) right;
+        return TAO_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_SIGNED:
       {
-	CORBA::Long result = (CORBA::Long) left + (CORBA::Long) right;
-	return TAO_Literal_Constraint ((CORBA::Long) result);
+        CORBA::Long result = (CORBA::Long) left + (CORBA::Long) right;
+        return TAO_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_UNSIGNED:
       {
-	CORBA::ULong result = (CORBA::ULong) left + (CORBA::ULong) right;
-	return TAO_Literal_Constraint ((CORBA::ULong) result);
+        CORBA::ULong result = (CORBA::ULong) left + (CORBA::ULong) right;
+        return TAO_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
       return TAO_Literal_Constraint ((CORBA::Long)0);
@@ -771,7 +771,7 @@ operator+ (const TAO_Literal_Constraint& left,
 
 TAO_Literal_Constraint
 operator- (const TAO_Literal_Constraint& left,
-	   const TAO_Literal_Constraint& right)
+           const TAO_Literal_Constraint& right)
 {
   TAO_Expression_Type widest_type =
     TAO_Literal_Constraint::widest_type (left, right);
@@ -780,18 +780,18 @@ operator- (const TAO_Literal_Constraint& left,
     {
     case TAO_DOUBLE:
       {
-	CORBA::Double result = (CORBA::Double) left - (CORBA::Double) right;
-	return TAO_Literal_Constraint ((CORBA::Double) result);
+        CORBA::Double result = (CORBA::Double) left - (CORBA::Double) right;
+        return TAO_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_SIGNED:
       {
-	CORBA::Long result = (CORBA::Long) left - (CORBA::Long) right;
-	return TAO_Literal_Constraint ((CORBA::Long) result);
+        CORBA::Long result = (CORBA::Long) left - (CORBA::Long) right;
+        return TAO_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_UNSIGNED:
       {
-	CORBA::ULong result = (CORBA::ULong) left - (CORBA::ULong) right;
-	return TAO_Literal_Constraint ((CORBA::ULong) result);
+        CORBA::ULong result = (CORBA::ULong) left - (CORBA::ULong) right;
+        return TAO_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
       return TAO_Literal_Constraint ((CORBA::Long)0);
@@ -800,7 +800,7 @@ operator- (const TAO_Literal_Constraint& left,
 
 TAO_Literal_Constraint
 operator* (const TAO_Literal_Constraint& left,
-	   const TAO_Literal_Constraint& right)
+           const TAO_Literal_Constraint& right)
 {
   TAO_Expression_Type widest_type =
     TAO_Literal_Constraint::widest_type (left, right);
@@ -809,18 +809,18 @@ operator* (const TAO_Literal_Constraint& left,
     {
     case TAO_DOUBLE:
       {
-	CORBA::Double result = (CORBA::Double) left * (CORBA::Double) right;
-	return TAO_Literal_Constraint ((CORBA::Double) result);
+        CORBA::Double result = (CORBA::Double) left * (CORBA::Double) right;
+        return TAO_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_SIGNED:
       {
-	CORBA::Long result = (CORBA::Long) left * (CORBA::Long) right;
-	return TAO_Literal_Constraint ((CORBA::Long) result);
+        CORBA::Long result = (CORBA::Long) left * (CORBA::Long) right;
+        return TAO_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_UNSIGNED:
       {
-	CORBA::ULong result = (CORBA::ULong) left * (CORBA::ULong) right;
-	return TAO_Literal_Constraint ((CORBA::ULong) result);
+        CORBA::ULong result = (CORBA::ULong) left * (CORBA::ULong) right;
+        return TAO_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
       return TAO_Literal_Constraint ((CORBA::Long)0);
@@ -829,7 +829,7 @@ operator* (const TAO_Literal_Constraint& left,
 
 TAO_Literal_Constraint
 operator/ (const TAO_Literal_Constraint& left,
-	   const TAO_Literal_Constraint& right)
+           const TAO_Literal_Constraint& right)
 {
   TAO_Expression_Type widest_type =
     TAO_Literal_Constraint::widest_type (left, right);
@@ -838,18 +838,18 @@ operator/ (const TAO_Literal_Constraint& left,
     {
     case TAO_DOUBLE:
       {
-	CORBA::Double result = (CORBA::Double) left / (CORBA::Double) right;
-	return TAO_Literal_Constraint ((CORBA::Double) result);
+        CORBA::Double result = (CORBA::Double) left / (CORBA::Double) right;
+        return TAO_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_SIGNED:
       {
-	CORBA::Long result = (CORBA::Long) left / (CORBA::Long) right;
-	return TAO_Literal_Constraint ((CORBA::Long) result);
+        CORBA::Long result = (CORBA::Long) left / (CORBA::Long) right;
+        return TAO_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_UNSIGNED:
       {
-	CORBA::ULong result = (CORBA::ULong) left / (CORBA::ULong) right;
-	return TAO_Literal_Constraint ((CORBA::ULong) result);
+        CORBA::ULong result = (CORBA::ULong) left / (CORBA::ULong) right;
+        return TAO_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
       return TAO_Literal_Constraint ((CORBA::Long)0);
@@ -863,18 +863,18 @@ operator- (const TAO_Literal_Constraint& operand)
     {
     case TAO_DOUBLE:
       {
-	CORBA::Double result = - (CORBA::Double) operand;
-	return TAO_Literal_Constraint ((CORBA::Double) result);
+        CORBA::Double result = - (CORBA::Double) operand;
+        return TAO_Literal_Constraint ((CORBA::Double) result);
       }
     case TAO_SIGNED:
       {
-	CORBA::Long result = - (CORBA::Long) operand;
-	return TAO_Literal_Constraint ((CORBA::Long) result);
+        CORBA::Long result = - (CORBA::Long) operand;
+        return TAO_Literal_Constraint ((CORBA::Long) result);
       }
     case TAO_UNSIGNED:
       {
-	CORBA::Long result = - (CORBA::Long) ((CORBA::ULong) operand);
-	return TAO_Literal_Constraint ((CORBA::ULong) result);
+        CORBA::Long result = - (CORBA::Long) ((CORBA::ULong) operand);
+        return TAO_Literal_Constraint ((CORBA::ULong) result);
       }
     default:
       return TAO_Literal_Constraint ((CORBA::Long)0);
@@ -883,7 +883,7 @@ operator- (const TAO_Literal_Constraint& operand)
 
 TAO_Expression_Type
 TAO_Literal_Constraint::widest_type (const TAO_Literal_Constraint& left,
-				     const TAO_Literal_Constraint& right)
+                                     const TAO_Literal_Constraint& right)
 {
   TAO_Expression_Type left_type = left.expr_type (),
     right_type = right.expr_type (),
@@ -892,9 +892,9 @@ TAO_Literal_Constraint::widest_type (const TAO_Literal_Constraint& left,
   if (right_type != left_type)
     {
       if (right_type > left_type)
-	return_value = right_type;
+        return_value = right_type;
       else
-	return_value = left_type;
+        return_value = left_type;
     }
 
   return return_value;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
index 2a2dddd6077..5d0f4d6dc32 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -507,14 +507,14 @@ sequence_does_contain (CORBA::Any* sequence,
   // wrapper uses the [] operator to locate the target element in the
   // sequence.
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   CORBA::Boolean return_value = 0;
   CORBA::TypeCode_var type = sequence->type ();
   CORBA::TCKind sequence_type = CORBA::tk_void;
   ACE_TRY
     {
       sequence_type =
-        TAO_Sequence_Extracter_Base::sequence_type (type.in () TAO_ENV_ARG_PARAMETER);
+        TAO_Sequence_Extracter_Base::sequence_type (type.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -594,7 +594,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      CORBA::Short value = dyn_any.get_short (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Short value = dyn_any.get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -613,7 +613,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      CORBA::UShort value = dyn_any.get_ushort (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::UShort value = dyn_any.get_ushort (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -632,7 +632,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      CORBA::Long value = dyn_any.get_long (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Long value = dyn_any.get_long (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -651,7 +651,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      CORBA::ULong value = dyn_any.get_ulong (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong value = dyn_any.get_ulong (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -670,7 +670,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      CORBA::Float value = dyn_any.get_float (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Float value = dyn_any.get_float (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -686,7 +686,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      CORBA::Double value = dyn_any.get_short (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Double value = dyn_any.get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -702,7 +702,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-    CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short (TAO_ENV_SINGLE_ARG_PARAMETER);
+    CORBA::Boolean value = (CORBA::Boolean) dyn_any.get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (value == element);
     }
@@ -718,7 +718,7 @@ operator () (TAO_DynSequence_i& dyn_any,
   int return_value = 0;
   ACE_TRY_NEW_ENV
     {
-      const char* value = dyn_any.get_string (TAO_ENV_SINGLE_ARG_PARAMETER);
+      const char* value = dyn_any.get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return_value = (ACE_OS::strcmp (value, element) == 0);
     }
@@ -999,13 +999,13 @@ visit_in (TAO_Binary_Constraint* binary_in)
 
   if (right_type == TAO_SEQUENCE)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       CORBA::Boolean types_match = 0;
       CORBA::TCKind seq_type = CORBA::tk_void;
       ACE_TRY
         {
           seq_type =
-            TAO_Sequence_Extracter_Base::sequence_type (prop_type TAO_ENV_ARG_PARAMETER);
+            TAO_Sequence_Extracter_Base::sequence_type (prop_type ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
index 30781c68228..635d5ac2cdd 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -53,12 +53,12 @@ TAO_String_Hash_Key::~TAO_String_Hash_Key (void)
 CORBA::TCKind
 TAO_Sequence_Extracter_Base::
 sequence_type (CORBA::TypeCode* type_code
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Seth, why do you use a comma to separate the two statements?
   CORBA::TCKind return_value = CORBA::tk_void,
-  type_kind = type_code->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  type_kind = type_code->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (return_value);
 
   if (type_kind == CORBA::tk_alias
@@ -68,27 +68,27 @@ sequence_type (CORBA::TypeCode* type_code
 
       for (;;)
         {
-          CORBA::TCKind base_kind = base->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::TCKind base_kind = base->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (return_value);
 
           if (base_kind == CORBA::tk_alias)
             {
-              base = base->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+              base = base->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK_RETURN (return_value);
             }
           else
             break;
         }
 
-      CORBA::TCKind base_kind = base->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind base_kind = base->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (return_value);
 
       if (base_kind == CORBA::tk_sequence)
         {
-          base = base->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+          base = base->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (return_value);
 
-          base_kind = base->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+          base_kind = base->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (return_value);
           return_value = base_kind;
         }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index ed92c170db0..27d352694a6 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -58,7 +58,7 @@ class TAO_Sequence_Extracter_Base
 public:
 
   static CORBA::TCKind sequence_type (CORBA::TypeCode* code
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the sequence element type for the sequence whose typecode
   // is <code>.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
index 516f47b61a0..a1d196b3de9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
@@ -17,11 +17,11 @@ TAO_find (const CORBA::Any& sequence, const OPERAND_TYPE& element)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      dyn_seq.init (sequence TAO_ENV_ARG_PARAMETER);
+      dyn_seq.init (sequence ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ULong length =
-        dyn_seq.get_length (TAO_ENV_SINGLE_ARG_PARAMETER);
+        dyn_seq.get_length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0; i < length && ! return_value; i++)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index a6935170056..f0129139dd3 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -149,7 +149,7 @@ remove_offer (const char* type, CORBA::ULong id)
 template <class LOCK_TYPE> int
 TAO_Offer_Database<LOCK_TYPE>::
 remove_offer (const CosTrading::OfferId offer_id
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
@@ -159,7 +159,7 @@ remove_offer (const CosTrading::OfferId offer_id
   this->parse_offer_id (offer_id,
                         stype,
                         index
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->remove_offer (stype,
@@ -174,13 +174,13 @@ template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const CosTrading::OfferId offer_id,
               char*& type_name
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
   CORBA::ULong index;
   CosTrading::Offer* offer = 0;
-  this->parse_offer_id (offer_id, type_name, index TAO_ENV_ARG_PARAMETER);
+  this->parse_offer_id (offer_id, type_name, index ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (offer);
 
   if ((offer = this->lookup_offer (type_name, index)) == 0)
@@ -193,7 +193,7 @@ lookup_offer (const CosTrading::OfferId offer_id,
 template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const CosTrading::OfferId offer_id
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId))
 {
@@ -201,7 +201,7 @@ lookup_offer (const CosTrading::OfferId offer_id
   CORBA::ULong index;
   CosTrading::Offer* offer = 0;
 
-  this->parse_offer_id (offer_id, type_name, index TAO_ENV_ARG_PARAMETER);
+  this->parse_offer_id (offer_id, type_name, index ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (offer);
 
   if ((offer = this->lookup_offer (type_name, index)) == 0)
@@ -275,7 +275,7 @@ TAO_Offer_Database<LOCK_TYPE>::
 parse_offer_id (const CosTrading::OfferId offer_id,
                 char*&service_type,
                 CORBA::ULong& id
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalOfferId))
 {
   // Get service type: it is everything from 17th character to the end.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index 92a163b37f9..8bf86bc88eb 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -65,12 +65,12 @@ public:
   // for it. Returns 0 on failure.
 
   int remove_offer (const CosTrading::OfferId offer_id
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
 
   CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
   // Lookup an offer whose offer_id is <offer_id>, and return
@@ -78,7 +78,7 @@ public:
 
   CosTrading::Offer* lookup_offer (const CosTrading::OfferId offer_id,
                                    char*& type_name
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId));
   // Lookup an offer whose OfferId is <offer_id> and return in
@@ -131,7 +131,7 @@ private:
   static void parse_offer_id (const CosTrading::OfferId offer_id,
                               char* &service_type,
                               CORBA::ULong& id
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalOfferId));
   // Take in a previously generated offer id and return the type
   // and id that were used to generate the offer id.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index a6f0cf2d93e..197fd50905a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -14,20 +14,20 @@ TAO_Offer_Iterator::~TAO_Offer_Iterator (void)
 }
 
 void
-TAO_Offer_Iterator::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -50,7 +50,7 @@ TAO_Query_Only_Offer_Iterator::add_offer (CosTrading::OfferId offer_id,
 }
 
 CORBA::ULong
-TAO_Query_Only_Offer_Iterator::max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Query_Only_Offer_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC((CORBA::SystemException,
                  CosTrading::UnknownMaxLeft))
 {
@@ -60,7 +60,7 @@ TAO_Query_Only_Offer_Iterator::max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 CORBA::Boolean
 TAO_Query_Only_Offer_Iterator::next_n (CORBA::ULong n,
                                        CosTrading::OfferSeq_out offers
-                                                               TAO_ENV_ARG_DECL_NOT_USED)
+                                                               ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   offers = new CosTrading::OfferSeq;
@@ -94,7 +94,7 @@ TAO_Offer_Iterator_Collection::~TAO_Offer_Iterator_Collection (void)
 
       ACE_TRY_NEW_ENV
         {
-          offer_iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          offer_iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::release (offer_iter);
@@ -119,7 +119,7 @@ add_offer_iterator (CosTrading::OfferIterator_ptr offer_iter)
 CORBA::Boolean
 TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
                                        CosTrading::OfferSeq_out offers
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong offers_left = n;
@@ -145,13 +145,13 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
       any_left =
         iter->next_n (offers_left,
                       CosTrading::OfferSeq_out (out_offers.out ())
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (return_value);
 
       // If we've exhausted this iterator, destroy it.
       if (any_left == 0)
         {
-          iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (return_value);
           CORBA::release (iter);
         }
@@ -175,7 +175,7 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n,
 }
 
 void
-TAO_Offer_Iterator_Collection::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Iterator_Collection::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy all iterators in the collection.
@@ -186,26 +186,26 @@ TAO_Offer_Iterator_Collection::destroy (TAO_ENV_SINGLE_ARG_DECL)
       CosTrading::OfferIterator** iter = 0;
 
       iters_iter.next (iter);
-      (*iter)->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      (*iter)->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // Remove self from POA
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::ULong
-TAO_Offer_Iterator_Collection::max_left (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Iterator_Collection::max_left (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::UnknownMaxLeft))
 {
@@ -233,7 +233,7 @@ TAO_Offer_Id_Iterator::~TAO_Offer_Id_Iterator (void)
 }
 
 CORBA::ULong
-TAO_Offer_Id_Iterator::max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Offer_Id_Iterator::max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::UnknownMaxLeft))
 {
@@ -241,28 +241,28 @@ TAO_Offer_Id_Iterator::max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_Offer_Id_Iterator::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Id_Iterator::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Remove self from POA
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::Boolean
 TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
                                CosTrading::OfferIdSeq_out _ids
-                               TAO_ENV_ARG_DECL_NOT_USED)
+                               ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Calculate the number of Ids to be returned in this.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index d345fbcd38c..bbdf6061065 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -56,7 +56,7 @@ public:
 
   virtual ~TAO_Offer_Iterator (void);
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // BEGIN SPEC
   // The destroy operation destroys the iterator. No further
@@ -69,7 +69,7 @@ public:
   // Add an offer to the collection of offers the iterator will
   // iterate over.
 
-  virtual CORBA::ULong max_left (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft)) = 0;
 
@@ -83,7 +83,7 @@ public:
 
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // BEGIN SPEC
   // The next_n operation returns a set of service offers in the
@@ -135,12 +135,12 @@ public:
 
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deposit at maximum n offers into the return sequence and return 1,
   // or return 0 if the iterator is done and no offers are returned.
 
-  virtual CORBA::ULong max_left (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft));
   // Return the number of items left in the iterator.
@@ -191,15 +191,15 @@ public:
 
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Retrieve n offers from the set of iterators.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the collection of iterators.
 
-  virtual CORBA::ULong max_left (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::UnknownMaxLeft));
   // Determine how many offers are left in the collection.
@@ -246,7 +246,7 @@ class TAO_Offer_Id_Iterator :
 
   ~TAO_Offer_Id_Iterator (void);
 
-  virtual CORBA::ULong max_left(TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong max_left(ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::UnknownMaxLeft));
   // The max_left operation returns the number of offer identifiers
@@ -255,7 +255,7 @@ class TAO_Offer_Id_Iterator :
   // identifiers (e.g., if the iterator determines its set of offer
   // identifiers through lazy evaluation).
 
-  virtual void destroy(TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy(ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The destroy operation destroys the iterator. No further
   // operations can be invoked on an iterator after it has been
@@ -263,7 +263,7 @@ class TAO_Offer_Id_Iterator :
 
   virtual CORBA::Boolean next_n(CORBA::ULong _n,
                                 CosTrading::OfferIdSeq_out _ids
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The next_n operation returns a set of offer identifiers in the
   // output parameter "ids." The operation returns n offer identifiers
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
index ee67777d024..f7cc7ff360d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.cpp
@@ -39,7 +39,7 @@ add_offer (CosTrading::OfferId id,
 
 template <class MAP_LOCK_TYPE> CORBA::ULong
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
-max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::UnknownMaxLeft))
 {
@@ -50,7 +50,7 @@ template <class MAP_LOCK_TYPE> CORBA::Boolean
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
 next_n (CORBA::ULong n,
         CosTrading::OfferSeq_out offers
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong ret_offers = 0;
@@ -77,7 +77,7 @@ next_n (CORBA::ULong n,
       this->offer_ids_.dequeue_head (id);
 
       CosTrading::OfferId_var offerid_var (id);
-      CosTrading::Offer* offer = this->db_.lookup_offer (id TAO_ENV_ARG_PARAMETER);
+      CosTrading::Offer* offer = this->db_.lookup_offer (id ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (offer != 0)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index fb3948efa72..54e0d96ce43 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
@@ -53,12 +53,12 @@ public:
 
   virtual CORBA::Boolean next_n (CORBA::ULong n,
                                  CosTrading::OfferSeq_out offers
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Deposit at maximum n offers into the return sequence and return 1,
   // or return 0 if the iterator is done and no offers are returned.
 
-  virtual CORBA::ULong max_left (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong max_left (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::UnknownMaxLeft));
   // Throws CosTrading::UnknownMaxLeft since with the presence of
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index 5f0a3087c54..ac4b649d4e5 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -37,7 +37,7 @@ TAO_Service_Type_Repository::~TAO_Service_Type_Repository (void)
 }
 
 CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-TAO_Service_Type_Repository::incarnation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Service_Type_Repository::incarnation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num;
@@ -63,7 +63,7 @@ add_type (const char *name,
           const char *if_name,
           const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
           const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -101,13 +101,13 @@ add_type (const char *name,
   // Make sure all property names are valid and appear only once.
   this->validate_properties (prop_map,
                              props
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (this->incarnation_);
 
   // Check that all super_types exist, and none are duplicated.
   this->validate_supertypes (super_map,
                              super_types
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (this->incarnation_);
 
   // NOTE: I don't really know a way to do this without an Interface
@@ -115,7 +115,7 @@ add_type (const char *name,
   // information about supertypes.
   //
   // make sure interface name is legal.
-  //  this->validate_interface (if_name, super_types TAO_ENV_ARG_PARAMETER);
+  //  this->validate_interface (if_name, super_types ACE_ENV_ARG_PARAMETER);
   //  ACE_CHECK_RETURN (this->incarnation);
   //
   // Instead, we do this:
@@ -129,7 +129,7 @@ add_type (const char *name,
   // the job.
   this->validate_inheritance (prop_map,
                               super_types
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (this->incarnation_);
 
   // We can now use prop_map to construct a sequence of all properties
@@ -156,7 +156,7 @@ add_type (const char *name,
 
 void
 TAO_Service_Type_Repository::remove_type (const char *name
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -187,7 +187,7 @@ TAO_Service_Type_Repository::remove_type (const char *name
 CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
 TAO_Service_Type_Repository::
 list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types
-            TAO_ENV_ARG_DECL)
+            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_READ_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL ());
@@ -233,7 +233,7 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes
 CosTradingRepos::ServiceTypeRepository::TypeStruct *
 TAO_Service_Type_Repository::
 describe_type (const char * name
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
@@ -283,7 +283,7 @@ describe_type (const char * name
 CosTradingRepos::ServiceTypeRepository::TypeStruct *
 TAO_Service_Type_Repository::
 fully_describe_type (const char *name
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
@@ -329,7 +329,7 @@ fully_describe_type (const char *name
 void
 TAO_Service_Type_Repository::
 mask_type (const char *name
-           TAO_ENV_ARG_DECL)
+           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -360,7 +360,7 @@ mask_type (const char *name
 void
 TAO_Service_Type_Repository::
 unmask_type (const char *name
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
@@ -497,7 +497,7 @@ void
 TAO_Service_Type_Repository::
 validate_properties (Prop_Map &prop_map,
                      const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName))
 {
@@ -526,7 +526,7 @@ void
 TAO_Service_Type_Repository::
 validate_supertypes (Service_Type_Map &super_map,
                      const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName))
@@ -562,7 +562,7 @@ void
 TAO_Service_Type_Repository::
 validate_inheritance (Prop_Map &prop_map,
                       const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition))
 {
   CORBA::ULong num_super_types = super_types.length ();
@@ -611,7 +611,7 @@ validate_inheritance (Prop_Map &prop_map,
                 {
                   compare =
                     super_props[j].value_type->equal (prop_type
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
               ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index b70563d8c7f..171fb9eae3a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -37,7 +37,7 @@ public:
   ~TAO_Service_Type_Repository (void);
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-    incarnation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    incarnation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
@@ -45,7 +45,7 @@ public:
             const char *if_name,
             const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-            TAO_ENV_ARG_DECL_NOT_USED)
+            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -99,7 +99,7 @@ public:
   // END SPEC
 
   virtual void remove_type (const char  *name
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -115,7 +115,7 @@ public:
 
   virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
   list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types
-              TAO_ENV_ARG_DECL_NOT_USED)
+              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // BEGIN SPEC
@@ -131,7 +131,7 @@ public:
 
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
   describe_type (const char *name
-                 TAO_ENV_ARG_DECL_NOT_USED)
+                 ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -145,7 +145,7 @@ public:
 
   virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
   fully_describe_type (const char *name
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -162,7 +162,7 @@ public:
   // END SPEC
 
   virtual void mask_type (const char *name
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -181,7 +181,7 @@ public:
   // END SPEC
 
   virtual void unmask_type (const char  *name
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -244,7 +244,7 @@ public:
 
   void validate_properties (Prop_Map &prop_map,
                             const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName));
   // Confirm that the properties in props have valid names, and aren't
@@ -252,7 +252,7 @@ public:
 
   void validate_supertypes (Service_Type_Map &super_map,
                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
@@ -260,14 +260,14 @@ public:
 
   void validate_inheritance (Prop_Map &prop_map,
                              const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition));
   // Ensure that properties of a super_type aren't having their types
   // or retstrictions redefined.
 
   //  void validate_interface (const char *if_name,
   //                       Service_Type_Map &super_map,
-  //                       TAO_ENV_SINGLE_ARG_DECL)
+  //                       ACE_ENV_SINGLE_ARG_DECL)
   //    ACE_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch));
   // Ensure that the interface type derives from its superclasses'.
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 436b6381e6a..ec82d7d89de 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -173,11 +173,11 @@ type_repos (CosTrading::TypeRepository_ptr new_value)
   // @@ Seth, There is no way to propagate the exception out.
   ACE_WRITE_GUARD (ACE_Lock, ace_mon, this->locker_.lock ());
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   this->type_repos_ = new_value;
   // @@ What can we do even if we catch this?
   this->service_type_repos_ =
-    CosTradingRepos::ServiceTypeRepository::_narrow (new_value TAO_ENV_ARG_PARAMETER);
+    CosTradingRepos::ServiceTypeRepository::_narrow (new_value ACE_ENV_ARG_PARAMETER);
 }
 
 CosTradingRepos::ServiceTypeRepository_ptr
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
index a7fb0f83e10..a62b2d3773a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
@@ -29,13 +29,13 @@ visit_property (TAO_Property_Constraint* literal)
 
   if (this->props_.find (prop_name, prop_index) == 0)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
 
       CORBA::Any *value = 0;
       // Retrieve the value of the property from the Property_Evaluator
       ACE_TRY
         {
-          value = this->prop_eval_.property_value (prop_index TAO_ENV_ARG_PARAMETER);
+          value = this->prop_eval_.property_value (prop_index ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 9904d27b106..9378c759148 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -46,7 +46,7 @@ query (const char *type,
        CosTrading::OfferSeq_out returned_offers,
        CosTrading::OfferIterator_out returned_offer_iterator,
        CosTrading::PolicyNameSeq_out returned_limits_applied
-       TAO_ENV_ARG_DECL)
+       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -60,13 +60,13 @@ query (const char *type,
                    CosTrading::DuplicatePolicyName))
 {
   // Instantiate a class to help interpret query policies.
-  TAO_Policies policies (this->trader_, in_policies TAO_ENV_ARG_PARAMETER);
+  TAO_Policies policies (this->trader_, in_policies ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // If a federated query returns to us, ignore it to prevent
   // redundant results and infinite loops.
   CosTrading::Admin::OctetSeq* request_id = 0;
-  int check = this->seen_request_id (policies, request_id TAO_ENV_ARG_PARAMETER);
+  int check = this->seen_request_id (policies, request_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (check)
@@ -84,7 +84,7 @@ query (const char *type,
   // If the importer has specified a starting trader, foward the
   // query.
   CosTrading::TraderName* trader_name =
-    policies.starting_trader (TAO_ENV_SINGLE_ARG_PARAMETER);
+    policies.starting_trader (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (! CORBA::is_nil (link_if) && trader_name != 0)
@@ -102,7 +102,7 @@ query (const char *type,
                            returned_offers,
                            returned_offer_iterator,
                            returned_limits_applied
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       return;
     }
@@ -113,7 +113,7 @@ query (const char *type,
   CosTradingRepos::ServiceTypeRepository_ptr rep =
     support_attrs.service_type_repos ();
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type TAO_ENV_ARG_PARAMETER);
+    rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ Should throw a NO_MEMORY exception here...
@@ -134,16 +134,16 @@ query (const char *type,
   // the preference string and orders offers according to those
   // constraints.
   TAO_Offer_Filter offer_filter (policies
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   TAO_Trader_Constraint_Validator validator (type_struct.in ());
   TAO_Constraint_Interpreter constr_inter (validator,
                                            constraint
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   TAO_Preference_Interpreter pref_inter (validator,
                                          preferences
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Try to find the map of offers of desired service type.
@@ -154,7 +154,7 @@ query (const char *type,
                          pref_inter,
                          offer_filter);
 
-  CORBA::Boolean result = policies.exact_type_match (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean result = policies.exact_type_match (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!result)
@@ -172,7 +172,7 @@ query (const char *type,
                                  constr_inter,
                                  pref_inter,
                                  offer_filter
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -188,7 +188,7 @@ query (const char *type,
                             pref_inter,
                             *returned_offers.ptr (),
                             returned_offer_iterator
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The following steps are only appropriate for a linked trader.
@@ -201,7 +201,7 @@ query (const char *type,
         this->retrieve_links (policies,
                               offers_returned,
                               CosTrading::LinkNameSeq_out (links.out ())
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (should_follow && links->length () != 0)
@@ -219,7 +219,7 @@ query (const char *type,
                                  *returned_offers.ptr (),
                                  returned_offer_iterator.ptr (),
                                  *returned_limits_applied.ptr ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -287,7 +287,7 @@ lookup_all_subtypes (const char* type,
                      TAO_Constraint_Interpreter& constr_inter,
                      TAO_Preference_Interpreter& pref_inter,
                      TAO_Offer_Filter& offer_filter
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   // BEGIN SPEC
   // The trader may return a service offer of a subtype of the "type"
@@ -308,7 +308,7 @@ lookup_all_subtypes (const char* type,
   // types with lower incarnation numbers.
   sst.incarnation (inc_num);
 
-  all_types = rep->list_types (sst TAO_ENV_ARG_PARAMETER);
+  all_types = rep->list_types (sst ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Scan all types inserted after the super types. If the transitive
@@ -322,7 +322,7 @@ lookup_all_subtypes (const char* type,
     {
       // Obtain a description of the prospective type.
       type_struct = rep->fully_describe_type (all_types[i]
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq&
@@ -357,7 +357,7 @@ fill_receptacles (const char* /* type */,
                   TAO_Preference_Interpreter& pref_inter,
                   CosTrading::OfferSeq& offers,
                   CosTrading::OfferIterator_ptr& offer_itr
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                   CosTrading::DuplicatePropertyName))
 {
@@ -372,13 +372,13 @@ fill_receptacles (const char* /* type */,
   // "offer_itr" will be nil.
   // END SPEC
 
-  TAO_Property_Filter prop_filter (desired_props TAO_ENV_ARG_PARAMETER);
+  TAO_Property_Filter prop_filter (desired_props ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // RETURNING: Calculate how many offers go into the sequence
   //  Calculate how many go into the iterator
 
-  CORBA::ULong return_card = policies.return_card (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong return_card = policies.return_card (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong i = 0;
@@ -423,9 +423,9 @@ fill_receptacles (const char* /* type */,
         this->create_offer_iterator (prop_filter);
 
       // Register it with the POA.
-      offer_itr = oi->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_itr = oi->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       // @@ Seth, ACE_CHECK_RETURN (what?);
-      oi->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      oi->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (total_offers - offers_in_iterator);
 
       // Add to the iterator
@@ -493,12 +493,12 @@ TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 retrieve_links (TAO_Policies& policies,
                 CORBA::ULong offers_returned,
                 CosTrading::LinkNameSeq_out links
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean should_follow = 0;
-  CosTrading::FollowOption follow_rule = policies.link_follow_rule (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CosTrading::FollowOption follow_rule = policies.link_follow_rule (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (should_follow);
 
   // Determine whether or not a federated query is warranted. A query
@@ -507,7 +507,7 @@ retrieve_links (TAO_Policies& policies,
   if ((follow_rule == CosTrading::always ||
        (follow_rule == CosTrading::if_no_local && offers_returned == 0)))
     {
-      CORBA::ULong hc = policies.hop_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong hc = policies.hop_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (hc > 0)
@@ -521,7 +521,7 @@ retrieve_links (TAO_Policies& policies,
       CosTrading::Link_ptr link_if =
         this->trader_.trading_components ().link_if ();
 
-      links = link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
+      links = link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Determine which of the links registered with the Link
@@ -533,12 +533,12 @@ retrieve_links (TAO_Policies& policies,
         {
           // Grab the link information.
           CosTrading::Link::LinkInfo_var
-            link_info (link_if->describe_link (links[i] TAO_ENV_ARG_PARAMETER));
+            link_info (link_if->describe_link (links[i] ACE_ENV_ARG_PARAMETER));
           ACE_CHECK_RETURN (should_follow);
 
           // Compute the link follow rule.
           CosTrading::FollowOption link_rule =
-            policies.link_follow_rule (link_info.in () TAO_ENV_ARG_PARAMETER);
+            policies.link_follow_rule (link_info.in () ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (should_follow);
 
           // Determine if the link follow rule applies.
@@ -575,7 +575,7 @@ federated_query (const CosTrading::LinkNameSeq& links,
                  CosTrading::OfferSeq& offers,
                  CosTrading::OfferIterator_ptr& offer_iter,
                  CosTrading::PolicyNameSeq& limits
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -624,13 +624,13 @@ federated_query (const CosTrading::LinkNameSeq& links,
         {
           // Obtain information about the link we're traversing.
           CosTrading::Link::LinkInfo_var link_info =
-            link_interface->describe_link (links[i] TAO_ENV_ARG_PARAMETER);
+            link_interface->describe_link (links[i] ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Set the link follow policy for the query over the link.
           policies.copy_in_follow_option (policies_to_pass,
                                           link_info.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CosTrading::Lookup_var remote_lookup =
@@ -646,7 +646,7 @@ federated_query (const CosTrading::LinkNameSeq& links,
                                 CosTrading::OfferSeq_out (out_offers),
                                 CosTrading::OfferIterator_out (out_offer_iter),
                                 CosTrading::PolicyNameSeq_out (out_limits)
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ULong j = 0;
@@ -687,10 +687,10 @@ federated_query (const CosTrading::LinkNameSeq& links,
   this->order_merged_sequence (pref_inter, offers);
 
   // Return the collection of offer iterators.
-  offer_iter = offer_iter_collection->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  offer_iter = offer_iter_collection->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  offer_iter_collection->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  offer_iter_collection->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -744,7 +744,7 @@ forward_query (const char* next_hop,
                CosTrading::OfferSeq_out offers,
                CosTrading::OfferIterator_out offer_itr,
                CosTrading::PolicyNameSeq_out limits_applied
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -764,17 +764,17 @@ forward_query (const char* next_hop,
   ACE_TRY
     {
       CosTrading::Link::LinkInfo_var link_info =
-        link_interface->describe_link (next_hop TAO_ENV_ARG_PARAMETER);
+        link_interface->describe_link (next_hop ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosTrading::Lookup_var remote_lookup =
         CosTrading::Lookup::_duplicate (link_info->target.in ());
 
-      CORBA::Object_var us = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Object_var us = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Boolean self_loop =
-        remote_lookup->_is_equivalent (us.in () TAO_ENV_ARG_PARAMETER);
+        remote_lookup->_is_equivalent (us.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (! self_loop)
@@ -789,7 +789,7 @@ forward_query (const char* next_hop,
                                 offers,
                                 offer_itr,
                                 limits_applied
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -803,7 +803,7 @@ forward_query (const char* next_hop,
                        offers,
                        offer_itr,
                        limits_applied
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -823,20 +823,20 @@ CORBA::Boolean
 TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 seen_request_id (TAO_Policies& policies,
                  CosTrading::Admin::OctetSeq*& seq
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean return_value = 0;
 
-  seq = policies.request_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  seq = policies.request_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   if (seq == 0)
     {
       CosTrading::Admin_ptr admin_if =
         this->trader_.trading_components ().admin_if ();
-      seq = admin_if->request_id_stem (TAO_ENV_SINGLE_ARG_PARAMETER);
+      seq = admin_if->request_id_stem (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (1);
     }
   else
@@ -899,7 +899,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 _cxx_export (CORBA::Object_ptr reference,
              const char *type,
              const CosTrading::PropertySeq &properties
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Register::InvalidObjectRef,
                   CosTrading::IllegalServiceType,
@@ -927,7 +927,7 @@ _cxx_export (CORBA::Object_ptr reference,
   // Yank our friend, the type struct, and confirm that the given
   // properties match the type definition.
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type TAO_ENV_ARG_PARAMETER);
+    rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Oops the type is masked, we shouldn't let exporters know the type
@@ -937,7 +937,7 @@ _cxx_export (CORBA::Object_ptr reference,
 
   // TAO-specific way to determine if an object is derived from or is
   // an interface type.
-  int check = (! reference->_is_a (type_struct->if_name TAO_ENV_ARG_PARAMETER));
+  int check = (! reference->_is_a (type_struct->if_name ACE_ENV_ARG_PARAMETER));
   ACE_CHECK_RETURN (0);
   if (check)
     ACE_THROW_RETURN (CosTrading::Register::
@@ -945,7 +945,7 @@ _cxx_export (CORBA::Object_ptr reference,
 
   // Validate that the properties defined for this offer are correct
   // to their types and strength.
-  this->validate_properties (type, type_struct.ptr (), properties TAO_ENV_ARG_PARAMETER);
+  this->validate_properties (type, type_struct.ptr (), properties ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // CORBA::ULong plength = properties.length ();
@@ -976,7 +976,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw (const char *id
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -984,14 +984,14 @@ withdraw (const char *id
 {
   // Get service type map.
   TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database ();
-  offer_database.remove_offer ((CosTrading::OfferId) id TAO_ENV_ARG_PARAMETER);
+  offer_database.remove_offer ((CosTrading::OfferId) id ACE_ENV_ARG_PARAMETER);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Register::OfferInfo *
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 describe (const char *id
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
@@ -1003,7 +1003,7 @@ describe (const char *id
 
   // Perform a lookup to find the offer.
   CosTrading::Offer* offer =
-    offer_database.lookup_offer ((CosTrading::OfferId) id, type TAO_ENV_ARG_PARAMETER);
+    offer_database.lookup_offer ((CosTrading::OfferId) id, type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CosTrading::Register::OfferInfo *offer_info = 0;
@@ -1027,7 +1027,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 modify (const char *id,
         const CosTrading::PropertyNameSeq& del_list,
         const CosTrading::PropertySeq& modify_list
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::NotImplemented,
                   CosTrading::IllegalOfferId,
@@ -1043,7 +1043,7 @@ modify (const char *id,
 {
   // Throw an exception if the trader is not configured
   // to support properties modification.
-  int check =  (! this->supports_modifiable_properties (TAO_ENV_SINGLE_ARG_PARAMETER));
+  int check =  (! this->supports_modifiable_properties (ACE_ENV_SINGLE_ARG_PARAMETER));
   ACE_CHECK;
 
   if (check)
@@ -1057,22 +1057,22 @@ modify (const char *id,
   TAO_Offer_Database<MAP_LOCK_TYPE> &offer_database = this->trader_.offer_database ();
 
   CosTrading::Offer* offer = offer_database.
-    lookup_offer (ACE_const_cast (CosTrading::OfferId, id), type TAO_ENV_ARG_PARAMETER);
+    lookup_offer (ACE_const_cast (CosTrading::OfferId, id), type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (offer != 0)
     {
       // Yank our friend, the type struct.
       CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-        rep->fully_describe_type (type TAO_ENV_ARG_PARAMETER);
+        rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       TAO_Offer_Modifier offer_mod (type, type_struct.in (), offer);
 
       // Delete, add, and change properties of the offer.
-      offer_mod.delete_properties (del_list TAO_ENV_ARG_PARAMETER);
+      offer_mod.delete_properties (del_list ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      offer_mod.merge_properties (modify_list TAO_ENV_ARG_PARAMETER);
+      offer_mod.merge_properties (modify_list ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Alter our reference to the offer. We do this last, since the
@@ -1087,7 +1087,7 @@ void
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw_using_constraint (const char *type,
                            const char *constr
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -1104,7 +1104,7 @@ withdraw_using_constraint (const char *type,
 
   // Retrieve the type struct
   CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-    rep->fully_describe_type (type TAO_ENV_ARG_PARAMETER);
+    rep->fully_describe_type (type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Try to find the map of offers of desired service type.
@@ -1123,7 +1123,7 @@ withdraw_using_constraint (const char *type,
 #endif /* _MSC_VER */
 
     TAO_Trader_Constraint_Validator validator (type_struct.in ());
-    TAO_Constraint_Interpreter constr_inter (validator, constr TAO_ENV_ARG_PARAMETER);
+    TAO_Constraint_Interpreter constr_inter (validator, constr ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     while (offer_iter.has_more_offers ())
@@ -1146,7 +1146,7 @@ withdraw_using_constraint (const char *type,
           char* offer_id = 0;
 
           ids.dequeue_head (offer_id);
-          offer_database.remove_offer (offer_id TAO_ENV_ARG_PARAMETER);
+          offer_database.remove_offer (offer_id ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           CORBA::string_free (offer_id);
         }
@@ -1159,7 +1159,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Register_ptr
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 resolve (const CosTrading::TraderName &name
-         TAO_ENV_ARG_DECL)
+         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Register::IllegalTraderName,
                   CosTrading::Register::UnknownTraderName,
@@ -1184,11 +1184,11 @@ resolve (const CosTrading::TraderName &name
   ACE_TRY
     {
       // Ensure that the link to the next trader exists.
-      link_info = link_if->describe_link (name[0] TAO_ENV_ARG_PARAMETER);
+      link_info = link_if->describe_link (name[0] ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       remote_reg =
-        CosTrading::Register::_narrow (link_info->target_reg.in () TAO_ENV_ARG_PARAMETER);
+        CosTrading::Register::_narrow (link_info->target_reg.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1212,7 +1212,7 @@ resolve (const CosTrading::TraderName &name
       for (int i = trader_name.length () - 1; i >= 0; i--)
         trader_name[i] = name[i + 1];
 
-      return_value = remote_reg->resolve (trader_name TAO_ENV_ARG_PARAMETER);
+      return_value = remote_reg->resolve (trader_name ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CosTrading::Register::_nil ());
     }
 
@@ -1225,7 +1225,7 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 validate_properties (const char* type,
                      const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
                      const CosTrading::PropertySeq& properties
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                   CosTrading::PropertyTypeMismatch,
                   CosTrading::ReadonlyDynamicProperty,
@@ -1235,7 +1235,7 @@ validate_properties (const char* type,
   CORBA::ULong length = properties.length ();
   const CosTradingRepos::ServiceTypeRepository::PropStructSeq&
     prop_types = type_struct->props;
-  TAO_Property_Evaluator_By_Name prop_eval (properties TAO_ENV_ARG_PARAMETER);
+  TAO_Property_Evaluator_By_Name prop_eval (properties ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Perform property validation
@@ -1261,7 +1261,7 @@ validate_properties (const char* type,
         {
           int check =
             (! prop_type->equal (prop_struct.value_type.in ()
-                                 TAO_ENV_ARG_PARAMETER));
+                                 ACE_ENV_ARG_PARAMETER));
           ACE_CHECK;
           if (check)
             {
@@ -1343,7 +1343,7 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Admin (void)
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Admin::OctetSeq *
-TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 0);
@@ -1366,7 +1366,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_search_card (CORBA::ULong value
-                     TAO_ENV_ARG_DECL_NOT_USED )
+                     ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1380,7 +1380,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_search_card (CORBA::ULong value
-                     TAO_ENV_ARG_DECL_NOT_USED )
+                     ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1394,7 +1394,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_match_card (CORBA::ULong value
-                    TAO_ENV_ARG_DECL_NOT_USED )
+                    ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1408,7 +1408,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_match_card (CORBA::ULong value
-                    TAO_ENV_ARG_DECL_NOT_USED )
+                    ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1422,7 +1422,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_return_card (CORBA::ULong value
-                     TAO_ENV_ARG_DECL_NOT_USED )
+                     ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1436,7 +1436,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_return_card (CORBA::ULong value
-                     TAO_ENV_ARG_DECL_NOT_USED )
+                     ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1450,7 +1450,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_list (CORBA::ULong value
-              TAO_ENV_ARG_DECL_NOT_USED )
+              ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1464,7 +1464,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_modifiable_properties (CORBA::Boolean value
-                                    TAO_ENV_ARG_DECL_NOT_USED )
+                                    ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1478,7 +1478,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_dynamic_properties (CORBA::Boolean value
-                                 TAO_ENV_ARG_DECL_NOT_USED )
+                                 ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1492,7 +1492,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::Boolean
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_supports_proxy_offers (CORBA::Boolean value
-                           TAO_ENV_ARG_DECL_NOT_USED )
+                           ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean return_value =
@@ -1506,7 +1506,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_hop_count (CORBA::ULong value
-                   TAO_ENV_ARG_DECL_NOT_USED )
+                   ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1520,7 +1520,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CORBA::ULong
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_hop_count (CORBA::ULong value
-                   TAO_ENV_ARG_DECL_NOT_USED )
+                   ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong return_value =
@@ -1534,7 +1534,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_def_follow_policy (CosTrading::FollowOption policy
-                       TAO_ENV_ARG_DECL_NOT_USED )
+                       ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1548,7 +1548,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_follow_policy (CosTrading::FollowOption policy
-                       TAO_ENV_ARG_DECL_NOT_USED )
+                       ACE_ENV_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1562,7 +1562,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::FollowOption
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_max_link_follow_policy (CosTrading::FollowOption policy
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::FollowOption return_value =
@@ -1576,7 +1576,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::TypeRepository_ptr
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_type_repos (CosTrading::TypeRepository_ptr repository
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosTrading::TypeRepository_ptr return_value =
@@ -1590,7 +1590,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Admin::OctetSeq*
 TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 set_request_id_stem (const CosTrading::Admin::OctetSeq& stem
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_,
@@ -1605,7 +1605,7 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_offers (CORBA::ULong how_many,
              CosTrading::OfferIdSeq_out ids,
              CosTrading::OfferIdIterator_out id_itr
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::NotImplemented))
 {
   // This method only applies when the register interface is implemented
@@ -1618,14 +1618,14 @@ list_offers (CORBA::ULong how_many,
   id_itr = CosTrading::OfferIdIterator::_nil ();
   if (how_many > 0)
     {
-      int check = offer_id_iter->next_n (how_many, ids TAO_ENV_ARG_PARAMETER);
+      int check = offer_id_iter->next_n (how_many, ids ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (check == 1)
         {
-          id_itr = offer_id_iter->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          id_itr = offer_id_iter->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
-          offer_id_iter->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+          offer_id_iter->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -1641,7 +1641,7 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_proxies (CORBA::ULong,
               CosTrading::OfferIdSeq_out,
               CosTrading::OfferIdIterator_out
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::NotImplemented))
 {
@@ -1669,7 +1669,7 @@ add_link (const char *name,
           CosTrading::Lookup_ptr target,
           CosTrading::FollowOption def_pass_on_follow_rule,
           CosTrading::FollowOption limiting_follow_rule
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Link::IllegalLinkName,
                   CosTrading::Link::DuplicateLinkName,
@@ -1699,7 +1699,7 @@ add_link (const char *name,
   // Ensure that the limiting link behavior for this link doesn't
   // exceed the maximum allowed for a link.
   CosTrading::FollowOption follow_policy =
-    this->max_link_follow_policy (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->max_link_follow_policy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   if (limiting_follow_rule < follow_policy)
     ACE_THROW (CosTrading::Link::LimitingFollowTooPermissive
@@ -1722,7 +1722,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 remove_link (const char *name
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Link::IllegalLinkName,
                   CosTrading::Link::UnknownLinkName))
@@ -1743,7 +1743,7 @@ remove_link (const char *name
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Link::LinkInfo *
 TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Link::IllegalLinkName,
                    CosTrading::Link::UnknownLinkName))
@@ -1777,7 +1777,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
   // This avoids the nested upcall that would occur were we to invoke
   // this method in the add_link method.
 
-  new_link_info->target_reg = old_link_info.target->register_if (TAO_ENV_SINGLE_ARG_PARAMETER);
+  new_link_info->target_reg = old_link_info.target->register_if (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (new_link_info);
 
   // return the link information for this link name.
@@ -1786,7 +1786,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::describe_link (const char *name
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::LinkNameSeq*
-TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::list_links (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Allocate space for the link names.
@@ -1810,7 +1810,7 @@ TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 modify_link (const char *name,
              CosTrading::FollowOption def_pass_on_follow_rule,
              CosTrading::FollowOption limiting_follow_rule
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
                    CosTrading::Link::UnknownLinkName,
                    CosTrading::Link::DefaultFollowTooPermissive,
@@ -1835,7 +1835,7 @@ modify_link (const char *name,
   // Ensure that the limiting link behavior for this link doesn't
   // exceed the maximum allowed for a link.
   CosTrading::FollowOption follow_policy =
-    this->max_link_follow_policy (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->max_link_follow_policy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (limiting_follow_rule < follow_policy)
@@ -1871,7 +1871,7 @@ export_proxy (CosTrading::Lookup_ptr,
               CORBA::Boolean,
               const char *,
               const CosTrading::PolicySeq&
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalServiceType,
                   CosTrading::UnknownServiceType,
@@ -1891,7 +1891,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 withdraw_proxy (const char *
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
@@ -1904,7 +1904,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::Proxy::ProxyInfo *
 TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 describe_proxy (const char *
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::IllegalOfferId,
                   CosTrading::UnknownOfferId,
@@ -1919,7 +1919,7 @@ TAO_Proxy<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
 list_proxies (CORBA::ULong,
                 CosTrading::OfferIdSeq*&,
                 CosTrading::OfferIdIterator_ptr&
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented))
 {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index 34d492776d7..53916ffb120 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -75,7 +75,7 @@ public:
            CosTrading::OfferSeq_out offers,
            CosTrading::OfferIterator_out offer_itr,
            CosTrading::PolicyNameSeq_out limits_applied
-           TAO_ENV_ARG_DECL)
+           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalServiceType,
                     CosTrading::UnknownServiceType,
@@ -180,7 +180,7 @@ private:
                             TAO_Constraint_Interpreter& constr_inter,
                             TAO_Preference_Interpreter& pref_inter,
                             TAO_Offer_Filter& offer_filter
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Traverse the type hierarchy to pull the matching offers from all
   // subtypes of the root type.
 
@@ -199,7 +199,7 @@ private:
                         TAO_Preference_Interpreter& pref_inter,
                         CosTrading::OfferSeq& offers,
                         CosTrading::OfferIterator_ptr& offer_itr
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                     CosTrading::DuplicatePropertyName));
   // This method takes the list of ordered offers and places a number
@@ -218,7 +218,7 @@ private:
                       CosTrading::OfferSeq_out offers,
                       CosTrading::OfferIterator_out offer_itr,
                       CosTrading::PolicyNameSeq_out limits_applied
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -236,7 +236,7 @@ private:
   CORBA::Boolean retrieve_links (TAO_Policies& policies,
                                  CORBA::ULong offer_returned,
                                  CosTrading::LinkNameSeq_out links
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Lookup::PolicyTypeMismatch));
   // Assemble a sequence of links that the federate_query method
@@ -256,7 +256,7 @@ private:
                         CosTrading::OfferSeq& offers,
                         CosTrading::OfferIterator_ptr& offer_itr,
                         CosTrading::PolicyNameSeq& limits_applied
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -278,7 +278,7 @@ private:
 
   CORBA::Boolean seen_request_id (TAO_Policies& policies,
                                   CosTrading::Admin::OctetSeq*& seq
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Lookup::PolicyTypeMismatch));
 
@@ -322,7 +322,7 @@ public:
   virtual CosTrading::OfferId _cxx_export (CORBA::Object_ptr reference,
                                            const char *type,
                                            const CosTrading::PropertySeq& properties
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Register::InvalidObjectRef,
                     CosTrading::IllegalServiceType,
@@ -388,7 +388,7 @@ public:
   // parameter, the DuplicatePropertyName exception is raised.
   // END SPEC
 
-  virtual void withdraw (const char *id TAO_ENV_ARG_DECL)
+  virtual void withdraw (const char *id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
@@ -409,7 +409,7 @@ public:
 
   virtual CosTrading::Register::OfferInfo*
     describe (const char * id
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
@@ -432,7 +432,7 @@ public:
   virtual void modify (const char * id,
                        const CosTrading::PropertyNameSeq& del_list,
                        const CosTrading::PropertySeq& modify_list
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented,
                      CosTrading::IllegalOfferId,
@@ -501,7 +501,7 @@ public:
 
   virtual void withdraw_using_constraint (const char *type,
                                           const char *constr
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -533,7 +533,7 @@ public:
 
   virtual CosTrading::Register_ptr
     resolve (const CosTrading::TraderName &name
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::IllegalTraderName,
                      CosTrading::Register::UnknownTraderName,
@@ -567,7 +567,7 @@ public:
   void validate_properties (const char* type,
                             const CosTradingRepos::ServiceTypeRepository::TypeStruct* type_struct,
                             const CosTrading::PropertySeq& properties
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::PropertyTypeMismatch,
                      CosTrading::ReadonlyDynamicProperty,
@@ -623,47 +623,47 @@ public:
   // = Importing Parameters (used by the Lookup Interface)
 
   virtual CORBA::ULong set_def_search_card (CORBA::ULong value
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::ULong set_max_search_card (CORBA::ULong value
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // search card is the cardinality of the offers searched for
   // constraint compliance.
 
 
   virtual CORBA::ULong set_def_match_card (CORBA::ULong value
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::ULong set_max_match_card (CORBA::ULong value
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // match card is the cardinality of offers found compliant with the
   // constraints.
 
   virtual CORBA::ULong set_def_return_card (CORBA::ULong value
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::ULong set_max_return_card (CORBA::ULong value
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // return card is the cardinality of the offers returned from
   // Lookup.
 
   virtual CORBA::ULong set_max_list (CORBA::ULong value
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
     set_supports_modifiable_properties (CORBA::Boolean value
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
     set_supports_dynamic_properties (CORBA::Boolean value
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::Boolean
     set_supports_proxy_offers (CORBA::Boolean value
-                               TAO_ENV_ARG_DECL_NOT_USED)
+                               ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Types of offers available for consideration. Ween out those
   // offers with modifiable properties
@@ -671,45 +671,45 @@ public:
   // = Link Interface parameters
 
   virtual CORBA::ULong set_def_hop_count (CORBA::ULong value
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CORBA::ULong set_max_hop_count (CORBA::ULong value
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::FollowOption
     set_def_follow_policy (CosTrading::FollowOption policy
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosTrading::FollowOption
     set_max_follow_policy (CosTrading::FollowOption policy
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual CosTrading::FollowOption
     set_max_link_follow_policy (CosTrading::FollowOption policy
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // = Set Type Repository
 
   virtual CosTrading::TypeRepository_ptr
     set_type_repos (CosTrading::TypeRepository_ptr repository
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::Admin::OctetSeq*
-    request_id_stem (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    request_id_stem (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CosTrading::Admin::OctetSeq*
     set_request_id_stem (const CosTrading::Admin::OctetSeq& stem
-                         TAO_ENV_ARG_DECL_NOT_USED)
+                         ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void list_offers (CORBA::ULong how_many,
                             CosTrading::OfferIdSeq_out ids,
                             CosTrading::OfferIdIterator_out id_itr
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
@@ -735,7 +735,7 @@ public:
   virtual void list_proxies (CORBA::ULong,
                              CosTrading::OfferIdSeq_out,
                              CosTrading::OfferIdIterator_out
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
@@ -776,7 +776,7 @@ public:
                          CosTrading::Lookup_ptr target,
                          CosTrading::FollowOption def_pass_on_follow_rule,
                          CosTrading::FollowOption limiting_follow_rule
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::DuplicateLinkName,
@@ -825,7 +825,7 @@ public:
   // END SPEC
 
   virtual void remove_link (const char *name
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName));
@@ -842,7 +842,7 @@ public:
   // END SPEC
 
   virtual CosTrading::Link::LinkInfo* describe_link (const char *name
-                                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName));
@@ -870,7 +870,7 @@ public:
   // state.
   // END SPEC
 
-  virtual CosTrading::LinkNameSeq* list_links (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::LinkNameSeq* list_links (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // BEGIN SPEC
@@ -883,7 +883,7 @@ public:
   virtual void modify_link (const char *name,
                             CosTrading::FollowOption def_pass_on_follow_rule,
                             CosTrading::FollowOption limiting_follow_rule
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::Link::IllegalLinkName,
                     CosTrading::Link::UnknownLinkName,
                     CosTrading::Link::DefaultFollowTooPermissive,
@@ -957,7 +957,7 @@ public:
                   CORBA::Boolean if_match_all,
                   const char *,
                   const CosTrading::PolicySeq &
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalServiceType,
                     CosTrading::UnknownServiceType,
@@ -971,7 +971,7 @@ public:
                     CosTrading::DuplicatePolicyName));
 
   virtual void withdraw_proxy (const char *
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId,
@@ -979,7 +979,7 @@ public:
 
   virtual CosTrading::Proxy::ProxyInfo *
   describe_proxy (const char *
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::IllegalOfferId,
                     CosTrading::UnknownOfferId,
@@ -990,7 +990,7 @@ public:
   virtual void list_proxies (CORBA::ULong,
                              CosTrading::OfferIdSeq *&,
                              CosTrading::OfferIdIterator_ptr &
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::NotImplemented));
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index b452b289d20..2b02ec5ffdc 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -26,9 +26,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (lookup,
                (TAO_Lookup<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().lookup_if (lookup->_this (TAO_ENV_SINGLE_ARG_PARAMETER));
+      this->trading_components ().lookup_if (lookup->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
-      lookup->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      lookup->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->ifs_[LOOKUP_IF] = lookup;
@@ -40,9 +40,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (reg,
                (TAO_Register<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().register_if (reg->_this (TAO_ENV_SINGLE_ARG_PARAMETER));
+      this->trading_components ().register_if (reg->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
-      reg->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      reg->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->ifs_[REGISTER_IF] = reg;
@@ -54,9 +54,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (admin,
                (TAO_Admin<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().admin_if (admin->_this (TAO_ENV_SINGLE_ARG_PARAMETER));
+      this->trading_components ().admin_if (admin->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
-      admin->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      admin->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->ifs_[ADMIN_IF] = admin;
@@ -68,9 +68,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (proxy,
                (TAO_Proxy<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().proxy_if (proxy->_this (TAO_ENV_SINGLE_ARG_PARAMETER));
+      this->trading_components ().proxy_if (proxy->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
-      proxy->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->ifs_[PROXY_IF] = proxy;
@@ -82,9 +82,9 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       ACE_NEW (link,
                (TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>) (*this));
 
-      this->trading_components ().link_if (link->_this (TAO_ENV_SINGLE_ARG_PARAMETER));
+      this->trading_components ().link_if (link->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
-      link->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      link->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->ifs_[LINK_IF] = link;
@@ -105,14 +105,14 @@ TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void)
           ACE_TRY
             {
               PortableServer::POA_var poa =
-                this->ifs_[i]->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+                this->ifs_[i]->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               PortableServer::ObjectId_var id =
-                poa->servant_to_id (this->ifs_[i] TAO_ENV_ARG_PARAMETER);
+                poa->servant_to_id (this->ifs_[i] ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+              poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY
@@ -146,35 +146,35 @@ TAO_Trader_Components (const TAO_Trading_Components_i& comps)
 }
 
 template <class IF> CosTrading::Lookup_ptr
-TAO_Trader_Components<IF>::lookup_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::lookup_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Lookup::_duplicate (this->comps_.lookup_if ());
 }
 
 template <class IF> CosTrading::Register_ptr
-TAO_Trader_Components<IF>::register_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::register_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Register::_duplicate (this->comps_.register_if ());
 }
 
 template <class IF> CosTrading::Admin_ptr
-TAO_Trader_Components<IF>::admin_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::admin_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Admin::_duplicate (this->comps_.admin_if ());
 }
 
 template <class IF> CosTrading::Proxy_ptr
-TAO_Trader_Components<IF>::proxy_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::proxy_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Proxy::_duplicate (this->comps_.proxy_if ());
 }
 
 template <class IF> CosTrading::Link_ptr
-TAO_Trader_Components<IF>::link_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Trader_Components<IF>::link_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::Link::_duplicate (this->comps_.link_if ());
@@ -187,28 +187,28 @@ TAO_Support_Attributes (const TAO_Support_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Support_Attributes<IF>::supports_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_modifiable_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Support_Attributes<IF>::supports_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_dynamic_properties ();
 }
 
 template <class IF> CORBA::Boolean
-TAO_Support_Attributes<IF>::supports_proxy_offers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Support_Attributes<IF>::supports_proxy_offers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.supports_proxy_offers ();
 }
 
 template <class IF> CosTrading::TypeRepository_ptr
-TAO_Support_Attributes<IF>::type_repos (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
+TAO_Support_Attributes<IF>::type_repos (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CosTrading::TypeRepository::_duplicate (this->attrs_.type_repos ());
@@ -222,77 +222,77 @@ TAO_Import_Attributes (const TAO_Import_Attributes_i& attrs)
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_search_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_search_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_search_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_match_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_match_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_match_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_return_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_return_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_return_card ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_list (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_list ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::def_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_hop_count ();
 }
 
 template <class IF> CORBA::ULong
-TAO_Import_Attributes<IF>::max_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_hop_count ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::def_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::def_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.def_follow_policy ();
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Import_Attributes<IF>::max_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Import_Attributes<IF>::max_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_follow_policy ();
@@ -306,7 +306,7 @@ TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs)
 }
 
 template <class IF> CosTrading::FollowOption
-TAO_Link_Attributes<IF>::max_link_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Link_Attributes<IF>::max_link_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->attrs_.max_link_follow_policy ();
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index fd7aa7d1dd7..3f4732e92ec 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -113,27 +113,27 @@ public:
   TAO_Trader_Components (const TAO_Trading_Components_i& comps);
 
   // = CosTrading::TraderComponents methods.
-  virtual CosTrading::Lookup_ptr lookup_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::Lookup_ptr lookup_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns an object reference to the Lookup interface of the trader.
   // Returns nil if the trader does not support Lookup interface.
 
-  virtual CosTrading::Register_ptr register_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::Register_ptr register_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference for the Register interface of the trader.
   // Returns nil if the trader does not support Register interface.
 
-  virtual CosTrading::Link_ptr link_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::Link_ptr link_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference for the Link interface of the trader.
   // Returns nil if the trader does not support Link interface.
 
-  virtual CosTrading::Proxy_ptr proxy_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::Proxy_ptr proxy_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference to the Proxy interface of the trader.
   // Returns nil if the trader does not support Proxy interface.
 
-  virtual CosTrading::Admin_ptr admin_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::Admin_ptr admin_if (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference for the Admin interface of the trader.
   // Returns nil if the trader does not support Admin interface.
@@ -152,16 +152,16 @@ public:
 
   // = CosTrading::SupportAttributes methods.
 
-  virtual CORBA::Boolean supports_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Boolean supports_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean supports_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Boolean supports_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean supports_proxy_offers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Boolean supports_proxy_offers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosTrading::TypeRepository_ptr type_repos (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::TypeRepository_ptr type_repos (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -178,47 +178,47 @@ public:
 
   // = CosTrading::ImportAttributes methods.
 
-  virtual CORBA::ULong def_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong def_search_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong max_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong max_search_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Search cardinality determines the maximum number of offers searched
   // before not considering other offers.
 
-  virtual CORBA::ULong def_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong def_match_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong max_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong max_match_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Match cardinality determines the maximum number of offers
   // matched to the constraints before not considering other offers..
 
-  virtual CORBA::ULong def_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong def_return_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong max_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong max_return_card (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return cardinality determines the maximum number of offers marked
   // to return before not considering other offers.
 
 
-  virtual CORBA::ULong max_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong max_list (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong def_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong def_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong max_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::ULong max_hop_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosTrading::FollowOption def_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::FollowOption def_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosTrading::FollowOption max_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::FollowOption max_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -235,7 +235,7 @@ public:
   TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs);
 
   // = CosTrading::LinkAttributes methods
-  virtual CosTrading::FollowOption max_link_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CosTrading::FollowOption max_link_follow_policy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 9ab03d4f1c8..c4f76622ba7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -230,10 +230,10 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
       CORBA::TypeCode_var type = value.type ();
 
       // @@ Seth, this will not work on platforms using environment variable.
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
 
       if (type->equal (CosTradingDynamic::_tc_DynamicProp
-                       TAO_ENV_ARG_PARAMETER))
+                       ACE_ENV_ARG_PARAMETER))
         return_value = 1;
     }
 
@@ -242,7 +242,7 @@ TAO_Property_Evaluator::is_dynamic_property (int index)
 
 CORBA::Any*
 TAO_Property_Evaluator::property_value (int index
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* prop_val = 0;
@@ -282,7 +282,7 @@ TAO_Property_Evaluator::property_value (int index
           ACE_TRY
             {
               // Retrieve the value of the dynamic property.
-              prop_val = dp_eval->evalDP(name, type, info TAO_ENV_ARG_PARAMETER);
+              prop_val = dp_eval->evalDP(name, type, info ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (this->dp_cache_ != 0)
@@ -326,7 +326,7 @@ TAO_Property_Evaluator::property_type (int index)
 
 TAO_Property_Evaluator_By_Name::
 TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
-                                TAO_ENV_ARG_DECL,
+                                ACE_ENV_ARG_DECL,
                                 CORBA::Boolean supports_dp)
   ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
                    CosTrading::IllegalPropertyName))
@@ -378,7 +378,7 @@ is_dynamic_property(const char* property_name)
 
 CORBA::Any*
 TAO_Property_Evaluator_By_Name::property_value (const char* property_name
-                                                TAO_ENV_ARG_DECL)
+                                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   int index = 0;
@@ -391,7 +391,7 @@ TAO_Property_Evaluator_By_Name::property_value (const char* property_name
     {
       prop_value =
         this->TAO_Property_Evaluator::property_value (index
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -447,12 +447,12 @@ construct_dynamic_prop (const char* name,
   if (this->prop_.in () == CosTradingDynamic::DynamicPropEval::_nil ())
     {
       // Seth, we need a way to either propagate exceptions out.
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
 
-      this->prop_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->prop_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -472,17 +472,17 @@ TAO_Dynamic_Property::destroy (void)
   if (this->prop_.in () != CosTradingDynamic::DynamicPropEval::_nil ())
     {
       // @@ Seth, we need a way to propagate exceptions out.
-      TAO_ENV_DECLARE_NEW_ENV;
-      PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ACE_DECLARE_NEW_CORBA_ENV;
+      PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       PortableServer::ObjectId_var id =
         poa->servant_to_id (this
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       poa->deactivate_object (id.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -504,7 +504,7 @@ const char* TAO_Policies::POLICY_NAMES[] =
 
 TAO_Policies::TAO_Policies (TAO_Trader_Base& trader,
                             const CosTrading::PolicySeq& policies
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
                   CosTrading::DuplicatePolicyName))
   : trader_ (trader)
@@ -573,7 +573,7 @@ TAO_Policies::~TAO_Policies (void)
 
 CORBA::ULong
 TAO_Policies::ulong_prop (POLICY_TYPE pol
-                          TAO_ENV_ARG_DECL) const
+                          ACE_ENV_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::ULong return_value = 0, max_value = 0;
@@ -611,7 +611,7 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol
       const CosTrading::PolicyValue& value = policy->value;
       CORBA::TypeCode_var type = value.type ();
 
-      CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean equal_ulong = type->equal (CORBA::_tc_ulong ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (return_value);
 
       if (!equal_ulong)
@@ -628,29 +628,29 @@ TAO_Policies::ulong_prop (POLICY_TYPE pol
 }
 
 CORBA::ULong
-TAO_Policies::search_card (TAO_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::search_card (ACE_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (SEARCH_CARD TAO_ENV_ARG_PARAMETER);
+  return this->ulong_prop (SEARCH_CARD ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::ULong
-TAO_Policies::match_card (TAO_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::match_card (ACE_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (MATCH_CARD TAO_ENV_ARG_PARAMETER);
+  return this->ulong_prop (MATCH_CARD ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::ULong
-TAO_Policies::return_card (TAO_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::return_card (ACE_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (RETURN_CARD TAO_ENV_ARG_PARAMETER);
+  return this->ulong_prop (RETURN_CARD ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_Policies::boolean_prop (POLICY_TYPE pol
-                            TAO_ENV_ARG_DECL) const
+                            ACE_ENV_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CORBA::Boolean def_value = 1,
@@ -683,7 +683,7 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol
       CORBA::TypeCode_var type = value.type ();
 
       CORBA::Boolean equal_boolean =
-        type->equal (CORBA::_tc_boolean TAO_ENV_ARG_PARAMETER);
+        type->equal (CORBA::_tc_boolean ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (return_value);
 
       if (!equal_boolean)
@@ -704,36 +704,36 @@ TAO_Policies::boolean_prop (POLICY_TYPE pol
 
 
 CORBA::Boolean
-TAO_Policies::use_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::use_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_MODIFIABLE_PROPERTIES TAO_ENV_ARG_PARAMETER);
+  return this->boolean_prop (USE_MODIFIABLE_PROPERTIES ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Policies::use_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::use_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_DYNAMIC_PROPERTIES TAO_ENV_ARG_PARAMETER);
+  return this->boolean_prop (USE_DYNAMIC_PROPERTIES ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Policies::use_proxy_offers (TAO_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::use_proxy_offers (ACE_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (USE_PROXY_OFFERS TAO_ENV_ARG_PARAMETER);
+  return this->boolean_prop (USE_PROXY_OFFERS ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Policies::exact_type_match (TAO_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::exact_type_match (ACE_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->boolean_prop (EXACT_TYPE_MATCH TAO_ENV_ARG_PARAMETER);
+  return this->boolean_prop (EXACT_TYPE_MATCH ACE_ENV_ARG_PARAMETER);
 }
 
 
 CosTrading::TraderName*
-TAO_Policies::starting_trader (TAO_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::starting_trader (ACE_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue))
 {
@@ -746,11 +746,11 @@ TAO_Policies::starting_trader (TAO_ENV_SINGLE_ARG_DECL) const
       CORBA::TypeCode_var type = value.type ();
 
       CORBA::Boolean equal_tradername =
-        type->equal (CosTrading::_tc_TraderName TAO_ENV_ARG_PARAMETER);
+        type->equal (CosTrading::_tc_TraderName ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (trader_name);
 
       CORBA::Boolean equal_linknameseq =
-        type->equal (CosTrading::_tc_LinkNameSeq TAO_ENV_ARG_PARAMETER);
+        type->equal (CosTrading::_tc_LinkNameSeq ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (trader_name);
 
       if (!equal_tradername ||
@@ -765,7 +765,7 @@ TAO_Policies::starting_trader (TAO_ENV_SINGLE_ARG_DECL) const
 }
 
 CosTrading::FollowOption
-TAO_Policies::link_follow_rule (TAO_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::link_follow_rule (ACE_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CosTrading::FollowOption return_value =
@@ -782,7 +782,7 @@ TAO_Policies::link_follow_rule (TAO_ENV_SINGLE_ARG_DECL) const
 
       // Extract the link follow rule
       CORBA::Boolean type_equal =
-        type->equal (CosTrading::_tc_FollowOption TAO_ENV_ARG_PARAMETER);
+        type->equal (CosTrading::_tc_FollowOption ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (return_value);
 
       if (!type_equal)
@@ -800,7 +800,7 @@ TAO_Policies::link_follow_rule (TAO_ENV_SINGLE_ARG_DECL) const
 
 CosTrading::FollowOption
 TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info
-                                TAO_ENV_ARG_DECL) const
+                                ACE_ENV_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue,
                    CosTrading::Link::IllegalLinkName,
@@ -814,7 +814,7 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info
 
   // If not defined defaults to trader.def_link_follow_rule
   CosTrading::FollowOption query_link_follow_rule =
-    this->link_follow_rule (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->link_follow_rule (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (return_value);
 
   return_value = (query_link_follow_rule < trader_max_follow_policy)
@@ -826,14 +826,14 @@ TAO_Policies::link_follow_rule (const CosTrading::Link::LinkInfo& link_info
 }
 
 CORBA::ULong
-TAO_Policies::hop_count (TAO_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::hop_count (ACE_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
-  return this->ulong_prop (HOP_COUNT TAO_ENV_ARG_PARAMETER);
+  return this->ulong_prop (HOP_COUNT ACE_ENV_ARG_PARAMETER);
 }
 
 CosTrading::Admin::OctetSeq*
-TAO_Policies::request_id (TAO_ENV_SINGLE_ARG_DECL) const
+TAO_Policies::request_id (ACE_ENV_SINGLE_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch))
 {
   CosTrading::Admin::OctetSeq* request_id = 0;
@@ -845,7 +845,7 @@ TAO_Policies::request_id (TAO_ENV_SINGLE_ARG_DECL) const
       CORBA::TypeCode_var type = value.type ();
 
       CORBA::Boolean equal_octetseq =
-        type->equal (CosTrading::Admin::_tc_OctetSeq TAO_ENV_ARG_PARAMETER);
+        type->equal (CosTrading::Admin::_tc_OctetSeq ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (request_id);
 
       if (!equal_octetseq)
@@ -862,7 +862,7 @@ void
 TAO_Policies::
 copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
                        const CosTrading::Link::LinkInfo& link_info
-                       TAO_ENV_ARG_DECL) const
+                       ACE_ENV_ARG_DECL) const
   ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue))
 {
@@ -873,7 +873,7 @@ copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
   if (this->policies_[LINK_FOLLOW_RULE] != 0)
     {
       CosTrading::FollowOption query_link_follow_rule =
-        this->link_follow_rule (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->link_follow_rule (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       follow_option = (CosTrading::FollowOption)
@@ -943,9 +943,9 @@ copy_to_pass (CosTrading::PolicySeq& policy_seq,
       if (i == HOP_COUNT)
         {
           // @@ Seth, Same thing here, are you trying to catch the exception??? (and forget about it?)
-          TAO_ENV_DECLARE_NEW_ENV;
+          ACE_DECLARE_NEW_CORBA_ENV;
           new_policy.name = POLICY_NAMES[HOP_COUNT];
-          new_policy.value <<= this->hop_count (TAO_ENV_SINGLE_ARG_PARAMETER) - 1;
+          new_policy.value <<= this->hop_count (ACE_ENV_SINGLE_ARG_PARAMETER) - 1;
 
           // Don't count hop count twice.
           if (this->policies_[i] == 0)
@@ -1088,7 +1088,7 @@ TAO_Offer_Modifier::~TAO_Offer_Modifier (void)
 void
 TAO_Offer_Modifier::
 delete_properties (const CosTrading::PropertyNameSeq& deletes
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
                   CosTrading::Register::MandatoryProperty,
                   CosTrading::IllegalPropertyName,
@@ -1128,7 +1128,7 @@ delete_properties (const CosTrading::PropertyNameSeq& deletes
 void
 TAO_Offer_Modifier::
 merge_properties (const CosTrading::PropertySeq& modifies
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName,
                    CosTrading::PropertyTypeMismatch,
@@ -1174,7 +1174,7 @@ merge_properties (const CosTrading::PropertySeq& modifies
               // seemed "safest".
 
               CORBA::Boolean td_equal =
-                type_def->equal (prop_type.in () TAO_ENV_ARG_PARAMETER);
+                type_def->equal (prop_type.in () ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
 
               if (!td_equal)
@@ -1249,25 +1249,25 @@ TAO_Offer_Modifier::affect_change (const CosTrading::PropertySeq& modifies)
 }
 
 TAO_Offer_Filter::TAO_Offer_Filter (TAO_Policies& policies
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  search_card_ = policies.search_card (TAO_ENV_SINGLE_ARG_PARAMETER);
+  search_card_ = policies.search_card (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  match_card_ = policies.match_card (TAO_ENV_SINGLE_ARG_PARAMETER);
+  match_card_ = policies.match_card (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  return_card_ = policies.return_card (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return_card_ = policies.return_card (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  dp_ = policies.use_dynamic_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+  dp_ = policies.use_dynamic_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  mod_ = policies.use_modifiable_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+  mod_ = policies.use_modifiable_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Boolean exact_type_match =
-    policies.exact_type_match (TAO_ENV_SINGLE_ARG_PARAMETER);
+    policies.exact_type_match (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (exact_type_match == 1)
@@ -1423,7 +1423,7 @@ TAO_Offer_Filter::limits_applied (void)
 
 TAO_Property_Filter::
 TAO_Property_Filter (const SPECIFIED_PROPS& desired_props
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                    CosTrading::DuplicatePropertyName))
   : policy_  (desired_props._d ())
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index f7e52735058..43a71265ba9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -72,7 +72,7 @@ public:
   // Returns 1 if the property at index <index> is dynamic. Returns a
   // 0 when the index is out of bounds.
 
-  CORBA::Any* property_value(int index TAO_ENV_ARG_DECL)
+  CORBA::Any* property_value(int index ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
   // Returns value of the property whose index is <index>. If the
@@ -130,7 +130,7 @@ class TAO_Trading_Export TAO_Property_Evaluator_By_Name : public TAO_Property_Ev
 public:
 
   TAO_Property_Evaluator_By_Name (const CosTrading::PropertySeq& properties
-                                  TAO_ENV_ARG_DECL ,
+                                  ACE_ENV_ARG_DECL ,
                                   CORBA::Boolean supports_dp = 1)
     ACE_THROW_SPEC ((CosTrading::DuplicatePropertyName,
                      CosTrading::IllegalPropertyName));
@@ -147,7 +147,7 @@ public:
   // will throw a Property_Undefined exception with impunity.
 
   CORBA::Any* property_value(const char* property_name
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
   // This method is identical to its counterpart in
@@ -188,7 +188,7 @@ public:
   virtual CORBA::Any* evalDP(const char* name,
                              CORBA::TypeCode_ptr returned_type,
                              const CORBA::Any& extra_info
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTradingDynamic::DPEvalFailure)) = 0;
   // Dynamic property evaluation call-back method.
@@ -246,7 +246,7 @@ public:
 
   TAO_Policies (TAO_Trader_Base& trader,
                 const CosTrading::PolicySeq& policies
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::Lookup::IllegalPolicyName,
                      CosTrading::DuplicatePolicyName));
 
@@ -274,7 +274,7 @@ public:
 
   ~TAO_Policies (void);
 
-  CORBA::ULong search_card (TAO_ENV_SINGLE_ARG_DECL) const
+  CORBA::ULong search_card (ACE_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -286,7 +286,7 @@ public:
   // trader's def_search_card attribute is used.
   // END SPEC
 
-  CORBA::ULong match_card (TAO_ENV_SINGLE_ARG_DECL) const
+  CORBA::ULong match_card (ACE_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -298,7 +298,7 @@ public:
   // attribute is used.
   // END SPEC
 
-  CORBA::ULong return_card (TAO_ENV_SINGLE_ARG_DECL) const
+  CORBA::ULong return_card (ACE_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -312,7 +312,7 @@ public:
 
   // = Offer consideration policies
 
-  CORBA::Boolean use_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL) const
+  CORBA::Boolean use_modifiable_properties (ACE_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -325,7 +325,7 @@ public:
   // included.
   // END SPEC
 
-  CORBA::Boolean use_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL) const
+  CORBA::Boolean use_dynamic_properties (ACE_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -338,7 +338,7 @@ public:
   // included.
   // END SPEC
 
-  CORBA::Boolean use_proxy_offers (TAO_ENV_SINGLE_ARG_DECL) const
+  CORBA::Boolean use_proxy_offers (ACE_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -350,7 +350,7 @@ public:
   // specified, such offers will be included.
   // END SPEC
 
-  CORBA::Boolean exact_type_match (TAO_ENV_SINGLE_ARG_DECL) const
+  CORBA::Boolean exact_type_match (ACE_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -362,7 +362,7 @@ public:
 
   // = Federated trader policies (not implemented yet)
 
-  CosTrading::TraderName* starting_trader (TAO_ENV_SINGLE_ARG_DECL) const
+  CosTrading::TraderName* starting_trader (ACE_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue));
   // BEGIN SPEC
@@ -381,7 +381,7 @@ public:
   // "starting_trader" policy with the first component removed.
   // END SPEC
 
-  CosTrading::FollowOption link_follow_rule (TAO_ENV_SINGLE_ARG_DECL) const
+  CosTrading::FollowOption link_follow_rule (ACE_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Determine the link follow policy for this query overall.
 
@@ -393,7 +393,7 @@ public:
 
 
   CosTrading::FollowOption link_follow_rule (const CosTrading::Link::LinkInfo& link_info
-                                             TAO_ENV_ARG_DECL) const
+                                             ACE_ENV_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue,
                      CosTrading::Link::IllegalLinkName,
@@ -407,7 +407,7 @@ public:
   // else min(trader.max_follow_policy, link.limiting_follow_rule,
   //          trader.def_follow_policy)
 
-  CORBA::ULong hop_count (TAO_ENV_SINGLE_ARG_DECL) const
+  CORBA::ULong hop_count (ACE_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
 
   // BEGIN SPEC
@@ -422,7 +422,7 @@ public:
   // decremented before passing on to a federated trader.
   // END SPEC
 
-  CosTrading::Admin::OctetSeq* request_id (TAO_ENV_SINGLE_ARG_DECL) const
+  CosTrading::Admin::OctetSeq* request_id (ACE_ENV_SINGLE_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Return the request_id passed to the query method across a link to
   // another trader.
@@ -437,7 +437,7 @@ public:
 
   void copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
                               const CosTrading::Link::LinkInfo& link_info
-                              TAO_ENV_ARG_DECL) const
+                              ACE_ENV_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                      CosTrading::Lookup::InvalidPolicyValue));
   // Determine the link follow policy to pass down the link with <link_name>.
@@ -452,12 +452,12 @@ public:
 private:
 
   CORBA::ULong ulong_prop (POLICY_TYPE pol
-                           TAO_ENV_ARG_DECL) const
+                           ACE_ENV_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Reconclile a ULong property with its default.
 
   CORBA::Boolean boolean_prop (POLICY_TYPE pol
-                               TAO_ENV_ARG_DECL) const
+                               ACE_ENV_ARG_DECL) const
     ACE_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch));
   // Reconcile a Boolean property with its debault.
 
@@ -568,7 +568,7 @@ public:
   ~TAO_Offer_Modifier (void);
 
   void delete_properties (const CosTrading::PropertyNameSeq& deletes
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::Register::UnknownPropertyName,
                      CosTrading::Register::MandatoryProperty,
                      CosTrading::IllegalPropertyName,
@@ -577,7 +577,7 @@ public:
   // constructor. Ensure we don't delete mandatory properties.
 
   void merge_properties (const CosTrading::PropertySeq& modifies
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName,
                      CosTrading::PropertyTypeMismatch,
@@ -639,7 +639,7 @@ class TAO_Offer_Filter
 public:
 
   TAO_Offer_Filter (TAO_Policies& policies
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // Glean from the TypeStruct and Policy setting the appropriate way
   // to screen unsuitable offers from consideration.
 
@@ -717,7 +717,7 @@ public:
   // An accomplice to g++'s insane lust for copy constructors.
 
   TAO_Property_Filter (const SPECIFIED_PROPS& desired_props
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName));
   // Verify that the specified properties are correct.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
index 9074816f56b..d1ea2076b89 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -75,13 +75,13 @@ TAO_Trading_Loader::~TAO_Trading_Loader (void)
 int
 TAO_Trading_Loader::init (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB Manager
       this->orb_manager_.init (argc,
                                argv
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
@@ -89,7 +89,7 @@ TAO_Trading_Loader::init (int argc, char *argv[])
 
       // Initializes and sets up the Trading Service
       CORBA::Object_var object =
-        this->create_object (orb.in (), argc, argv TAO_ENV_ARG_PARAMETER);
+        this->create_object (orb.in (), argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -115,7 +115,7 @@ TAO_Trading_Loader::fini (void)
             trd_comp.link_if ();
 
           CosTrading::LinkNameSeq_var link_name_seq =
-            our_link->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
+            our_link->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
@@ -132,7 +132,7 @@ TAO_Trading_Loader::fini (void)
                           "*** Describing the next link.\n"));
               CosTrading::Link::LinkInfo_var link_info =
                 our_link->describe_link (link_name_seq[i]
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
@@ -140,7 +140,7 @@ TAO_Trading_Loader::fini (void)
                           ACE_static_cast (const char *,
                                            link_name_seq[i])));
               our_link->remove_link (link_name_seq[i]
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CosTrading::Lookup_ptr remote_lookup;
@@ -150,7 +150,7 @@ TAO_Trading_Loader::fini (void)
               ACE_DEBUG ((LM_DEBUG,
                           "*** Retrieving its link interface.\n"));
               CosTrading::Link_var remote_link =
-                remote_lookup->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
+                remote_lookup->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
@@ -158,10 +158,10 @@ TAO_Trading_Loader::fini (void)
 
               if (this->bootstrapper_)
                 remote_link->remove_link ("Bootstrap"
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
               else
                 remote_link->remove_link (this->name_.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -176,10 +176,10 @@ TAO_Trading_Loader::fini (void)
 }
 
 int
-TAO_Trading_Loader::run (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Trading_Loader::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   int return_value =
-    this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return return_value;
@@ -188,14 +188,14 @@ TAO_Trading_Loader::run (TAO_ENV_SINGLE_ARG_DECL)
 CORBA::Object_ptr
 TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
                                    int argc, char *argv[]
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Duplicate the ORB
   CORBA::ORB_var orb = CORBA::ORB::_duplicate (orb_ptr);
 
   // Activating the poa manager
-  this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Create a Trader Object and set its Service Type Repository.
@@ -209,7 +209,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
   TAO_Trading_Components_i &trd_comp =
     this->trader_->trading_components ();
 
-  sup_attr.type_repos (this->type_repos_._this (TAO_ENV_SINGLE_ARG_PARAMETER));
+  sup_attr.type_repos (this->type_repos_._this (ACE_ENV_SINGLE_ARG_PARAMETER));
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // The Spec says: return a reference to the Lookup interface from
@@ -219,7 +219,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
 
   this->ior_ =
     orb->object_to_string (lookup
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Parse the args
@@ -242,7 +242,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
       // @@ Could do other things. For example, every timeout
       // period try to federate again, but let's not hardcode that
       // policy.
-      int rc = this->bootstrap_to_federation (TAO_ENV_SINGLE_ARG_PARAMETER);
+      int rc = this->bootstrap_to_federation (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       if (rc == -1)
@@ -255,7 +255,7 @@ TAO_Trading_Loader::create_object (CORBA::ORB_ptr orb_ptr,
 }
 
 int
-TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Trading_Loader::bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL)
 {
   // If all traders follow this strategy, it creates a complete graph
   // of all known traders on a multicast network.
@@ -265,7 +265,7 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               "*** Bootstrapping to another Trading Service.\n"));
   CORBA::Object_var trading_obj =
-    orb->resolve_initial_references ("TradingService" TAO_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("TradingService" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (trading_obj.in ()))
@@ -278,13 +278,13 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL)
               "*** Narrowing the lookup interface.\n"));
   CosTrading::Lookup_var lookup_if =
     CosTrading::Lookup::_narrow (trading_obj.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
               "*** Obtaining the link interface.\n"));
   CosTrading::Link_var link_if =
-    lookup_if->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
+    lookup_if->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   TAO_Trading_Components_i &trd_comp =
@@ -300,7 +300,7 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL)
                      our_lookup,
                      CosTrading::always,
                      CosTrading::always
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -309,13 +309,13 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL)
                       lookup_if.in (),
                       CosTrading::always,
                       CosTrading::always
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
               "*** Retrieving list of known linked traders.\n"));
   CosTrading::LinkNameSeq_var link_name_seq =
-    link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
+    link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -335,7 +335,7 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL)
                                        link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
             link_if->describe_link (link_name_seq[i]
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           CosTrading::Lookup_ptr remote_lookup;
@@ -344,7 +344,7 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL)
           ACE_DEBUG ((LM_DEBUG,
                       "*** Retrieving its link interface.\n"));
           CosTrading::Link_var remote_link =
-            remote_lookup->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
+            remote_lookup->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_DEBUG ((LM_DEBUG,
@@ -353,7 +353,7 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL)
                                  our_lookup,
                                  CosTrading::always,
                                  CosTrading::always
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_DEBUG ((LM_DEBUG,
@@ -362,7 +362,7 @@ TAO_Trading_Loader::bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL)
                               remote_lookup,
                               CosTrading::always,
                               CosTrading::always
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
     }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index 7b994f6d36d..364b11a840a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -46,12 +46,12 @@ public:
   // Called by the Service Configurator framework to remove the
   // Event Service. Defined in <ace/Service_Config.h>
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the Trading Service
 
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                    int argc, char *argv[]
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This function call initializes the Trading Service given a reference to the
   // ORB and the command line parameters.
@@ -62,7 +62,7 @@ public:
   // Enable the Trading Service to answer multicast requests for its
   // IOR.
 
-  int bootstrap_to_federation (TAO_ENV_SINGLE_ARG_DECL);
+  int bootstrap_to_federation (ACE_ENV_SINGLE_ARG_DECL);
   // Bootstrap to another trader, and attach to its trader network.
 
   int parse_args (int &argc, char *argv []);
diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp
index 2110f1b4821..bfd0ef01252 100644
--- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp
@@ -19,10 +19,10 @@ ECCL_Consumer::ECCL_Consumer (int iterations)
 void
 ECCL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
                         int event_type
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -31,12 +31,12 @@ ECCL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
       return;
 
     this->proxy_supplier_ =
-      consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::ConsumerQOS consumer_qos;
@@ -53,12 +53,12 @@ ECCL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
                                                 consumer_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECCL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECCL_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -70,17 +70,17 @@ ECCL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -92,7 +92,7 @@ ECCL_Consumer::sample_history (void)
 
 void
 ECCL_Consumer::push (const RtecEventComm::EventSet &events
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -106,7 +106,7 @@ ECCL_Consumer::push (const RtecEventComm::EventSet &events
 }
 
 void
-ECCL_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECCL_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.h
index 5fe9f00fce7..362f1eda087 100644
--- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.h
@@ -34,10 +34,10 @@ public:
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec,
                 int event_type
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Access the history of samples
   ACE_Sample_History &sample_history (void);
@@ -46,9 +46,9 @@ public:
   /** @name The RtecEventComm::PushConsumer methods
    */
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/POA_Destroyer.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/POA_Destroyer.cpp
index dd1547a0ce2..c4f20a5d71b 100644
--- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/POA_Destroyer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/POA_Destroyer.cpp
@@ -20,7 +20,7 @@ POA_Destroyer::~POA_Destroyer ()
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY {
     this->poa_->destroy (1, 1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
   } ACE_CATCHANY {
     // @@ This event should be logged...
diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Receive_Task.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Receive_Task.cpp
index c0debdfdeb0..75d85a1855e 100644
--- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Receive_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Receive_Task.cpp
@@ -21,7 +21,7 @@ ECCL_Receive_Task::svc (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Send_Task.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Send_Task.cpp
index f0aeb55a35e..d8f7fb52531 100644
--- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Send_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Send_Task.cpp
@@ -59,7 +59,7 @@ ECCL_Send_Task::svc (void)
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      creation);
       // push one event...
-      this->supplier_->push (event TAO_ENV_ARG_PARAMETER);
+      this->supplier_->push (event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   return 0;
diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Servant_var.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Servant_var.cpp
index 3c561bbbcf6..ed361ffcaf6 100644
--- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Servant_var.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Servant_var.cpp
@@ -24,7 +24,7 @@ Servant_var<SERVANT>::~Servant_var ()
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY {
-    this->ptr_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
   } ACE_CATCHANY {
     // @@ This event should be logged...
diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.cpp
index a6d5e229b09..50addaa52b2 100644
--- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.cpp
@@ -18,10 +18,10 @@ ECCL_Supplier::ECCL_Supplier (void)
 void
 ECCL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
                         int event_type
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -30,12 +30,12 @@ ECCL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
       return;
 
     this->proxy_consumer_ =
-      supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierQOS supplier_qos;
@@ -47,12 +47,12 @@ ECCL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
                                                 supplier_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECCL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECCL_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -64,23 +64,23 @@ ECCL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 ECCL_Supplier::push (const RtecEventComm::EventSet &events
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -90,12 +90,12 @@ ECCL_Supplier::push (const RtecEventComm::EventSet &events
       return;
     proxy = this->proxy_consumer_;
   }
-  proxy->push (events TAO_ENV_ARG_PARAMETER);
+  proxy->push (events ACE_ENV_ARG_PARAMETER);
 
 }
 
 void
-ECCL_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECCL_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.h
index 4f16f7114d5..6319c5c591d 100644
--- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.h
@@ -32,19 +32,19 @@ public:
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec,
                 int event_type
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   void push (const RtecEventComm::EventSet &events
-             TAO_ENV_ARG_DECL_NOT_USED)
+             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/driver.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/driver.cpp
index daad4719e5c..f86ea773fc6 100644
--- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/driver.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/driver.cpp
@@ -90,7 +90,7 @@ int main (int argc, char *argv[])
   int high_priority =
     ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
                                      process_priority);
-  
+
   // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
 
   if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
@@ -111,17 +111,17 @@ int 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;
 
       CORBA::Object_var manager_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 (manager_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -132,19 +132,19 @@ int main (int argc, char *argv[])
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_scope
-                            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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -155,13 +155,13 @@ int main (int argc, char *argv[])
       POA_Destroyer destroy_poa (root_poa.in ());
 
       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;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
@@ -172,20 +172,20 @@ int main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var ec_owner (ec_impl);
 
-      ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl->_this (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;
 
       int thread_count = 1;
       if (disable_low_priority == 0)
         thread_count += nthreads;
-      ACE_Barrier barrier (thread_count);      
+      ACE_Barrier barrier (thread_count);
 
       ACE_Auto_Basic_Array_Ptr<Servant_var<ECCL_Supplier> > low_priority_suppliers (new Servant_var<ECCL_Supplier>[nthreads]);
       ACE_Auto_Basic_Array_Ptr<Servant_var<ECCL_Consumer> > low_priority_consumers (new Servant_var<ECCL_Consumer>[nthreads]);
@@ -196,14 +196,14 @@ int main (int argc, char *argv[])
             Servant_var<ECCL_Supplier> (new ECCL_Supplier);
           low_priority_suppliers[i]->connect (ec.in (),
                                               ACE_ES_EVENT_UNDEFINED + 1 + i
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           low_priority_consumers[i] =
             Servant_var<ECCL_Consumer> (new ECCL_Consumer (iterations));
           low_priority_consumers[i]->connect (ec.in (),
                                               ACE_ES_EVENT_UNDEFINED + 1 + i
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           low_priority_tasks[i].init (iterations,
@@ -220,15 +220,15 @@ int main (int argc, char *argv[])
                                               low_priority);
             }
         }
-      
+
       Servant_var<ECCL_Consumer> consumer_impl (new ECCL_Consumer (iterations));
       consumer_impl->connect (ec.in (), ACE_ES_EVENT_UNDEFINED
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Servant_var<ECCL_Supplier> supplier_impl (new ECCL_Supplier);
       supplier_impl->connect (ec.in (), ACE_ES_EVENT_UNDEFINED
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ECCL_Send_Task high_priority_task;
@@ -268,25 +268,25 @@ int main (int argc, char *argv[])
         }
       low_priority_stats.dump_results ("Low Priority", gsf);
 
-      supplier_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_impl->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_impl->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int j = 0; j != nthreads; ++j)
         {
-          low_priority_suppliers[j]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          low_priority_suppliers[j]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          low_priority_consumers[j]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          low_priority_consumers[j]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      ec_impl->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp
index ff02cc9589d..055f397a0c9 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp
@@ -22,10 +22,10 @@ ECFL_Consumer::
 
 void
 ECFL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -34,12 +34,12 @@ ECFL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_supplier_ =
-      consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::ConsumerQOS consumer_qos;
@@ -57,12 +57,12 @@ ECFL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
                                                 consumer_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECFL_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -74,17 +74,17 @@ ECFL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -96,7 +96,7 @@ ECFL_Consumer::samples (void) const
 
 void
 ECFL_Consumer::push (const RtecEventComm::EventSet &events
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Consumer::push (%P|%t)\n"));
@@ -113,7 +113,7 @@ ECFL_Consumer::push (const RtecEventComm::EventSet &events
 }
 
 void
-ECFL_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECFL_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h
index 80123bce02b..8f5b9edf0f7 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h
@@ -34,10 +34,10 @@ public:
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Get the samples
   const Control::Samples &samples (void) const;
@@ -46,9 +46,9 @@ public:
   /** @name The RtecEventComm::PushConsumer methods
    */
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp
index bac145852a7..95b888fbe2f 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp
@@ -37,7 +37,7 @@ ECFL_Coordinator::~ECFL_Coordinator (void)
 
 void
 ECFL_Coordinator::join (Control::Peer_ptr peer
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
@@ -59,14 +59,14 @@ ECFL_Coordinator::join (Control::Peer_ptr peer
   for (i = 0; i != this->peers_count_; ++i)
     {
       RtecEventChannelAdmin::EventChannel_var channel =
-        this->peers_[i]->channel (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->peers_[i]->channel (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       for (size_t j = 0; j != this->peers_count_; ++j)
         {
           if (i != j)
             {
-              this->peers_[j]->connect (channel.in () TAO_ENV_ARG_PARAMETER);
+              this->peers_[j]->connect (channel.in () ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -92,7 +92,7 @@ ECFL_Coordinator::join (Control::Peer_ptr peer
             {
               loopbacks[lcount++] =
                 this->peers_[j]->setup_loopback (experiment_id
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -101,12 +101,12 @@ ECFL_Coordinator::join (Control::Peer_ptr peer
         this->peers_[i]->run_experiment (experiment_id,
                                          this->iterations_,
                                          gsf
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       for (j = 0; j != lcount; ++j)
         {
-          loopbacks[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          loopbacks[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -127,10 +127,10 @@ ECFL_Coordinator::join (Control::Peer_ptr peer
 
   for (i = 0; i != this->peers_count_; ++i)
     {
-      this->peers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->peers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h
index be2be30a0da..db6863642a1 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h
@@ -38,7 +38,7 @@ public:
   /** @name The Control::Coordinator methods
    */
   virtual void join (Control::Peer_ptr peer
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp
index 2b296599d05..d600dc245c2 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp
@@ -18,13 +18,13 @@ ECFL_Loopback::ECFL_Loopback (void)
 void
 ECFL_Loopback::init (CORBA::Long experiment_id,
                      RtecEventChannelAdmin::EventChannel_ptr ec
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   this->supplier_ =
     Servant_var<ECFL_Loopback_Supplier> (
            new ECFL_Loopback_Supplier (experiment_id)
            );
-  this->supplier_->connect (ec TAO_ENV_ARG_PARAMETER);
+  this->supplier_->connect (ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_ =
@@ -32,30 +32,30 @@ ECFL_Loopback::init (CORBA::Long experiment_id,
             new ECFL_Loopback_Consumer (experiment_id,
                                         this->supplier_.in ())
             );
-  this->consumer_->connect (ec TAO_ENV_ARG_PARAMETER);
+  this->consumer_->connect (ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFL_Loopback::destroy (TAO_ENV_SINGLE_ARG_DECL)
+ECFL_Loopback::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->consumer_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumer_->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->supplier_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->supplier_->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h
index 94492c347b1..10a79a9d3ac 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h
@@ -34,12 +34,12 @@ public:
   /// Initialize the loopback
   void init (CORBA::Long experiment_id,
              RtecEventChannelAdmin::EventChannel_ptr ec
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
   //@{
   /** @name The Control::Loopback methods
    */
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp
index 6eb56cfaf91..247af976547 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp
@@ -23,10 +23,10 @@ ECFL_Loopback_Consumer::
 
 void
 ECFL_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -35,12 +35,12 @@ ECFL_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_supplier_ =
-      consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::ConsumerQOS consumer_qos;
@@ -58,12 +58,12 @@ ECFL_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
                                                 consumer_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFL_Loopback_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECFL_Loopback_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -75,31 +75,31 @@ ECFL_Loopback_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 ECFL_Loopback_Consumer::push (const RtecEventComm::EventSet &events
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Loopback_Consumer::push (%P|%t)\n"));
-  this->supplier_->push (events TAO_ENV_ARG_PARAMETER);
+  this->supplier_->push (events ACE_ENV_ARG_PARAMETER);
 }
 
 void
-ECFL_Loopback_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECFL_Loopback_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h
index 8138c3f9040..92b0b25515a 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h
@@ -35,18 +35,18 @@ public:
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp
index 1e9e90cf4a4..e7774668249 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp
@@ -18,10 +18,10 @@ ECFL_Loopback_Supplier::ECFL_Loopback_Supplier (CORBA::Long experiment_id)
 
 void
 ECFL_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -30,12 +30,12 @@ ECFL_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_consumer_ =
-      supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierQOS supplier_qos;
@@ -48,12 +48,12 @@ ECFL_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
                                                 supplier_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFL_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECFL_Loopback_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -65,23 +65,23 @@ ECFL_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 ECFL_Loopback_Supplier::push (const RtecEventComm::EventSet &source
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -101,11 +101,11 @@ ECFL_Loopback_Supplier::push (const RtecEventComm::EventSet &source
       events[i].header.source = this->experiment_id_;
     }
 
-  proxy->push (events TAO_ENV_ARG_PARAMETER);
+  proxy->push (events ACE_ENV_ARG_PARAMETER);
 }
 
 void
-ECFL_Loopback_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECFL_Loopback_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h
index 4dc341bab47..d1e6c14d1bb 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h
@@ -36,19 +36,19 @@ public:
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   void push (const RtecEventComm::EventSet &events
-             TAO_ENV_ARG_DECL_NOT_USED)
+             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp
index 0be4f180ce6..fe25ff09ca2 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp
@@ -35,23 +35,23 @@ ECFL_Peer::~ECFL_Peer (void)
 
 void
 ECFL_Peer::init (PortableServer::POA_ptr root_poa
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   TAO_EC_Event_Channel_Attributes attr (root_poa, root_poa);
   Servant_var<TAO_EC_Event_Channel> ec_impl (
          new TAO_EC_Event_Channel (attr)
          );
 
-  ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_channel_ =
-    ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 RtecEventChannelAdmin::EventChannel_ptr
-ECFL_Peer::channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECFL_Peer::channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RtecEventChannelAdmin::EventChannel::_duplicate (this->event_channel_.in ());
@@ -59,23 +59,23 @@ ECFL_Peer::channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 ECFL_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n"));
   Servant_var<TAO_EC_Gateway_IIOP> gateway (new TAO_EC_Gateway_IIOP);
   gateway->init (remote_ec,
                  this->event_channel_.in ()
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::Observer_var observer =
-    gateway->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    gateway->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::Observer_Handle h =
     this->event_channel_->append_observer (observer.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   gateway->observer_handle (h);
@@ -83,24 +83,24 @@ ECFL_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec
 
 Control::Loopback_ptr
 ECFL_Peer::setup_loopback (CORBA::Long experiment_id
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<ECFL_Loopback> loopback (new ECFL_Loopback);
 
   loopback->init (experiment_id,
                   this->event_channel_.in ()
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Control::Loopback::_nil ());
 
-  return loopback->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return loopback->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 Control::Samples *
 ECFL_Peer::run_experiment (CORBA::Long experiment_id,
                            CORBA::Long iterations,
                            CORBA::Long_out gsf
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<ECFL_Consumer> consumer (
@@ -108,14 +108,14 @@ ECFL_Peer::run_experiment (CORBA::Long experiment_id,
                              iterations)
           );
 
-  consumer->connect (this->event_channel_.in () TAO_ENV_ARG_PARAMETER);
+  consumer->connect (this->event_channel_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Servant_var<ECFL_Supplier> supplier (
           new ECFL_Supplier (experiment_id)
           );
 
-  supplier->connect (this->event_channel_.in () TAO_ENV_ARG_PARAMETER);
+  supplier->connect (this->event_channel_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n"));
@@ -132,13 +132,13 @@ ECFL_Peer::run_experiment (CORBA::Long experiment_id,
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      creation);
       // push one event...
-      supplier->push (event TAO_ENV_ARG_PARAMETER);
+      supplier->push (event ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
-  supplier->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+  supplier->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  consumer->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+  consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
@@ -150,13 +150,13 @@ ECFL_Peer::run_experiment (CORBA::Long experiment_id,
 }
 
 void
-ECFL_Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+ECFL_Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->event_channel_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->event_channel_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h
index 2db57627b86..4c0c5f5b419 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h
@@ -33,30 +33,30 @@ public:
 
   /// Initialize the peer
   void init (PortableServer::POA_ptr poa
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
   //@{
   /** @name The Control::Peer methods
    */
   virtual RtecEventChannelAdmin::EventChannel_ptr
-      channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+      channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Control::Loopback_ptr setup_loopback (CORBA::Long experiment_id
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Control::Samples* run_experiment (CORBA::Long experiment_id,
                                             CORBA::Long iterations,
                                             CORBA::Long_out gsf
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp
index 6a0d81d8dbe..230aded84df 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp
@@ -23,7 +23,7 @@ Servant_var<SERVANT>::~Servant_var ()
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY {
-    this->ptr_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
   } ACE_CATCHANY {
     // @@ This event should be logged...
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp
index 74308570630..d0aece05d83 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp
@@ -18,10 +18,10 @@ ECFL_Supplier::ECFL_Supplier (CORBA::Long experiment_id)
 
 void
 ECFL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -30,12 +30,12 @@ ECFL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_consumer_ =
-      supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierQOS supplier_qos;
@@ -48,12 +48,12 @@ ECFL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
                                                 supplier_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECFL_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -65,23 +65,23 @@ ECFL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 ECFL_Supplier::push (const RtecEventComm::EventSet &events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -92,11 +92,11 @@ ECFL_Supplier::push (const RtecEventComm::EventSet &events
     proxy = this->proxy_consumer_;
   }
 
-  proxy->push (events TAO_ENV_ARG_PARAMETER);
+  proxy->push (events ACE_ENV_ARG_PARAMETER);
 }
 
 void
-ECFL_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECFL_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h
index 3034cd976f6..08d3313fcec 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h
@@ -36,19 +36,19 @@ public:
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   void push (const RtecEventComm::EventSet &events
-             TAO_ENV_ARG_DECL_NOT_USED)
+             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/client.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/client.cpp
index cf194f76ae1..cd0ed1bc642 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/client.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/client.cpp
@@ -68,7 +68,7 @@ int 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)
@@ -76,12 +76,12 @@ int main (int argc, char *argv[])
 
       // Get the event channel object reference
       CORBA::Object_var coordinator_object =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Control::Coordinator_var coordinator =
         Control::Coordinator::_narrow (coordinator_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (coordinator.in ()))
@@ -93,12 +93,12 @@ int main (int argc, char *argv[])
 
       CORBA::Object_var manager_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 (manager_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -109,19 +109,19 @@ int main (int argc, char *argv[])
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_scope
-                            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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -130,32 +130,32 @@ int 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (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;
 
       Servant_var<ECFL_Peer> peer_impl (new ECFL_Peer (orb.in ()));
 
-      peer_impl->init (root_poa.in () TAO_ENV_ARG_PARAMETER);
+      peer_impl->init (root_poa.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Control::Peer_var peer (peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER));
+      Control::Peer_var peer (peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_TRY_CHECK;
 
-      coordinator->join (peer.in () TAO_ENV_ARG_PARAMETER);
+      coordinator->join (peer.in () ACE_ENV_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, "(%P|%t) server - event loop finished\n"));
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp
index a3b8a62dbc9..a59c25cd6a0 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp
@@ -83,7 +83,7 @@ int 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)
@@ -91,12 +91,12 @@ int main (int argc, char *argv[])
 
       CORBA::Object_var manager_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 (manager_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -107,19 +107,19 @@ int main (int argc, char *argv[])
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_scope
-                            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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -128,10 +128,10 @@ int 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Servant_var<ECFL_Coordinator> coordinator_impl (
@@ -142,11 +142,11 @@ int main (int argc, char *argv[])
               );
 
       Control::Coordinator_var coordinator =
-        coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        coordinator_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (coordinator.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Output the ior to the <ior_output_file>
@@ -159,18 +159,18 @@ int main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.cpp
index fffdd125558..a8ccdc51f45 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.cpp
@@ -22,10 +22,10 @@ ECFS_Consumer::
 
 void
 ECFS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -34,12 +34,12 @@ ECFS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_supplier_ =
-      consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::ConsumerQOS consumer_qos;
@@ -57,12 +57,12 @@ ECFS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
                                                 consumer_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFS_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECFS_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -74,17 +74,17 @@ ECFS_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -96,7 +96,7 @@ ECFS_Consumer::samples (void) const
 
 void
 ECFS_Consumer::push (const RtecEventComm::EventSet &events
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Consumer::push (%P|%t)\n"));
@@ -113,7 +113,7 @@ ECFS_Consumer::push (const RtecEventComm::EventSet &events
 }
 
 void
-ECFS_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECFS_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.h
index 2bc43a51edd..d7482e22e58 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.h
@@ -34,10 +34,10 @@ public:
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Get the samples
   const Control::Samples &samples (void) const;
@@ -46,9 +46,9 @@ public:
   /** @name The RtecEventComm::PushConsumer methods
    */
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp
index deb71c18f93..db1499aa26f 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp
@@ -37,7 +37,7 @@ ECFS_Coordinator::~ECFS_Coordinator (void)
 
 void
 ECFS_Coordinator::join (Control::Peer_ptr peer
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
@@ -59,14 +59,14 @@ ECFS_Coordinator::join (Control::Peer_ptr peer
   for (i = 0; i != this->peers_count_; ++i)
     {
       RtecEventChannelAdmin::EventChannel_var channel =
-        this->peers_[i]->channel (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->peers_[i]->channel (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       for (size_t j = 0; j != this->peers_count_; ++j)
         {
           if (i != j)
             {
-              this->peers_[j]->connect (channel.in () TAO_ENV_ARG_PARAMETER);
+              this->peers_[j]->connect (channel.in () ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -89,7 +89,7 @@ ECFS_Coordinator::join (Control::Peer_ptr peer
             {
               loopbacks[lcount++] =
                 this->peers_[j]->setup_loopback (experiment_id
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -106,7 +106,7 @@ ECFS_Coordinator::join (Control::Peer_ptr peer
                                              experiment_id,
                                              this->iterations_,
                                              gsf
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           ACE_Sample_History history (samples->length ());
@@ -149,7 +149,7 @@ ECFS_Coordinator::join (Control::Peer_ptr peer
 
       for (j = 0; j != lcount; ++j)
         {
-          loopbacks[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          loopbacks[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -158,10 +158,10 @@ ECFS_Coordinator::join (Control::Peer_ptr peer
 
   for (i = 0; i != this->peers_count_; ++i)
     {
-      this->peers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->peers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.h
index b132052d174..582556a9419 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.h
@@ -39,7 +39,7 @@ public:
   /** @name The Control::Coordinator methods
    */
   virtual void join (Control::Peer_ptr peer
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp
index 7492cf40eb2..9143fde3978 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp
@@ -18,13 +18,13 @@ ECFS_Loopback::ECFS_Loopback (void)
 void
 ECFS_Loopback::init (CORBA::Long experiment_id,
                      RtecEventChannelAdmin::EventChannel_ptr ec
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   this->supplier_ =
     Servant_var<ECFS_Loopback_Supplier> (
            new ECFS_Loopback_Supplier (experiment_id)
            );
-  this->supplier_->connect (ec TAO_ENV_ARG_PARAMETER);
+  this->supplier_->connect (ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_ =
@@ -32,30 +32,30 @@ ECFS_Loopback::init (CORBA::Long experiment_id,
             new ECFS_Loopback_Consumer (experiment_id,
                                         this->supplier_.in ())
             );
-  this->consumer_->connect (ec TAO_ENV_ARG_PARAMETER);
+  this->consumer_->connect (ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFS_Loopback::destroy (TAO_ENV_SINGLE_ARG_DECL)
+ECFS_Loopback::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->consumer_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumer_->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->supplier_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->supplier_->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.h
index 7dc5200feed..64e656a84fc 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.h
@@ -34,12 +34,12 @@ public:
   /// Initialize the loopback
   void init (CORBA::Long experiment_id,
              RtecEventChannelAdmin::EventChannel_ptr ec
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
   //@{
   /** @name The Control::Loopback methods
    */
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.cpp
index 64635655256..f03b4b6b323 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.cpp
@@ -23,10 +23,10 @@ ECFS_Loopback_Consumer::
 
 void
 ECFS_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -35,12 +35,12 @@ ECFS_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_supplier_ =
-      consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::ConsumerQOS consumer_qos;
@@ -58,12 +58,12 @@ ECFS_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
                                                 consumer_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFS_Loopback_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECFS_Loopback_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -75,31 +75,31 @@ ECFS_Loopback_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 ECFS_Loopback_Consumer::push (const RtecEventComm::EventSet &events
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "Loopback_Consumer::push (%P|%t)\n"));
-  this->supplier_->push (events TAO_ENV_ARG_PARAMETER);
+  this->supplier_->push (events ACE_ENV_ARG_PARAMETER);
 }
 
 void
-ECFS_Loopback_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECFS_Loopback_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.h
index c39f3bb945f..a90ec03e1a7 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.h
@@ -35,18 +35,18 @@ public:
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   //@{
   /** @name The RtecEventComm::PushConsumer methods
    */
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp
index 341fabcdaac..a76009be6f6 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp
@@ -18,10 +18,10 @@ ECFS_Loopback_Supplier::ECFS_Loopback_Supplier (CORBA::Long experiment_id)
 
 void
 ECFS_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -30,12 +30,12 @@ ECFS_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_consumer_ =
-      supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierQOS supplier_qos;
@@ -48,12 +48,12 @@ ECFS_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
                                                 supplier_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFS_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECFS_Loopback_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -65,23 +65,23 @@ ECFS_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 ECFS_Loopback_Supplier::push (const RtecEventComm::EventSet &source
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -101,11 +101,11 @@ ECFS_Loopback_Supplier::push (const RtecEventComm::EventSet &source
       events[i].header.source = this->experiment_id_;
     }
 
-  proxy->push (events TAO_ENV_ARG_PARAMETER);
+  proxy->push (events ACE_ENV_ARG_PARAMETER);
 }
 
 void
-ECFS_Loopback_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECFS_Loopback_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.h
index c09ae40a254..309ebcf247d 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.h
@@ -36,19 +36,19 @@ public:
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   void push (const RtecEventComm::EventSet &events
-             TAO_ENV_ARG_DECL_NOT_USED)
+             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp
index 744aa2d2acf..78b3d0cb240 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp
@@ -33,23 +33,23 @@ ECFS_Peer::~ECFS_Peer (void)
 
 void
 ECFS_Peer::init (PortableServer::POA_ptr root_poa
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   TAO_EC_Event_Channel_Attributes attr (root_poa, root_poa);
   Servant_var<TAO_EC_Event_Channel> ec_impl (
          new TAO_EC_Event_Channel (attr)
          );
 
-  ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_channel_ =
-    ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 RtecEventChannelAdmin::EventChannel_ptr
-ECFS_Peer::channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECFS_Peer::channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RtecEventChannelAdmin::EventChannel::_duplicate (this->event_channel_.in ());
@@ -57,23 +57,23 @@ ECFS_Peer::channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 ECFS_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n"));
   Servant_var<TAO_EC_Gateway_IIOP> gateway (new TAO_EC_Gateway_IIOP);
   gateway->init (remote_ec,
                  this->event_channel_.in ()
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::Observer_var observer =
-    gateway->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    gateway->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::Observer_Handle h =
     this->event_channel_->append_observer (observer.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   gateway->observer_handle (h);
@@ -81,17 +81,17 @@ ECFS_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec
 
 Control::Loopback_ptr
 ECFS_Peer::setup_loopback (CORBA::Long experiment_id
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<ECFS_Loopback> loopback (new ECFS_Loopback);
 
   loopback->init (experiment_id,
                   this->event_channel_.in ()
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Control::Loopback::_nil ());
 
-  return loopback->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return loopback->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 Control::Samples *
@@ -99,7 +99,7 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count,
                            CORBA::Long experiment_id,
                            CORBA::Long iterations,
                            CORBA::Long_out gsf
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<ECFS_Consumer> *consumer;
@@ -113,7 +113,7 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count,
       consumer[i] =
         Servant_var<ECFS_Consumer> (new ECFS_Consumer (experiment_id,
                                                        iterations));
-      consumer[i]->connect (this->event_channel_.in () TAO_ENV_ARG_PARAMETER);
+      consumer[i]->connect (this->event_channel_.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -121,7 +121,7 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count,
           new ECFS_Supplier (experiment_id)
           );
 
-  supplier->connect (this->event_channel_.in () TAO_ENV_ARG_PARAMETER);
+  supplier->connect (this->event_channel_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n"));
@@ -138,11 +138,11 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count,
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      creation);
       // push one event...
-      supplier->push (event TAO_ENV_ARG_PARAMETER);
+      supplier->push (event ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
-  supplier->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+  supplier->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Control::Samples_var samples (new Control::Samples (iterations));
@@ -159,7 +159,7 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count,
           if (samples[j] < sample)
             samples[j] = sample;
         }
-      consumer[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -172,13 +172,13 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count,
 }
 
 void
-ECFS_Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+ECFS_Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->event_channel_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->event_channel_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.h
index e5c1d1cf133..2e236e74cf3 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.h
@@ -33,31 +33,31 @@ public:
 
   /// Initialize the peer
   void init (PortableServer::POA_ptr poa
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
   //@{
   /** @name The Control::Peer methods
    */
   virtual RtecEventChannelAdmin::EventChannel_ptr
-      channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+      channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Control::Loopback_ptr setup_loopback (CORBA::Long experiment_id
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Control::Samples* run_experiment (CORBA::Long consumer_count,
                                             CORBA::Long experiment_id,
                                             CORBA::Long iterations,
                                             CORBA::Long_out gsf
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.cpp
index 7e01fd080ab..dfa14247b62 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.cpp
@@ -23,7 +23,7 @@ Servant_var<SERVANT>::~Servant_var ()
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY {
-    this->ptr_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
   } ACE_CATCHANY {
     // @@ This event should be logged...
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp
index 1c8552ab74a..38beb38dad3 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp
@@ -18,10 +18,10 @@ ECFS_Supplier::ECFS_Supplier (CORBA::Long experiment_id)
 
 void
 ECFS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -30,12 +30,12 @@ ECFS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_consumer_ =
-      supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierQOS supplier_qos;
@@ -48,12 +48,12 @@ ECFS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
                                                 supplier_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECFS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECFS_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -65,23 +65,23 @@ ECFS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 ECFS_Supplier::push (const RtecEventComm::EventSet &events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -92,11 +92,11 @@ ECFS_Supplier::push (const RtecEventComm::EventSet &events
     proxy = this->proxy_consumer_;
   }
 
-  proxy->push (events TAO_ENV_ARG_PARAMETER);
+  proxy->push (events ACE_ENV_ARG_PARAMETER);
 }
 
 void
-ECFS_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECFS_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.h
index 83349929b40..e70ccde26ec 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.h
@@ -36,19 +36,19 @@ public:
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   void push (const RtecEventComm::EventSet &events
-             TAO_ENV_ARG_DECL_NOT_USED)
+             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp
index c1b5fa3c689..18661df8c8d 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp
@@ -75,7 +75,7 @@ int 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)
@@ -83,12 +83,12 @@ int main (int argc, char *argv[])
 
       // Get the event channel object reference
       CORBA::Object_var coordinator_object =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Control::Coordinator_var coordinator =
         Control::Coordinator::_narrow (coordinator_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (coordinator.in ()))
@@ -100,12 +100,12 @@ int main (int argc, char *argv[])
 
       CORBA::Object_var manager_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 (manager_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -116,19 +116,19 @@ int main (int argc, char *argv[])
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_scope
-                            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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -137,32 +137,32 @@ int 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (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;
 
       Servant_var<ECFS_Peer> peer_impl (new ECFS_Peer (orb.in ()));
 
-      peer_impl->init (root_poa.in () TAO_ENV_ARG_PARAMETER);
+      peer_impl->init (root_poa.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Control::Peer_var peer (peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER));
+      Control::Peer_var peer (peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_TRY_CHECK;
 
-      coordinator->join (peer.in () TAO_ENV_ARG_PARAMETER);
+      coordinator->join (peer.in () ACE_ENV_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, "(%P|%t) server - event loop finished\n"));
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/server.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/server.cpp
index adb75216871..86b950bce2a 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/server.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/server.cpp
@@ -97,7 +97,7 @@ int 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)
@@ -105,12 +105,12 @@ int main (int argc, char *argv[])
 
       CORBA::Object_var manager_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 (manager_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -121,19 +121,19 @@ int main (int argc, char *argv[])
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_scope
-                            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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -142,10 +142,10 @@ int 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Servant_var<ECFS_Coordinator> coordinator_impl (
@@ -157,11 +157,11 @@ int main (int argc, char *argv[])
               );
 
       Control::Coordinator_var coordinator =
-        coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        coordinator_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (coordinator.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Output the ior to the <ior_output_file>
@@ -174,18 +174,18 @@ int main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp
index 3b398172a15..8e6c5e63781 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp
@@ -21,7 +21,7 @@ ECL_Client_Task::svc (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp
index 2e020bbd26f..43d1fcefc86 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp
@@ -18,10 +18,10 @@ ECL_Consumer::ECL_Consumer (int iterations)
 
 void
 ECL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -30,12 +30,12 @@ ECL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_supplier_ =
-      consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::ConsumerQOS consumer_qos;
@@ -52,12 +52,12 @@ ECL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
                                                 consumer_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECL_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -69,17 +69,17 @@ ECL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -91,7 +91,7 @@ ECL_Consumer::sample_history (void)
 
 void
 ECL_Consumer::push (const RtecEventComm::EventSet &events
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -105,7 +105,7 @@ ECL_Consumer::push (const RtecEventComm::EventSet &events
 }
 
 void
-ECL_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECL_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h
index a05566c370b..aad7edae08d 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h
@@ -33,10 +33,10 @@ public:
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Access the history of samples
   ACE_Sample_History &sample_history (void);
@@ -45,9 +45,9 @@ public:
   /** @name The RtecEventComm::PushConsumer methods
    */
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp
index 1712c4f496c..922d4056cd3 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp
@@ -17,10 +17,10 @@ ECL_Supplier::ECL_Supplier (void)
 
 void
 ECL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -29,12 +29,12 @@ ECL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_consumer_ =
-      supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierQOS supplier_qos;
@@ -46,12 +46,12 @@ ECL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
                                                 supplier_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECL_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -63,23 +63,23 @@ ECL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 ECL_Supplier::push (const RtecEventComm::EventSet &events
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -89,12 +89,12 @@ ECL_Supplier::push (const RtecEventComm::EventSet &events
       return;
     proxy = this->proxy_consumer_;
   }
-  proxy->push (events TAO_ENV_ARG_PARAMETER);
+  proxy->push (events ACE_ENV_ARG_PARAMETER);
 
 }
 
 void
-ECL_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECL_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h
index e9e26a788bf..1b582bc1619 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h
@@ -31,19 +31,19 @@ public:
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   void push (const RtecEventComm::EventSet &events
-             TAO_ENV_ARG_DECL_NOT_USED)
+             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp
index 8375dd90263..cbec46f28e1 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp
@@ -60,17 +60,17 @@ 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;
 
       CORBA::Object_var manager_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 (manager_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -81,15 +81,15 @@ main (int argc, char *argv [])
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_scope
-                            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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -98,14 +98,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -113,12 +113,12 @@ main (int argc, char *argv [])
 
       // Get the event channel object reference
       CORBA::Object_var ec_object =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
         RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (ec.in ()))
         {
@@ -133,7 +133,7 @@ main (int argc, char *argv [])
                       1);
       PortableServer::ServantBase_var consumer_owner (consumer_impl);
 
-      consumer_impl->connect (ec.in () TAO_ENV_ARG_PARAMETER);
+      consumer_impl->connect (ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ECL_Supplier *supplier_impl;
@@ -142,7 +142,7 @@ main (int argc, char *argv [])
                       1);
       PortableServer::ServantBase_var supplier_owner (supplier_impl);
 
-      supplier_impl->connect (ec.in () TAO_ENV_ARG_PARAMETER);
+      supplier_impl->connect (ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n"));
@@ -164,14 +164,14 @@ main (int argc, char *argv [])
           ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                          creation);
           // push one event...
-          supplier_impl->push (event TAO_ENV_ARG_PARAMETER);
+          supplier_impl->push (event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_hrtime_t end = ACE_OS::gethrtime ();
 
-      consumer_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_impl->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_impl->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Calibrate the high resolution timer *before* starting the
@@ -198,12 +198,12 @@ main (int argc, char *argv [])
                                              stats.samples_count ());
 
 
-      orb->shutdown (0 TAO_ENV_ARG_PARAMETER);
+      orb->shutdown (0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Thread_Manager::instance ()->wait ();
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, ex)
diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/server.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/server.cpp
index 9dff9a44c29..7bce5ecf5e9 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/server.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/server.cpp
@@ -67,17 +67,17 @@ int 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;
 
       CORBA::Object_var manager_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 (manager_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -88,19 +88,19 @@ int main (int argc, char *argv[])
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_scope
-                            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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -109,13 +109,13 @@ int 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;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
@@ -126,15 +126,15 @@ int main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var ec_owner (ec_impl);
 
-      ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Output the ior to the <ior_output_file>
@@ -147,18 +147,18 @@ int main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/orbsvcs/performance-tests/EC_Scalability/Client_Task.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/Client_Task.cpp
index 0237a86f190..1d2f8d1deb9 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/Client_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Client_Task.cpp
@@ -21,7 +21,7 @@ ECS_Client_Task::svc (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp
index 788c0b061ca..3df58cd4170 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp
@@ -18,10 +18,10 @@ ECS_Consumer::ECS_Consumer (int iterations)
 
 void
 ECS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -30,12 +30,12 @@ ECS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_supplier_ =
-      consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::ConsumerQOS consumer_qos;
@@ -52,12 +52,12 @@ ECS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 
   this->proxy_supplier_->connect_push_consumer (consumer.in (),
                                                 consumer_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECS_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECS_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -69,17 +69,17 @@ ECS_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -91,7 +91,7 @@ ECS_Consumer::sample_history (void)
 
 void
 ECS_Consumer::push (const RtecEventComm::EventSet &events
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -105,7 +105,7 @@ ECS_Consumer::push (const RtecEventComm::EventSet &events
 }
 
 void
-ECS_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECS_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.h
index 8f1aee4416a..e171ef566cc 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.h
@@ -33,10 +33,10 @@ public:
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Access the history of samples
   ACE_Sample_History &sample_history (void);
@@ -45,9 +45,9 @@ public:
   /** @name The RtecEventComm::PushConsumer methods
    */
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp
index 99dfd39610d..2212b38dab9 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp
@@ -17,10 +17,10 @@ ECS_Supplier::ECS_Supplier (void)
 
 void
 ECS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   {
@@ -29,12 +29,12 @@ ECS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
       return;
 
     this->proxy_consumer_ =
-      supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
   }
 
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierQOS supplier_qos;
@@ -46,12 +46,12 @@ ECS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec
 
   this->proxy_consumer_->connect_push_supplier (supplier.in (),
                                                 supplier_qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECS_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -63,23 +63,23 @@ ECS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 ECS_Supplier::push (const RtecEventComm::EventSet &events
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -89,12 +89,12 @@ ECS_Supplier::push (const RtecEventComm::EventSet &events
       return;
     proxy = this->proxy_consumer_;
   }
-  proxy->push (events TAO_ENV_ARG_PARAMETER);
+  proxy->push (events ACE_ENV_ARG_PARAMETER);
 
 }
 
 void
-ECS_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECS_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.h
index 3feeb4460ab..a3482b21e40 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.h
@@ -33,19 +33,19 @@ public:
 
   /// Connect to the event channel
   void connect (RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   /// Disconnect from the event channel
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
   void push (const RtecEventComm::EventSet &events
-             TAO_ENV_ARG_DECL_NOT_USED)
+             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@{
   /** @name The RtecEventComm::PushSupplier methods
    */
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp
index bb301cda0c9..aed51b1b9b6 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp
@@ -58,17 +58,17 @@ 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;
 
       CORBA::Object_var manager_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 (manager_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -79,15 +79,15 @@ main (int argc, char *argv [])
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_scope
-                            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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -96,14 +96,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -111,12 +111,12 @@ main (int argc, char *argv [])
 
       // Get the event channel object reference
       CORBA::Object_var ec_object =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
         RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (ec.in ()))
         {
@@ -135,7 +135,7 @@ main (int argc, char *argv [])
           ACE_NEW_RETURN (consumer_impl[i],
                           ECS_Consumer (iterations),
                           1);
-          consumer_impl[i]->connect (ec.in () TAO_ENV_ARG_PARAMETER);
+          consumer_impl[i]->connect (ec.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -145,7 +145,7 @@ main (int argc, char *argv [])
                       1);
       PortableServer::ServantBase_var supplier_owner (supplier_impl);
 
-      supplier_impl->connect (ec.in () TAO_ENV_ARG_PARAMETER);
+      supplier_impl->connect (ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n"));
@@ -167,17 +167,17 @@ main (int argc, char *argv [])
           ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                          creation);
           // push one event...
-          supplier_impl->push (event TAO_ENV_ARG_PARAMETER);
+          supplier_impl->push (event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_hrtime_t end = ACE_OS::gethrtime ();
 
       for (i = 0; i != consumer_count; ++i)
         {
-          consumer_impl[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          consumer_impl[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
-      supplier_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_impl->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Calibrate the high resolution timer *before* starting the
@@ -219,12 +219,12 @@ main (int argc, char *argv [])
                                              stats.samples_count ());
 
 
-      orb->shutdown (0 TAO_ENV_ARG_PARAMETER);
+      orb->shutdown (0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Thread_Manager::instance ()->wait ();
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, ex)
diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp
index 43f43105d4d..8314c02b3ba 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp
@@ -74,17 +74,17 @@ int 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;
 
       CORBA::Object_var manager_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 (manager_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -95,19 +95,19 @@ int main (int argc, char *argv[])
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_scope
-                            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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -116,13 +116,13 @@ int 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;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
@@ -133,15 +133,15 @@ int main (int argc, char *argv[])
                       1);
       PortableServer::ServantBase_var ec_owner (ec_impl);
 
-      ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Output the ior to the <ior_output_file>
@@ -154,18 +154,18 @@ int main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index 2e4d40d71d6..e726d106cd4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -25,7 +25,7 @@ Connection_Manager::init (CORBA::ORB_ptr orb)
 void
 Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
                                        AVStreams::MMDevice_ptr sender
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   this->sender_name_ =
     sender_name;
@@ -44,7 +44,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
       this->sender_context_ =
         this->naming_client_->bind_new_context (name
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -59,7 +59,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
       // Try binding the receivers context under the sender context.
       this->receiver_context_ =
         this->sender_context_->bind_new_context (name
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex)
@@ -75,7 +75,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
       CORBA::Object_var object =
         this->naming_client_->resolve (name
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->sender_context_ =
@@ -87,13 +87,13 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
       object =
         this->sender_context_->resolve (name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->receiver_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
 
-      this->find_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->find_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   ACE_ENDTRY;
@@ -105,12 +105,12 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
   // Register the sender object with the sender context.
   this->sender_context_->rebind (name,
                                  sender
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL)
+Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::BindingIterator_var iterator;
   CosNaming::BindingList_var binding_list;
@@ -120,12 +120,12 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL)
   this->receiver_context_->list (chunk,
                                  binding_list,
                                  iterator
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Add the receivers found in the bindinglist to the <receivers>.
   this->add_to_receivers (binding_list
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (iterator.in ()))
@@ -137,11 +137,11 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL)
         {
           more = iterator->next_n (chunk,
                                    binding_list
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           this->add_to_receivers (binding_list
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -149,7 +149,7 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   for (CORBA::ULong i = 0;
        i < binding_list.length ();
@@ -168,7 +168,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
       // context.
       CORBA::Object_var obj =
         this->receiver_context_->resolve (name
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
 
       AVStreams::MMDevice_var receiver_device =
         AVStreams::MMDevice::_narrow (obj.in ());
@@ -184,7 +184,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
 }
 
 void
-Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL)
+Connection_Manager::connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Connect to all receivers that we know about.
   for (Receivers::iterator iterator = this->receivers_.begin ();
@@ -223,7 +223,7 @@ Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL)
 
       // Register streamctrl.
       AVStreams::StreamCtrl_var streamctrl_object =
-        streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Bind the flowname and the corresponding stream controller to
@@ -236,7 +236,7 @@ Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL)
                                     (*iterator).int_id_.in (),
                                     the_qos.inout (),
                                     flow_spec
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -245,7 +245,7 @@ void
 Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
                                     const ACE_CString &receiver_name,
                                     AVStreams::MMDevice_ptr receiver
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   this->sender_name_ =
     sender_name;
@@ -269,7 +269,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
       CORBA::Object_var object =
         this->naming_client_->resolve (name
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -287,7 +287,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
       // Find the receivers context under the sender's context
       object =
         this->sender_context_->resolve (name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->receiver_context_ =
@@ -301,7 +301,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
       // Create the sender context
       this->sender_context_ =
         this->naming_client_->bind_new_context (name
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       name [0].id =
@@ -310,7 +310,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
       // Create the receivers context under the sender's context
       this->receiver_context_ =
         this->sender_context_->bind_new_context (name
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   ACE_ENDTRY;
@@ -326,7 +326,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
   // Register this receiver object under the receiver context.
   this->receiver_context_->rebind (name,
                                    receiver
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   //
@@ -343,11 +343,11 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
           CORBA::Object_var object =
             this->sender_context_->resolve (name
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
 
           this->sender_ =
-            AVStreams::MMDevice::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+            AVStreams::MMDevice::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
         }
       ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
@@ -360,7 +360,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 }
 
 void
-Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL)
+Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->sender_.in ()))
     return;
@@ -396,7 +396,7 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL)
 
   // Register streamctrl.
   AVStreams::StreamCtrl_var streamctrl_object =
-    streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   //
@@ -415,7 +415,7 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL)
                            this->receiver_.in (),
                            the_qos.inout (),
                            flow_spec
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (result == 0)
@@ -425,19 +425,19 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL)
   // Start the data sending.
   AVStreams::flowSpec start_spec;
   streamctrl->start (start_spec
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Connection_Manager::add_streamctrl (const ACE_CString &flowname,
                                     TAO_StreamEndPoint *endpoint
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   // Get the stream controller for this endpoint.
   CORBA::Any_ptr streamctrl_any =
     endpoint->get_property_value ("Related_StreamCtrl"
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   AVStreams::StreamCtrl_ptr streamctrl;
@@ -449,7 +449,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
 }
 
 void
-Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Connection_Manager::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   AVStreams::flowSpec stop_spec;
 
@@ -459,14 +459,14 @@ Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL)
        ++iterator)
     {
       (*iterator).int_id_->destroy (stop_spec
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 Connection_Manager::destroy (const ACE_CString &flowname
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   this->protocol_objects_.unbind (flowname);
   this->receivers_.unbind (flowname);
@@ -477,7 +477,7 @@ Connection_Manager::destroy (const ACE_CString &flowname
 
   AVStreams::flowSpec stop_spec;
   streamctrl->destroy (stop_spec
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
index 6db0ebd24bb..8c2e07dbf51 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
@@ -45,32 +45,32 @@ public:
 
   void bind_to_receivers (const ACE_CString &sender_name,
                           AVStreams::MMDevice_ptr sender
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Method that binds the sender to the Naming Service and retreives
   // the references of any registered receivers.
 
-  void connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Connect to the receivers that we found.
 
   void bind_to_sender (const ACE_CString &sender_name,
                        const ACE_CString &receiver_name,
                        AVStreams::MMDevice_ptr receiver
-                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Bind receiver to the sender.
 
-  void connect_to_sender (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void connect_to_sender (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Connect to the sender that we found.
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Destroy all streams.
 
   void destroy (const ACE_CString &flowname
-                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Destroy streams associated with <flowname>.
 
   void add_streamctrl (const ACE_CString &flowname,
                        TAO_StreamEndPoint *endpoint
-                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Add new streamctrl.
 
   // Map of receivers.
@@ -98,10 +98,10 @@ public:
 
 protected:
 
-  void find_receivers (TAO_ENV_SINGLE_ARG_DECL);
+  void find_receivers (ACE_ENV_SINGLE_ARG_DECL);
 
   void add_to_receivers (CosNaming::BindingList &binding_list
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
 
   TAO_Naming_Client naming_client_;
   // The Naming Service client.
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index 40185c17c92..f3b06b31f7e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -90,7 +90,7 @@ Distributer_Receiver_Callback::handle_destroy (void)
       ACE_DEBUG ((LM_DEBUG,
                   "Distributer_Callback::end_stream\n"));
 
-      DISTRIBUTER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DISTRIBUTER::instance ()->connection_manager ().destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We can close down now.
@@ -154,7 +154,7 @@ Distributer::parse_args (int argc,
 int
 Distributer::init (int argc,
                    char ** argv
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   // Initialize the connection class.
   int result =
@@ -191,7 +191,7 @@ Distributer::init (int argc,
     this->distributer_sender_mmdevice_;
 
   AVStreams::MMDevice_var distributer_sender_mmdevice =
-    this->distributer_sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->distributer_receiver_mmdevice_,
@@ -203,28 +203,28 @@ Distributer::init (int argc,
     this->distributer_receiver_mmdevice_;
 
   AVStreams::MMDevice_var distributer_receiver_mmdevice =
-    this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Bind to receivers.
   this->connection_manager_.bind_to_receivers (this->distributer_name_,
                                                distributer_sender_mmdevice.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Connect to receivers
-  this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->connection_manager_.connect_to_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->distributer_name_,
                                             distributer_receiver_mmdevice.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Connect to sender.
-  this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -246,7 +246,7 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
@@ -254,38 +254,38 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Distributer
       int result =
         DISTRIBUTER::instance ()->init (argc,
                                         argv
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -293,7 +293,7 @@ main (int argc,
 
       while (!DISTRIBUTER::instance ()->done ())
         {
-          orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
+          orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
index 83e7ec81eea..a135e2ffe4e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
@@ -116,7 +116,7 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index 77a17d31078..977fa10467c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -96,7 +96,7 @@ Receiver::~Receiver (void)
 int
 Receiver::init (int,
                 char **
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -121,18 +121,18 @@ Receiver::init (int,
     this->mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->receiver_name_,
                                             mmdevice.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Connect to the sender.
-  this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -181,7 +181,7 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
@@ -189,31 +189,31 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Receiver receiver;
@@ -240,7 +240,7 @@ main (int argc,
       result =
         receiver.init (argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -249,14 +249,14 @@ main (int argc,
       ACE_Time_Value tv(0, 10000);
       while(!done)
       {
-         orb->run (tv TAO_ENV_ARG_PARAMETER);
+         orb->run (tv ACE_ENV_ARG_PARAMETER);
          ACE_TRY_CHECK;
       }
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
index c38cb18815a..acdf204041f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
@@ -84,7 +84,7 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index e26ac09e57f..39e4c75da8f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -82,7 +82,7 @@ Sender::parse_args (int argc,
 int
 Sender::init (int argc,
               char **argv
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -128,18 +128,18 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the object reference with the Naming Service and bind to
   // the receivers
   this->connection_manager_.bind_to_receivers (this->sender_name_,
                                                mmdevice.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Connect to the receivers
-  this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->connection_manager_.connect_to_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -147,7 +147,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -225,7 +225,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
                   TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -280,54 +280,54 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
         = PortableServer::POA::_narrow (obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Client.
       int result = 0;
       result = SENDER::instance ()->init (argc,
                                           argv
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "client::init failed\n"), -1);
 
-      SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
+      SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      SENDER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      SENDER::instance ()->connection_manager ().destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
index 58468c578b6..782049f82fe 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
@@ -63,10 +63,10 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Method to initialize the various data components.
 
-  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Method to pace and send data from a file.
 
   Connection_Manager &connection_manager (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 1856b71f12c..6ade36d8ef6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -119,7 +119,7 @@ Receiver_Callback::handle_destroy (void)
       ACE_TRY_NEW_ENV
         {
           TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -190,7 +190,7 @@ Receiver::parse_args (int argc,
 int
 Receiver::init (int argc,
                 char ** argv
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -230,7 +230,7 @@ Receiver::init (int argc,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the mmdevice with the naming service.
@@ -249,7 +249,7 @@ Receiver::init (int argc,
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
                                 mmdevice.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -279,29 +279,29 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
-      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () TAO_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Make sure we have a valid <output_file>
@@ -320,23 +320,23 @@ main (int argc,
       int result =
         RECEIVER::instance ()->init (argc,
                                      argv
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //        // Start sending data.
-      //        result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
+      //        result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_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;
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      //orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      //orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
index 8050232c5b7..9d9316756e3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
@@ -94,7 +94,7 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index c09aa152355..cc61b8b07e2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -109,12 +109,12 @@ Sender::shutdown (void)
   // File reading is complete, destroy the stream.
   AVStreams::flowSpec stop_spec;
   this->streamctrl_->destroy (stop_spec
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_TRY_CHECK;
 
       // Shut the orb down.
   TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_TRY_CHECK;
 
 }
@@ -153,7 +153,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -163,12 +163,12 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
     this->naming_client_->resolve (name
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->receiver_mmdevice_ =
     AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
@@ -182,7 +182,7 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
 int
 Sender::init (int argc,
               char **argv
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -219,7 +219,7 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
+  result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result != 0)
@@ -263,7 +263,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->streamctrl_,
@@ -279,7 +279,7 @@ Sender::init (int argc,
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
                                   flow_spec
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (bind_result == 0)
@@ -292,7 +292,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -370,7 +370,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
                   TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -400,12 +400,12 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
          // File reading is complete, destroy the stream.
         AVStreams::flowSpec stop_spec;
         this->streamctrl_->destroy (stop_spec
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Shut the orb down.
         //TAO_AV_CORE::instance ()->orb ()->shutdown (1,
-        //                                            TAO_ENV_SINGLE_ARG_PARAMETER);
+        //                                            ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -429,41 +429,41 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
         = PortableServer::POA::_narrow (obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV Stream components.
 /*      TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER); */
+                                      ACE_ENV_ARG_PARAMETER); */
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
-      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () TAO_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
                                           argv
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
@@ -485,7 +485,7 @@ main (int argc,
                     "File Opened Successfull\n"));
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_Time_Value tv(3,0);
       orb->run (tv);
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
index fbe82c9e994..af864915393 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
@@ -90,10 +90,10 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Method to initialize the various data components.
 
-  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -107,7 +107,7 @@ private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
-  int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL);
+  int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
   // Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index b6a3c85341c..8e835439b85 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -26,7 +26,7 @@ Connection_Manager::init (CORBA::ORB_ptr orb)
 void
 Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
                                        AVStreams::MMDevice_ptr sender
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   this->sender_name_ =
     sender_name;
@@ -45,7 +45,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
       this->sender_context_ =
         this->naming_client_->bind_new_context (name
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -60,7 +60,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
       // Try binding the receivers context under the sender context.
       this->receiver_context_ =
         this->sender_context_->bind_new_context (name
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CosNaming::NamingContext::AlreadyBound, al_ex)
@@ -76,7 +76,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
       CORBA::Object_var object =
         this->naming_client_->resolve (name
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->sender_context_ =
@@ -88,13 +88,13 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
 
       object =
         this->sender_context_->resolve (name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->receiver_context_ =
         CosNaming::NamingContext::_narrow (object.in ());
 
-      this->find_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->find_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   ACE_ENDTRY;
@@ -106,12 +106,12 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name,
   // Register the sender object with the sender context.
   this->sender_context_->rebind (name,
                                  sender
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL)
+Connection_Manager::find_receivers (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::BindingIterator_var iterator;
   CosNaming::BindingList_var binding_list;
@@ -121,12 +121,12 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL)
   this->receiver_context_->list (chunk,
                                  binding_list,
                                  iterator
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Add the receivers found in the bindinglist to the <receivers>.
   this->add_to_receivers (binding_list
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (iterator.in ()))
@@ -138,11 +138,11 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL)
         {
           more = iterator->next_n (chunk,
                                    binding_list
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           this->add_to_receivers (binding_list
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -150,7 +150,7 @@ Connection_Manager::find_receivers (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   for (CORBA::ULong i = 0;
        i < binding_list.length ();
@@ -169,7 +169,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
       // context.
       CORBA::Object_var obj =
         this->receiver_context_->resolve (name
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
 
       AVStreams::MMDevice_var receiver_device =
         AVStreams::MMDevice::_narrow (obj.in ());
@@ -185,7 +185,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list
 }
 
 void
-Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL)
+Connection_Manager::connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Connect to all receivers that we know about.
   for (Receivers::iterator iterator = this->receivers_.begin ();
@@ -224,7 +224,7 @@ Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL)
 
       // Register streamctrl.
       AVStreams::StreamCtrl_var streamctrl_object =
-        streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Bind the flowname and the corresponding stream controller to
@@ -237,7 +237,7 @@ Connection_Manager::connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL)
                                     (*iterator).int_id_.in (),
                                     the_qos.inout (),
                                     flow_spec
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -246,7 +246,7 @@ void
 Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
                                     const ACE_CString &receiver_name,
                                     AVStreams::MMDevice_ptr receiver
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   this->sender_name_ =
     sender_name;
@@ -272,7 +272,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
       CORBA::Object_var object =
         this->naming_client_->resolve (name
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -290,7 +290,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
       // Find the receivers context under the sender's context
       object =
         this->sender_context_->resolve (name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->receiver_context_ =
@@ -304,7 +304,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
       // Create the sender context
       this->sender_context_ =
         this->naming_client_->bind_new_context (name
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       name [0].id =
@@ -313,7 +313,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
       // Create the receivers context under the sender's context
       this->receiver_context_ =
         this->sender_context_->bind_new_context (name
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   ACE_ENDTRY;
@@ -329,7 +329,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
   // Register this receiver object under the receiver context.
   this->receiver_context_->rebind (name,
                                    receiver
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   //
@@ -346,11 +346,11 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 
           CORBA::Object_var object =
             this->sender_context_->resolve (name
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
 
           this->sender_ =
-            AVStreams::MMDevice::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+            AVStreams::MMDevice::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX(SENDER_CONTEXT_EXISTS);
         }
       ACE_CATCH (CosNaming::NamingContext::NotFound, al_ex)
@@ -363,7 +363,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name,
 }
 
 void
-Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL)
+Connection_Manager::connect_to_sender (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->sender_.in ()))
     return;
@@ -399,7 +399,7 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL)
 
   // Register streamctrl.
   AVStreams::StreamCtrl_var streamctrl_object =
-    streamctrl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    streamctrl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   //
@@ -418,7 +418,7 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL)
                            this->receiver_.in (),
                            the_qos.inout (),
                            flow_spec
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (result == 0)
@@ -428,19 +428,19 @@ Connection_Manager::connect_to_sender (TAO_ENV_SINGLE_ARG_DECL)
   // Start the data sending.
   AVStreams::flowSpec start_spec;
   streamctrl->start (start_spec
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Connection_Manager::add_streamctrl (const ACE_CString &flowname,
                                     TAO_StreamEndPoint *endpoint
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   // Get the stream controller for this endpoint.
   CORBA::Any_ptr streamctrl_any =
     endpoint->get_property_value ("Related_StreamCtrl"
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   AVStreams::StreamCtrl_ptr streamctrl;
@@ -452,7 +452,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
 }
 
 void
-Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Connection_Manager::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   AVStreams::flowSpec stop_spec;
 
@@ -466,7 +466,7 @@ Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL)
   for (int i = 0 ; i < size; i++)
     {
       (*iterator).int_id_->destroy (stop_spec
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       iterator.advance ();
     }
@@ -478,7 +478,7 @@ Connection_Manager::destroy (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Connection_Manager::destroy (const ACE_CString &flowname
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   this->protocol_objects_.unbind (flowname);
   this->receivers_.unbind (flowname);
@@ -489,14 +489,14 @@ Connection_Manager::destroy (const ACE_CString &flowname
 
   AVStreams::flowSpec stop_spec;
   streamctrl->destroy (stop_spec
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Connection_Manager::unbind_sender (const ACE_CString &sender_name,
                                    AVStreams::MMDevice_ptr sender_mmdevice_obj
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -513,7 +513,7 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name,
     {
       CORBA::Object_var object =
         this->naming_client_->resolve (name
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var sender_context =
@@ -527,7 +527,7 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name,
         {
           object =
             sender_context->resolve (name
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (Resolve_Sender);
 
           AVStreams::MMDevice_var mmdevice =
@@ -536,7 +536,7 @@ Connection_Manager::unbind_sender (const ACE_CString &sender_name,
           if (mmdevice->_is_equivalent (sender_mmdevice_obj))
           {
             sender_context->unbind (name
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK_EX (Resolve_Sender);
 
             if (TAO_debug_level > 0)
@@ -583,7 +583,7 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
     {
       CORBA::Object_var object =
         this->naming_client_->resolve (name
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var sender_context =
@@ -600,7 +600,7 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
 
           object =
             sender_context->resolve (name
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (Resolve_Receiver);
 
           if (TAO_debug_level > 0)
@@ -615,7 +615,7 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
 
           object =
             receivers_context->resolve (name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (Resolve_Receiver);
 
           AVStreams::MMDevice_var  mmdevice =
@@ -624,7 +624,7 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name,
           if (mmdevice->_is_equivalent (receiver_mmdevice))
           {
             receivers_context->unbind (name
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK_EX (Resolve_Receiver);
 
             if (TAO_debug_level > 0)
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
index f7f44716a56..120760b3f93 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
@@ -48,32 +48,32 @@ public:
 
   void bind_to_receivers (const ACE_CString &sender_name,
                           AVStreams::MMDevice_ptr sender
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Method that binds the sender to the Naming Service and retreives
   // the references of any registered receivers.
 
-  void connect_to_receivers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void connect_to_receivers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Connect to the receivers that we found.
 
   void bind_to_sender (const ACE_CString &sender_name,
                        const ACE_CString &receiver_name,
                        AVStreams::MMDevice_ptr receiver
-                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Bind receiver to the sender.
 
-  void connect_to_sender (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void connect_to_sender (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Connect to the sender that we found.
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Destroy all streams.
 
   void destroy (const ACE_CString &flowname
-                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Destroy streams associated with <flowname>.
 
   void unbind_sender (const ACE_CString &sender_name,
                       AVStreams::MMDevice_ptr sender_mmdevice
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS) ;
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS) ;
   // Unbind the sender from the Naming Service
 
   void unbind_receiver (const ACE_CString &sender_name,
@@ -83,7 +83,7 @@ public:
 
   void add_streamctrl (const ACE_CString &flowname,
                        TAO_StreamEndPoint *endpoint
-                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Add new streamctrl.
 
   // Map of receivers.
@@ -111,10 +111,10 @@ public:
 
 protected:
 
-  void find_receivers (TAO_ENV_SINGLE_ARG_DECL);
+  void find_receivers (ACE_ENV_SINGLE_ARG_DECL);
 
   void add_to_receivers (CosNaming::BindingList &binding_list
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
 
   TAO_Naming_Client naming_client_;
   // The Naming Service client.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 0c14f07d0f3..a1f70c78b7a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -89,7 +89,7 @@ Distributer_Receiver_StreamEndPoint::set_protocol_object (const char *,
 
 CORBA::Boolean
 Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec
-                                                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                                                  ACE_ENV_ARG_DECL_NOT_USED)
 {
   //if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -296,7 +296,7 @@ Distributer::parse_args (int argc,
 int
 Distributer::init (int argc,
                    char ** argv
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   /// Initialize the connection class.
   int result =
@@ -343,7 +343,7 @@ Distributer::init (int argc,
     this->distributer_sender_mmdevice_;
 
   AVStreams::MMDevice_var distributer_sender_mmdevice =
-    this->distributer_sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->distributer_receiver_mmdevice_,
@@ -355,7 +355,7 @@ Distributer::init (int argc,
     this->distributer_receiver_mmdevice_;
 
   AVStreams::MMDevice_var distributer_receiver_mmdevice =
-    this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
@@ -363,21 +363,21 @@ Distributer::init (int argc,
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->distributer_name_,
                                             distributer_receiver_mmdevice.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   /// Connect to sender.
-  this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   /// Bind to receivers.
   this->connection_manager_.bind_to_receivers (this->distributer_name_,
                                                distributer_sender_mmdevice.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   /// Connect to receivers
-  this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->connection_manager_.connect_to_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -390,25 +390,25 @@ Distributer::done (void) const
 }
 
 void
-Distributer::shut_down (TAO_ENV_SINGLE_ARG_DECL)
+Distributer::shut_down (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       AVStreams::MMDevice_var receiver_mmdevice =
-        this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DISTRIBUTER::instance ()->connection_manager ().unbind_receiver (this->sender_name_,
                                                                        this->distributer_name_,
                                                                        receiver_mmdevice.in ());
       AVStreams::MMDevice_var sender_mmdevice =
-        this->distributer_sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DISTRIBUTER::instance ()->connection_manager ().unbind_sender (this->distributer_name_,
                                                                      sender_mmdevice.in ());
 
-      DISTRIBUTER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DISTRIBUTER::instance ()->connection_manager ().destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -429,7 +429,7 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       /// Initialize the ORB first.
@@ -437,38 +437,38 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Initialize the Distributer
       int result =
         DISTRIBUTER::instance ()->init (argc,
                                         argv
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -476,11 +476,11 @@ main (int argc,
 
       while (!DISTRIBUTER::instance ()->done ())
         {
-          orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
+          orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      DISTRIBUTER::instance ()->shut_down (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DISTRIBUTER::instance ()->shut_down (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
index b410f8a662e..ab6f4753a14 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
@@ -117,7 +117,7 @@ public:
   /// to the transport
 
   virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec
-                                                      TAO_ENV_ARG_DECL_NOT_USED);
+                                                      ACE_ENV_ARG_DECL_NOT_USED);
   /// Called when a sender makes a connection request.
 
 private:
@@ -174,7 +174,7 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   /// Initialize data components.
 
   int parse_args (int argc,
@@ -194,7 +194,7 @@ public:
   void stream_destroyed (void);
   /// Called when stream destroyed
 
-  void shut_down (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shut_down (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   ///Unbind the sender and receiver from the Naming Service
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index eaf26a7c5b5..df75a6a5a07 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -49,7 +49,7 @@ Receiver_StreamEndPoint::get_callback (const char *flow_name,
 
 CORBA::Boolean
 Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flowspec
-                                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                                      ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -181,7 +181,7 @@ Receiver::receiver_name (void)
 int
 Receiver::init (int,
                 char **
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   /// Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -218,18 +218,18 @@ Receiver::init (int,
     this->mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   /// Bind to sender.
   this->connection_manager_.bind_to_sender (this->sender_name_,
                                             this->receiver_name_,
                                             mmdevice.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   /// Connect to the sender.
-  this->connection_manager_.connect_to_sender (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->connection_manager_.connect_to_sender (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -275,12 +275,12 @@ Receiver::output_file_name (void)
 }
 
 void
-Receiver::shut_down (TAO_ENV_SINGLE_ARG_DECL)
+Receiver::shut_down (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       AVStreams::MMDevice_var mmdevice_obj =
-        this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -288,7 +288,7 @@ Receiver::shut_down (TAO_ENV_SINGLE_ARG_DECL)
                                                  this->receiver_name_,
                                                  mmdevice_obj.in ());
 
-      this->connection_manager_.destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->connection_manager_.destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -304,7 +304,7 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       /// Initialize the ORB first.
@@ -312,31 +312,31 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Receiver receiver;
@@ -363,7 +363,7 @@ main (int argc,
       result =
         receiver.init (argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -371,11 +371,11 @@ main (int argc,
 
       while (!done)
         {
-          orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
+          orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      receiver.shut_down (TAO_ENV_SINGLE_ARG_PARAMETER);
+      receiver.shut_down (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
index fe302b57523..19a9c673b8c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
@@ -83,7 +83,7 @@ public:
                     TAO_AV_Callback *&callback);
 
   virtual CORBA::Boolean handle_connection_requested (AVStreams::flowSpec &the_spec
-                                                      TAO_ENV_ARG_DECL_NOT_USED);
+                                                      ACE_ENV_ARG_DECL_NOT_USED);
   /// Called when a distributor tries to connect to the receiver
 
 private:
@@ -108,7 +108,7 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   /// Initialize data components.
 
   int parse_args (int argc,
@@ -121,7 +121,7 @@ public:
   ACE_CString sender_name (void);
   ACE_CString receiver_name (void);
 
-  void shut_down (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shut_down (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 protected:
   Connection_Manager connection_manager_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 266729c4943..73229a04857 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -146,20 +146,20 @@ Sender::~Sender (void)
 }
 
 void
-Sender::shut_down (TAO_ENV_SINGLE_ARG_DECL)
+Sender::shut_down (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       AVStreams::MMDevice_var mmdevice =
-        this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       SENDER::instance ()->connection_manager ().unbind_sender (this->sender_name_,
                                                                 mmdevice.in ()
-                                                                TAO_ENV_ARG_PARAMETER);
+                                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      SENDER::instance ()->connection_manager ().destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      SENDER::instance ()->connection_manager ().destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -205,7 +205,7 @@ Sender::parse_args (int argc,
 int
 Sender::init (int argc,
               char **argv
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   /// Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -261,18 +261,18 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   /// Register the object reference with the Naming Service and bind to
   /// the receivers
   this->connection_manager_.bind_to_receivers (this->sender_name_,
                                                mmdevice.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   /// Connect to the receivers
-  this->connection_manager_.connect_to_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->connection_manager_.connect_to_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -280,7 +280,7 @@ Sender::init (int argc,
 
 /// Method to send data at the specified rate
 int
-Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 {
   /// The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -309,7 +309,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
               ACE_DEBUG ((LM_DEBUG,
                           "Shut Down called\n"));
 
-              this->shut_down (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->shut_down (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               break;
@@ -332,7 +332,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
               if (TAO_debug_level > 0)
                 ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n"));
 
-              this->shut_down (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->shut_down (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               break;
@@ -375,7 +375,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
                   /// Run the orb for the wait time so the sender can
                   /// continue other orb requests.
                   TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                 }
@@ -450,51 +450,51 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ///Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
         = PortableServer::POA::_narrow (obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Initialize the Client.
       int result = 0;
       result = SENDER::instance ()->init (argc,
                                           argv
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "client::init failed\n"), -1);
 
-      SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
+      SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb->destroy ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
index a28a58fc69f..74a858c59cf 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
@@ -109,14 +109,14 @@ public:
   ~Sender (void);
   /// Destructor
 
-  void shut_down (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void shut_down (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   /// Method to initialize the various data components.
 
-  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   /// Method to pace and send data from a file.
 
   Connection_Manager &connection_manager (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 61b48a9c005..bb0af7be4ba 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -49,9 +49,9 @@ FTP_Client_Callback::handle_timeout (void *)
                 {
                   ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
                   AVStreams::flowSpec stop_spec (1);
-                  CLIENT::instance ()->streamctrl ()->stop (stop_spec TAO_ENV_ARG_PARAMETER);
+                  CLIENT::instance ()->streamctrl ()->stop (stop_spec ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
-                  //CLIENT::instance ()->streamctrl ()->destroy (stop_spec TAO_ENV_ARG_PARAMETER);
+                  //CLIENT::instance ()->streamctrl ()->destroy (stop_spec ACE_ENV_ARG_PARAMETER);
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
                   ACE_TRY_CHECK;
                   return 0;
@@ -192,7 +192,7 @@ Client::Client (void)
 int
 Client::bind_to_server (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -208,12 +208,12 @@ Client::bind_to_server (void)
       server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice");
       CORBA::Object_var server_mmdevice_obj =
         my_naming_client_->resolve (server_mmdevice_name
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->server_mmdevice_ =
         AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->server_mmdevice_.in ()))
@@ -238,7 +238,7 @@ Client::init (int argc,char **argv)
   this->argv_ = argv;
 
   CORBA::String_var ior;
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 
@@ -261,12 +261,12 @@ Client::init (int argc,char **argv)
                        "Data");
 
       this->fdev_->flowname (this->flowname ());
-      AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      AVStreams::FDev_var fdev = this->fdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       mmdevice->add_fdev (fdev.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
 
       if (this->my_naming_client_.init (this->orb_.in ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -299,7 +299,7 @@ Client::init (int argc,char **argv)
 int
 Client::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       char flow_protocol_str [BUFSIZ];
@@ -324,7 +324,7 @@ Client::run (void)
       timer.start ();
 
       AVStreams::MMDevice_var client_mmdevice
-        = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind the client and server mmdevices.
@@ -333,7 +333,7 @@ Client::run (void)
                                      this->server_mmdevice_.in (),
                                      the_qos.inout (),
                                      flow_spec
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       timer.stop ();
       timer.elapsed_time (elapsed);
       elapsed.dump ();
@@ -341,12 +341,12 @@ Client::run (void)
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1);
       AVStreams::flowSpec start_spec (1);
-      this->streamctrl_.start (start_spec TAO_ENV_ARG_PARAMETER);
+      this->streamctrl_.start (start_spec ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Schedule a timer for the for the flow handler.
       ACE_Time_Value tv (10000,0);
-      this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
+      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
@@ -366,13 +366,13 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
@@ -380,7 +380,7 @@ main (int argc,
 
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -390,10 +390,10 @@ main (int argc,
         ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1);
       result = CLIENT::instance ()->run ();
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (result < 0)
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 9670783dc64..22f43ecfdb1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -10,11 +10,11 @@ FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
   protocols [0] = CORBA::string_dup ("TCP");
   protocols [1] = CORBA::string_dup ("UDP");
   protocols [2] = CORBA::string_dup ("RTP/UDP");
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->set_protocol_restriction (protocols
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -103,7 +103,7 @@ int
 Server::init (int argc,
               char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       PortableServer::POAManager_var mgr
@@ -133,10 +133,10 @@ Server::init (int argc,
 
       this->fdev_->flowname ("Data");
 
-      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      AVStreams::FDev_var fdev = this->fdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (fdev.in ()))
@@ -145,7 +145,7 @@ Server::init (int argc,
       if (CORBA::is_nil (mmdevice.in ()))
         cout << "MMDevice is nil" << endl;
 
-      mmdevice->add_fdev (fdev.in () TAO_ENV_ARG_PARAMETER);
+      mmdevice->add_fdev (fdev.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register the mmdevice with the naming service.
@@ -156,7 +156,7 @@ Server::init (int argc,
       // Register the video control object with the naming server.
       this->my_naming_client_->rebind (server_mmdevice_name,
                                        mmdevice.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -172,10 +172,10 @@ Server::init (int argc,
 int
 Server::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
     ACE_CATCHANY
@@ -226,14 +226,14 @@ main (int argc,
       char **argv)
 {
   int result = 0;
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
@@ -241,7 +241,7 @@ main (int argc,
 
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index a95b90e6a84..b993be2173e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -85,7 +85,7 @@ int main (int argc, char *argv[])
                                             argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
@@ -98,7 +98,7 @@ int main (int argc, char *argv[])
 
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Connect the two streams and run them...
@@ -128,19 +128,19 @@ int main (int argc, char *argv[])
       TAO_StreamCtrl stream_control_impl;
 
       AVStreams::StreamCtrl_var stream_control =
-        stream_control_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        stream_control_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      obj = orb->string_to_object (ping_ior TAO_ENV_ARG_PARAMETER);
+      obj = orb->string_to_object (ping_ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::MMDevice_var ping_sender =
-        AVStreams::MMDevice::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        AVStreams::MMDevice::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      obj = orb->string_to_object (pong_ior TAO_ENV_ARG_PARAMETER);
+      obj = orb->string_to_object (pong_ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::MMDevice_var pong_sender =
-        AVStreams::MMDevice::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        AVStreams::MMDevice::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       AVStreams::streamQoS_var the_qos =
@@ -150,21 +150,21 @@ int main (int argc, char *argv[])
                                  ping_sender.in (),
                                  the_qos.inout (),
                                  flow_spec
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       flow_spec.length (0);
-      stream_control->start (flow_spec TAO_ENV_ARG_PARAMETER);
+      stream_control->start (flow_spec ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (100, 0);
-      orb->run (tv TAO_ENV_ARG_PARAMETER);
+      orb->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
      // flow_spec.length (0);
-     // stream_control->stop (flow_spec TAO_ENV_ARG_PARAMETER);
+     // stream_control->stop (flow_spec ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 125b1d10ba7..81a7bfd315e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -101,7 +101,7 @@ int main (int argc, char *argv[])
                                             argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
@@ -114,7 +114,7 @@ int main (int argc, char *argv[])
 
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register the video mmdevice object with the ORB
@@ -129,11 +129,11 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::MMDevice_var mmdevice =
-        mmdevice_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        mmdevice_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (mmdevice.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (mmdevice.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -161,18 +161,18 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::FDev_var ping_fdev =
-        ping_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ping_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::FDev_var pong_fdev =
-        pong_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        pong_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mmdevice->add_fdev (ping_fdev.in () TAO_ENV_ARG_PARAMETER);
+      mmdevice->add_fdev (ping_fdev.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (respond == 1)
         {
-          mmdevice->add_fdev (pong_fdev.in () TAO_ENV_ARG_PARAMETER);
+          mmdevice->add_fdev (pong_fdev.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index 8cd24dbb20c..afe9369fdff 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -118,7 +118,7 @@ int main (int argc, char *argv[])
                                             argv);
 
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
@@ -131,7 +131,7 @@ int main (int argc, char *argv[])
 
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Reactive_Strategy *reactive_strategy;
@@ -145,11 +145,11 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::MMDevice_var mmdevice =
-        mmdevice_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        mmdevice_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (mmdevice.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (mmdevice.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -177,17 +177,17 @@ int main (int argc, char *argv[])
                       1);
 
       AVStreams::FDev_var ping_fdev =
-        ping_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ping_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       AVStreams::FDev_var pong_fdev =
-        pong_fdev_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        pong_fdev_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mmdevice->add_fdev (ping_fdev.in () TAO_ENV_ARG_PARAMETER);
+      mmdevice->add_fdev (ping_fdev.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (respond == 1)
         {
-          mmdevice->add_fdev (pong_fdev.in () TAO_ENV_ARG_PARAMETER);
+          mmdevice->add_fdev (pong_fdev.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index 2df60ade3e3..c133ea05fe8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -26,7 +26,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
     {
       CORBA::Any_ptr streamctrl_any =
         this->get_property_value ("Related_StreamCtrl"
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       AVStreams::StreamCtrl_ptr streamctrl;
@@ -106,7 +106,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
           ACE_DECLARE_NEW_CORBA_ENV;
 
           // Initiate the modifying of the qos for the flows.
-          this->streamctrl_->modify_QoS (qos, flow_spec TAO_ENV_ARG_PARAMETER);
+          this->streamctrl_->modify_QoS (qos, flow_spec ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           ACE_DEBUG ((LM_DEBUG,
@@ -146,7 +146,7 @@ Receiver_Callback::handle_destroy (void)
   ACE_TRY_NEW_ENV
     {
       TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -175,7 +175,7 @@ Receiver::~Receiver (void)
 int
 Receiver::init (int,
                 char **
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -194,7 +194,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the mmdevice with the naming service.
@@ -213,7 +213,7 @@ Receiver::init (int,
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
                                 mmdevice.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -250,7 +250,7 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
@@ -258,31 +258,31 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -309,19 +309,19 @@ main (int argc,
       result =
         receiver.init (argc,
                        argv
-                       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;
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
index 11e76614d32..9528a063a2a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
@@ -72,7 +72,7 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   /// Initialize data components.
 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index 36ee0a3a896..cbc8c86e533 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -34,7 +34,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *,
 CORBA::Boolean
 Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
                                    const AVStreams::flowSpec &/* the_flows */
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
                             ACE_THROW_SPEC((CORBA::SystemException,
                                             AVStreams::noSuchFlow,
                                             AVStreams::QoSRequestFailed ))
@@ -119,7 +119,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -129,12 +129,12 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
     this->naming_client_->resolve (name
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->receiver_mmdevice_ =
     AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
@@ -148,7 +148,7 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
 int
 Sender::init (int argc,
               char **argv
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -185,7 +185,7 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
+  result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result != 0)
@@ -219,7 +219,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->streamctrl_,
@@ -235,7 +235,7 @@ Sender::init (int argc,
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
                                   flow_spec
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (bind_result == 0)
@@ -248,7 +248,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 {
 
 
@@ -325,7 +325,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
                   TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -354,11 +354,11 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
 
       // File reading is complete, destroy the stream.
       AVStreams::flowSpec stop_spec;
-      this->streamctrl_->destroy (stop_spec TAO_ENV_ARG_PARAMETER);
+      this->streamctrl_->destroy (stop_spec ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // Shut the orb down.
-        TAO_AV_CORE::instance ()->orb ()->shutdown (1 TAO_ENV_ARG_PARAMETER);
+        TAO_AV_CORE::instance ()->orb ()->shutdown (1 ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -375,44 +375,44 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
         = PortableServer::POA::_narrow (obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
                                           argv
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
@@ -421,7 +421,7 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
index 21ea6e49778..4a199dd1922 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
@@ -31,7 +31,7 @@ class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
 
   CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
                              const AVStreams::flowSpec &flow_spec
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
                             ACE_THROW_SPEC((CORBA::SystemException,
                                             AVStreams::noSuchFlow,
                                             AVStreams::QoSRequestFailed ));
@@ -65,10 +65,10 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   /// Method to initialize the various data components.
 
-  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   /// Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -78,7 +78,7 @@ private:
   int parse_args (int argc, char **argv);
   /// Method to parse the command line arguments.
 
-  int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL);
+  int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
   /// Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 0fad378c503..3aadac1d90d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -53,10 +53,10 @@ FTP_Client_Callback::handle_timeout (void *)
                 {
                   ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
                   AVStreams::flowSpec stop_spec (1);
-                  //TAO_ENV_DECLARE_NEW_ENV;
-                  CLIENT::instance ()->streamctrl ()->stop (stop_spec TAO_ENV_ARG_PARAMETER);
+                  //ACE_DECLARE_NEW_CORBA_ENV;
+                  CLIENT::instance ()->streamctrl ()->stop (stop_spec ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
-//                    CLIENT::instance ()->streamctrl ()->destroy (stop_spec TAO_ENV_ARG_PARAMETER);
+//                    CLIENT::instance ()->streamctrl ()->destroy (stop_spec ACE_ENV_ARG_PARAMETER);
 //                    ACE_TRY_CHECK;
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
                   ACE_TRY_CHECK;
@@ -186,7 +186,7 @@ Client::Client (void)
 int
 Client::bind_to_server (const char *name)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -196,12 +196,12 @@ Client::bind_to_server (const char *name)
       server_mmdevice_name [0].id = name;
       CORBA::Object_var server_mmdevice_obj =
         my_naming_client_->resolve (server_mmdevice_name
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->server_mmdevice_ =
         AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->server_mmdevice_.in ()))
@@ -252,7 +252,7 @@ Client::init (int argc,char **argv)
 int
 Client::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       char flow_protocol_str [BUFSIZ];
@@ -281,7 +281,7 @@ Client::run (void)
       flow_spec.length (1);
 
       AVStreams::MMDevice_var client_mmdevice
-        = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Boolean result =
@@ -289,7 +289,7 @@ Client::run (void)
                                      AVStreams::MMDevice::_nil (),
                                      the_qos.inout (),
                                      flow_spec
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (this->bind_to_server ("Server_MMDevice1") == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -299,7 +299,7 @@ Client::run (void)
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
                                             flow_spec
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (this->bind_to_server ("Server_MMDevice2") == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -309,7 +309,7 @@ Client::run (void)
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
                                             flow_spec
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == 0)
@@ -317,13 +317,13 @@ Client::run (void)
       AVStreams::flowSpec start_spec (1);
       start_spec.length (1);
       start_spec [0] = CORBA::string_dup (this->flowname_);
-      this->streamctrl_.start (start_spec TAO_ENV_ARG_PARAMETER);
+      this->streamctrl_.start (start_spec ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // Schedule a timer for the for the flow handler.
       //TAO_AV_CORE::instance ()->run ();
       ACE_Time_Value tv (10000,0);
 
-      TAO_AV_CORE::instance ()->orb ()->run (tv TAO_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->orb ()->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
@@ -344,13 +344,13 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
@@ -358,7 +358,7 @@ main (int argc,
 
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index c86c2b628ed..d2c577e01c9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -65,7 +65,7 @@ int
 Server::init (int argc,
               char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 
@@ -94,7 +94,7 @@ Server::init (int argc,
       CosNaming::Name server_mmdevice_name (1);
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice1");
-      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_TRY_EX (bind)
@@ -102,7 +102,7 @@ Server::init (int argc,
           // Register the video control object with the naming server.
           this->my_naming_client_->bind (server_mmdevice_name,
                                          mmdevice.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (bind);
         }
       ACE_CATCH (CosNaming::NamingContext::AlreadyBound,al_ex)
@@ -110,7 +110,7 @@ Server::init (int argc,
           server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice2");
           this->my_naming_client_->bind (server_mmdevice_name,
                                          mmdevice.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_ENDTRY;
@@ -129,10 +129,10 @@ Server::init (int argc,
 int
 Server::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      TAO_AV_CORE::instance ()->orb ()->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->orb ()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
     ACE_CATCHANY
@@ -186,12 +186,12 @@ main (int argc,
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
@@ -199,7 +199,7 @@ main (int argc,
 
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index ce0c4f59231..34e36546e21 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -48,10 +48,10 @@ FTP_Client_Callback::handle_timeout (void *)
                 {
                   ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
                   AVStreams::flowSpec stop_spec (1);
-                  //TAO_ENV_DECLARE_NEW_ENV;
-                  CLIENT::instance ()->streamctrl ()->stop (stop_spec TAO_ENV_ARG_PARAMETER);
+                  //ACE_DECLARE_NEW_CORBA_ENV;
+                  CLIENT::instance ()->streamctrl ()->stop (stop_spec ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
-                  // CLIENT::instance ()->streamctrl ()->destroy (stop_spec TAO_ENV_ARG_PARAMETER);
+                  // CLIENT::instance ()->streamctrl ()->destroy (stop_spec ACE_ENV_ARG_PARAMETER);
                   //ACE_TRY_CHECK;
                   ACE_DEBUG ((LM_DEBUG, "Just before Orb Shutdown\n"));
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
@@ -196,7 +196,7 @@ Client::Client (void)
 int
 Client::bind_to_server (const char *name)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -212,12 +212,12 @@ Client::bind_to_server (const char *name)
       server_mmdevice_name [0].id = name;
       CORBA::Object_var server_mmdevice_obj =
         my_naming_client_->resolve (server_mmdevice_name
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->server_mmdevice_ =
         AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->server_mmdevice_.in ()))
@@ -241,7 +241,7 @@ Client::init (int argc,char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       PortableServer::POAManager_var mgr
@@ -263,12 +263,12 @@ Client::init (int argc,char **argv)
       ACE_OS::sprintf (this->flowname_,
                        "Data");
       this->fdev_->flowname (this->flowname ());
-      AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      AVStreams::FDev_var fdev = this->fdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       mmdevice->add_fdev (fdev.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
 
       if (this->my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -295,7 +295,7 @@ Client::init (int argc,char **argv)
 int
 Client::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       char flow_protocol_str [BUFSIZ];
@@ -318,7 +318,7 @@ Client::run (void)
       flow_spec.length (1);
 
       AVStreams::MMDevice_var client_mmdevice =
-        this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Boolean result =
@@ -326,7 +326,7 @@ Client::run (void)
                                      AVStreams::MMDevice::_nil (),
                                      the_qos.inout (),
                                      flow_spec
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Suuceessful ONE\n"));
       if (result == 0)
@@ -339,7 +339,7 @@ Client::run (void)
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
                                             flow_spec
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Suuceessful TWO\n"));
@@ -355,7 +355,7 @@ Client::run (void)
                                             this->server_mmdevice_.in (),
                                             the_qos.inout (),
                                             flow_spec
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Suuceessful THREE\n"));
       if (result == 0)
@@ -363,13 +363,13 @@ Client::run (void)
       AVStreams::flowSpec start_spec (1);
       start_spec.length (1);
       start_spec [0] = CORBA::string_dup (this->flowname_);
-      this->streamctrl_.start (start_spec TAO_ENV_ARG_PARAMETER);
+      this->streamctrl_.start (start_spec ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // Schedule a timer for the for the flow handler.
       //TAO_AV_CORE::instance ()->run ();
 
       ACE_Time_Value tv (10000,0);
-      TAO_AV_CORE::instance ()->orb ()->run (tv TAO_ENV_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->orb ()->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
@@ -394,12 +394,12 @@ main (int argc,
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
@@ -407,7 +407,7 @@ main (int argc,
 
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index 7cc5081694f..edd7fc4eaae 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -9,11 +9,11 @@ FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
   protocols.length (2);
   protocols [0] = CORBA::string_dup ("TCP");
   protocols [1] = CORBA::string_dup ("UDP");
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->set_protocol_restriction (protocols
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -82,14 +82,14 @@ FTP_Server_Callback::handle_end_stream (void)
 //                                 AVStreams::QoS & the_qos,
 //                                 CORBA::Boolean_out met_qos,
 //                                 char *& named_fdev,
-//                                 TAO_ENV_SINGLE_ARG_DECL)
+//                                 ACE_ENV_SINGLE_ARG_DECL)
 // {
 //   ACE_DEBUG ((LM_DEBUG,"FTP_Server_FDev::make_consumer"));
 //   FTP_Server_FlowEndPoint *endpoint;
 //   ACE_NEW_RETURN (endpoint,
 //                   FTP_Server_FlowEndPoint,
 //                   0);
-//   return endpoint->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+//   return endpoint->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 //   ACE_CHECK_RETURN (0);
 // }
 
@@ -119,7 +119,7 @@ int
 Server::init (int argc,
               char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 
@@ -148,12 +148,12 @@ Server::init (int argc,
                       FTP_Server_FDev,
                       -1);
       this->fdev_->flowname ("Data");
-      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      AVStreams::MMDevice_var mmdevice = this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      AVStreams::FDev_var fdev = this->fdev_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      AVStreams::FDev_var fdev = this->fdev_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       mmdevice->add_fdev (fdev.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register the mmdevice with the naming service.
@@ -165,7 +165,7 @@ Server::init (int argc,
           // Register the video control object with the naming server.
           this->my_naming_client_->bind (server_mmdevice_name,
                                          mmdevice.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (bind);
         }
       ACE_CATCH (CosNaming::NamingContext::AlreadyBound,al_ex)
@@ -173,7 +173,7 @@ Server::init (int argc,
           server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice2");
           this->my_naming_client_->bind (server_mmdevice_name,
                                          mmdevice.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_ENDTRY;
@@ -192,10 +192,10 @@ Server::init (int argc,
 int
 Server::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      TAO_AV_CORE::instance ()->orb ()->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      TAO_AV_CORE::instance ()->orb ()->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
     ACE_CATCHANY
@@ -249,12 +249,12 @@ main (int argc,
 
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
@@ -262,7 +262,7 @@ main (int argc,
 
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
index 7faf6c5e555..87a4c22639b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
@@ -39,7 +39,7 @@ public:
 //                                                        AVStreams::QoS & the_qos,
 //                                                        CORBA::Boolean_out met_qos,
 //                                                        char *& named_fdev,
-//                                                        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+//                                                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 //   // bridge method for the application to override the consumer object
 //   // creation. Default implementation creates a TAO_FlowConsumer.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index 305b7bb377e..c1c3d09e16d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -165,7 +165,7 @@ Receiver::parse_args (int argc,
 int
 Receiver::init (int argc,
                 char ** argv
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -192,7 +192,7 @@ Receiver::init (int argc,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the mmdevice with the naming service.
@@ -211,7 +211,7 @@ Receiver::init (int argc,
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
                                 mmdevice.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -235,37 +235,37 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
         RECEIVER::instance ()->init (argc,
                                      argv
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -273,14 +273,14 @@ main (int argc,
 
       while (endstream != 2)
         {
-          orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
+          orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
index b15d676d68f..048b89b88be 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
@@ -97,7 +97,7 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 8b6934f72c0..3612d845c7d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -56,12 +56,12 @@ Sender::shutdown (void)
   // File reading is complete, destroy the stream.
   AVStreams::flowSpec stop_spec;
   this->streamctrl_->destroy (stop_spec
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_TRY_CHECK;
 
       // Shut the orb down.
   TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_TRY_CHECK;
 
 }
@@ -100,7 +100,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -110,12 +110,12 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
     this->naming_client_->resolve (name
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->receiver_mmdevice_ =
     AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
@@ -129,7 +129,7 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
 int
 Sender::init (int argc,
               char **argv
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -166,7 +166,7 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
+  result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result != 0)
@@ -210,7 +210,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->streamctrl_,
@@ -226,7 +226,7 @@ Sender::init (int argc,
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
                                   flow_spec
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (bind_result == 0)
@@ -239,7 +239,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -317,7 +317,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
                   TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -332,22 +332,22 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
               // Send frame.
               int result =
                 (*begin)->send_frame (&this->mb_);
-        
+
               if (result < 0)
                 ACE_ERROR_RETURN ((LM_ERROR,
                                    "send failed:%p",
                                    "Sender::pace_data send\n"),
                                   -1);
             }
-        
-        
+
+
           ACE_DEBUG ((LM_DEBUG,
                       "Sender::pace_data frame %d was sent succesfully\n",
                       ++this->frame_count_));
-        
+
           // Reset the message block.
           this->mb_.reset ();
-        
+
         } // end while
 
       this->shutdown ();
@@ -373,37 +373,37 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
         = PortableServer::POA::_narrow (obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
                                           argv
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
@@ -412,7 +412,7 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
index 50e1c1fb481..172efc60bd4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
@@ -66,10 +66,10 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Method to initialize the various data components.
 
-  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -81,7 +81,7 @@ private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
-  int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL);
+  int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
   // Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index 32cebfb96f1..21404cc8e9c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -124,7 +124,7 @@ Client::frame_rate (void)
 
 // Method to get the object reference of the server
 int
-Client::bind_to_server (TAO_ENV_SINGLE_ARG_DECL)
+Client::bind_to_server (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Initialize the naming services
   if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
@@ -140,12 +140,12 @@ Client::bind_to_server (TAO_ENV_SINGLE_ARG_DECL)
   // Resolve the server object reference from the Naming Service
   CORBA::Object_var server_mmdevice_obj =
     my_naming_client_->resolve (server_mmdevice_name
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->server_mmdevice_ =
     AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->server_mmdevice_.in ()))
@@ -159,7 +159,7 @@ Client::bind_to_server (TAO_ENV_SINGLE_ARG_DECL)
 int
 Client::init (int argc,
               char **argv
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -187,7 +187,7 @@ Client::init (int argc,
                       -1);
 
   result
-    = this->bind_to_server (TAO_ENV_SINGLE_ARG_PARAMETER);
+    = this->bind_to_server (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Resolve the object reference of the server from the Naming Service.
@@ -233,7 +233,7 @@ Client::init (int argc,
   flow_spec.length (1);
 
   AVStreams::MMDevice_var client_mmdevice =
-    this->client_mmdevice_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Bind/Connect  the client and server MMDevices.
@@ -242,7 +242,7 @@ Client::init (int argc,
                                  this->server_mmdevice_.in (),
                                  the_qos.inout (),
                                  flow_spec
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (bind_result == 0)
@@ -253,7 +253,7 @@ Client::init (int argc,
 
 // Method to send data at the specified rate
 int
-Client::pace_data (TAO_ENV_SINGLE_ARG_DECL)
+Client::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 {
 
   // Rate at which frames of data need to be sent.
@@ -341,7 +341,7 @@ Client::pace_data (TAO_ENV_SINGLE_ARG_DECL)
 
                   // run the orb for the wait time so the client can continue other orb requests.
                   TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -365,7 +365,7 @@ Client::pace_data (TAO_ENV_SINGLE_ARG_DECL)
       // Since the file is read stop the stream.
       AVStreams::flowSpec stop_spec (1);
       CLIENT::instance ()->streamctrl ()->destroy (stop_spec
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Shut the orb down.
@@ -387,52 +387,52 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       //Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
         = PortableServer::POA::_narrow (obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV STream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // INitialize the Client.
       int result = 0;
       result = CLIENT::instance ()->init (argc,
                                           argv
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "client::init failed\n"),1);
 
       // Start sending data.
-      result = CLIENT::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = CLIENT::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index 386dd169b7f..a7c7b0fcab3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -89,13 +89,13 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Method to initialize the various data components.
 
   void set_protocol_object (TAO_AV_Protocol_Object *protocol_object);
   // Set the protocol object corresponding to the transport protocol chosen.
 
-  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Method to pace and send data from a file.
 
   FILE *file (void);
@@ -114,7 +114,7 @@ private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
-  int bind_to_server (TAO_ENV_SINGLE_ARG_DECL);
+  int bind_to_server (ACE_ENV_SINGLE_ARG_DECL);
   // Method that binds the ftp client to the server
 
   ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index 75a6cb9dfcf..cb8eebf5200 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -72,7 +72,7 @@ Server::~Server (void)
 int
 Server::init (int,
               char **
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   int result =
     this->reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
@@ -91,7 +91,7 @@ Server::init (int,
   server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice");
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN(-1);
 
   // Initialize the naming services
@@ -104,7 +104,7 @@ Server::init (int,
   // Register the server object with the naming server.
   this->my_naming_client_->rebind (server_mmdevice_name,
                                    mmdevice.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -140,14 +140,14 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -171,39 +171,39 @@ main (int argc,
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server server;
       result =
         server.init (argc,
                      argv
-                     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;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
index 107e468f4d9..23eb5b60957 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -78,7 +78,7 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index 263fe9fa9e6..1ce69680e75 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -93,7 +93,7 @@ Receiver::~Receiver (void)
 int
 Receiver::init (int,
                 char **
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -112,7 +112,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the mmdevice with the naming service.
@@ -131,7 +131,7 @@ Receiver::init (int,
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
                                 mmdevice.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -178,31 +178,31 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -229,7 +229,7 @@ main (int argc,
       result =
         receiver.init (argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -237,14 +237,14 @@ main (int argc,
 
       while (!endstream)
         {
-          orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
+          orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index 8cb7ae5514b..ad7efd60bf6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -82,7 +82,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -92,12 +92,12 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
     this->naming_client_->resolve (name
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->receiver_mmdevice_ =
     AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
@@ -111,7 +111,7 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
 int
 Sender::init (int argc,
               char **argv
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -148,7 +148,7 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
+  result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result != 0)
@@ -182,7 +182,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->streamctrl_,
@@ -198,7 +198,7 @@ Sender::init (int argc,
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
                                   flow_spec
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (bind_result == 0)
@@ -211,7 +211,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -289,7 +289,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
                   TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -319,12 +319,12 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
       // File reading is complete, destroy the stream.
       AVStreams::flowSpec stop_spec;
       this->streamctrl_->destroy (stop_spec
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Shut the orb down.
       TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -351,37 +351,37 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
         = PortableServer::POA::_narrow (obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
                                           argv
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
@@ -390,7 +390,7 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index e681eed4fc9..2ad409534ab 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -78,7 +78,7 @@ Distributer_Receiver_Callback::handle_destroy (void)
       // Destroy the receiver stream
       AVStreams::flowSpec stop_spec;
       DISTRIBUTER::instance ()->receiver_streamctrl ()->destroy (stop_spec
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We can close down now.
@@ -127,7 +127,7 @@ Distributer::~Distributer (void)
 void
 Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
                                const ACE_CString &mmdevice_name
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -137,19 +137,19 @@ Distributer::bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
   // Resolve the mmdevice object reference from the Naming Service
   CORBA::Object_var mmdevice_obj =
     this->naming_client_->resolve (name
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   mmdevice =
     AVStreams::MMDevice::_narrow (mmdevice_obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 Distributer::init (int /*argc*/,
                    char *[] /*argv*/
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   // Initialize the naming services
   int result =
@@ -174,14 +174,14 @@ Distributer::init (int /*argc*/,
   ACE_CString mmdevice_name ("Receiver");
   this->bind_to_mmdevice (this->receiver_mmdevice_.out (),
                           mmdevice_name
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Bind to the sender mmdevice
   mmdevice_name = "Sender";
   this->bind_to_mmdevice (this->sender_mmdevice_.out (),
                           mmdevice_name
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Initialize the  QoS
@@ -210,7 +210,7 @@ Distributer::init (int /*argc*/,
     this->distributer_sender_mmdevice_;
 
   AVStreams::MMDevice_var distributer_sender_mmdevice =
-    this->distributer_sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->distributer_sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->distributer_receiver_mmdevice_,
@@ -222,7 +222,7 @@ Distributer::init (int /*argc*/,
     this->distributer_receiver_mmdevice_;
 
   AVStreams::MMDevice_var distributer_receiver_mmdevice =
-    this->distributer_receiver_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->distributer_receiver_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->receiver_streamctrl_,
@@ -239,7 +239,7 @@ Distributer::init (int /*argc*/,
                                            this->receiver_mmdevice_.in (),
                                            the_qos.inout (),
                                            flow_spec
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create the forward flow specification to describe the flow.
@@ -270,7 +270,7 @@ Distributer::init (int /*argc*/,
                                   distributer_receiver_mmdevice.in (),
                                   the_qos.inout (),
                                   flow_spec
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (res == 0)
@@ -301,7 +301,7 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
@@ -309,38 +309,38 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Distributer
       int result =
         DISTRIBUTER::instance ()->init (argc,
                                         argv
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -348,7 +348,7 @@ main (int argc,
 
       while (!DISTRIBUTER::instance ()->done ())
         {
-          orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
+          orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
index 8f003e75fd5..0f56e2e2e85 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
@@ -116,12 +116,12 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
   void bind_to_mmdevice (AVStreams::MMDevice_ptr &mmdevice,
                          const ACE_CString &mmdevice_name
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   // Resolve the reference of the mmdevice from the naming service.
 
   TAO_StreamCtrl *receiver_streamctrl (void);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index ddd291d989c..619cf20c48d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -67,7 +67,7 @@ Receiver_Callback::handle_destroy (void)
   ACE_TRY_NEW_ENV
     {
       TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -94,7 +94,7 @@ Receiver::~Receiver (void)
 int
 Receiver::init (int,
                 char **
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -113,7 +113,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the mmdevice with the naming service.
@@ -132,7 +132,7 @@ Receiver::init (int,
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
                                 mmdevice.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -169,7 +169,7 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
@@ -177,31 +177,31 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -228,19 +228,19 @@ main (int argc,
       result =
         receiver.init (argc,
                        argv
-                       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;
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
index 1a5fa37d3a8..55d31695179 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
@@ -84,7 +84,7 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 72cc84048a5..7e1571f8970 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -21,7 +21,7 @@ Sender_StreamEndPoint::get_callback (const char *,
     {
       CORBA::Any_ptr streamctrl_any =
         this->get_property_value ("Related_StreamCtrl"
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       AVStreams::StreamCtrl_ptr streamctrl;
@@ -112,7 +112,7 @@ Sender::parse_args (int argc,
 int
 Sender::init (int argc,
               char **argv
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -158,7 +158,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN(-1);
 
   CosNaming::Name name (1);
@@ -169,7 +169,7 @@ Sender::init (int argc,
   // Register the sender object with the naming server.
   this->naming_client_->rebind (name,
                                 mmdevice.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -177,7 +177,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -255,7 +255,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
                   TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -292,7 +292,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
           // File reading is complete, destroy the stream.
           AVStreams::flowSpec stop_spec;
           this->streamctrl_->destroy (stop_spec
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -310,44 +310,44 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
         = PortableServer::POA::_narrow (obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
                                           argv
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
@@ -355,7 +355,7 @@ main (int argc,
                            "Sender::init failed\n"),
                           -1);
 
-      SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
+      SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (20);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
index 6619775927b..bda039011eb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
@@ -63,10 +63,10 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Method to initialize the various data components.
 
-  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index ddd291d989c..619cf20c48d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -67,7 +67,7 @@ Receiver_Callback::handle_destroy (void)
   ACE_TRY_NEW_ENV
     {
       TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -94,7 +94,7 @@ Receiver::~Receiver (void)
 int
 Receiver::init (int,
                 char **
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -113,7 +113,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the mmdevice with the naming service.
@@ -132,7 +132,7 @@ Receiver::init (int,
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
                                 mmdevice.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -169,7 +169,7 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
@@ -177,31 +177,31 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -228,19 +228,19 @@ main (int argc,
       result =
         receiver.init (argc,
                        argv
-                       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;
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index 507f6ec9ca7..0ef6bc0defd 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -84,7 +84,7 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index 8ab02026164..c70ab17518e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -82,7 +82,7 @@ Sender::parse_args (int argc,
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -92,12 +92,12 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
     this->naming_client_->resolve (name
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->receiver_mmdevice_ =
     AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
@@ -111,7 +111,7 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
 int
 Sender::init (int argc,
               char **argv
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -148,7 +148,7 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
+  result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result != 0)
@@ -182,7 +182,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->streamctrl_,
@@ -198,7 +198,7 @@ Sender::init (int argc,
                                   this->receiver_mmdevice_.in (),
                                   the_qos.inout (),
                                   flow_spec
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (bind_result == 0)
@@ -211,7 +211,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The time that should lapse between two consecutive frames sent.
   ACE_Time_Value inter_frame_time;
@@ -289,7 +289,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
                   TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -319,12 +319,12 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
       // File reading is complete, destroy the stream.
       AVStreams::flowSpec stop_spec;
       this->streamctrl_->destroy (stop_spec
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Shut the orb down.
       TAO_AV_CORE::instance ()->orb ()->shutdown (0
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -341,44 +341,44 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
         = PortableServer::POA::_narrow (obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
                                           argv
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
@@ -387,7 +387,7 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
index aa74b4b3319..06e6de6b045 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
@@ -63,10 +63,10 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Method to initialize the various data components.
 
-  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -76,7 +76,7 @@ private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
-  int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL);
+  int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
   // Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
index fe8204c6cd2..f11be02f3a5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
@@ -75,7 +75,7 @@ Receiver::~Receiver (void)
 int
 Receiver::init (int,
                 char **
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -94,7 +94,7 @@ Receiver::init (int,
     this->mmdevice_;
 
   CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Register the mmdevice with the naming service.
@@ -113,7 +113,7 @@ Receiver::init (int,
   // Register the receiver object with the naming server.
   this->naming_client_->rebind (name,
                                 mmdevice.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -150,7 +150,7 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
@@ -158,31 +158,31 @@ main (int argc,
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AVStreams components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -209,19 +209,19 @@ main (int argc,
       result =
         receiver.init (argc,
                        argv
-                       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;
 
       // Hack for now....
       ACE_OS::sleep (1);
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
index 0b617c4d7bc..067c1c7f45b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
@@ -81,7 +81,7 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
 protected:
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index 119c9edbb3b..27f1de4c22a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -16,7 +16,7 @@ ACE_Time_Value inter_frame_time;
 CORBA::Boolean
 Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
                                    const AVStreams::flowSpec &the_flows
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
                                    ACE_THROW_SPEC (( CORBA::SystemException,
                                                      AVStreams::noSuchFlow,
                                                      AVStreams::QoSRequestFailed ))
@@ -24,7 +24,7 @@ Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
   ACE_DEBUG ((LM_DEBUG,
               "Sender_StreamEndPoint::modify_QoS\n"));
 
-  int result =  this->change_qos (new_qos, the_flows TAO_ENV_ARG_PARAMETER);
+  int result =  this->change_qos (new_qos, the_flows ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (result != 0)
@@ -37,7 +37,7 @@ int
 Sender_StreamEndPoint::get_callback (const char *,
                                      TAO_AV_Callback *&callback)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   // Create and return the sender application callback to AVStreams
   // for further upcalls.
   callback = &this->callback_;
@@ -47,7 +47,7 @@ Sender_StreamEndPoint::get_callback (const char *,
                   TAO_Negotiator,
                   -1);
   AVStreams::Negotiator_var negotiator_obj =
-    negotiator->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    negotiator->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->set_negotiator (negotiator_obj.in ());
@@ -170,7 +170,7 @@ Sender::fill_qos (AVStreams::streamQoS &qos)
 
 // Method to get the object reference of the receiver
 int
-Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
+Sender::bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -180,12 +180,12 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
   // Resolve the receiver object reference from the Naming Service
   CORBA::Object_var receiver_mmdevice_obj =
     this->naming_client_->resolve (name
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->receiver_mmdevice_ =
     AVStreams::MMDevice::_narrow (receiver_mmdevice_obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->receiver_mmdevice_.in ()))
@@ -199,7 +199,7 @@ Sender::bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL)
 int
 Sender::init (int argc,
               char **argv
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   // Initialize the endpoint strategy with the orb and poa.
   int result =
@@ -236,7 +236,7 @@ Sender::init (int argc,
                 "File opened successfully\n"));
 
   // Resolve the object reference of the receiver from the Naming Service.
-  result = this->bind_to_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
+  result = this->bind_to_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result != 0)
@@ -269,7 +269,7 @@ Sender::init (int argc,
     this->sender_mmdevice_;
 
   AVStreams::MMDevice_var mmdevice =
-    this->sender_mmdevice_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->sender_mmdevice_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->streamctrl_,
@@ -289,7 +289,7 @@ Sender::init (int argc,
                                   this->receiver_mmdevice_.in (),
                                   qos,
                                   flow_spec
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (bind_result == 0)
@@ -302,7 +302,7 @@ Sender::init (int argc,
 
 // Method to send data at the specified rate
 int
-Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
+Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 {
 
 
@@ -379,7 +379,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
                   // Run the orb for the wait time so the sender can
                   // continue other orb requests.
                   TAO_AV_CORE::instance ()->orb ()->run (wait_time
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -420,7 +420,7 @@ Sender::pace_data (TAO_ENV_SINGLE_ARG_DECL)
               this->fill_qos (qos);
               this->streamctrl_->modify_QoS (qos,
                                              flow_spec
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -441,44 +441,44 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var
       PortableServer::POA_var root_poa
         = PortableServer::POA::_narrow (obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the AV Stream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       root_poa.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the Sender.
       int result = 0;
       result = SENDER::instance ()->init (argc,
                                           argv
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result < 0)
@@ -487,7 +487,7 @@ main (int argc,
                           -1);
 
       // Start sending data.
-      result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = SENDER::instance ()->pace_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb->run ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
index c3875d517a2..41fa4f8325e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
@@ -40,7 +40,7 @@ public:
 
   CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
                              const AVStreams::flowSpec &/* the_flows */
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
                             ACE_THROW_SPEC(( CORBA::SystemException,
                                              AVStreams::noSuchFlow,
                                              AVStreams::QoSRequestFailed ));
@@ -69,10 +69,10 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL_NOT_USED);
+            ACE_ENV_ARG_DECL_NOT_USED);
   // Method to initialize the various data components.
 
-  int pace_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int pace_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Method to pace and send data from a file.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -85,7 +85,7 @@ private:
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
-  int bind_to_receiver (TAO_ENV_SINGLE_ARG_DECL);
+  int bind_to_receiver (ACE_ENV_SINGLE_ARG_DECL);
   // Method that binds the sender to the receiver.
 
   SENDER_ENDPOINT_STRATEGY endpoint_strategy_;
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index 66be6ea80a1..10037b9b448 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -357,14 +357,14 @@ CC_Client::print_usage (void)
 int
 CC_Client::init_naming_service (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       ACE_NEW_RETURN (naming_service_,
                       CC_naming_service,
                       -1);
 
-      this->naming_service_->Init (this->orb_ TAO_ENV_ARG_PARAMETER);
+      this->naming_service_->Init (this->orb_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -382,14 +382,14 @@ CC_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     "internet"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -413,14 +413,14 @@ CC_Client::init (int argc, char **argv)
 
           CORBA::Object_var factory_object =
             this->orb_->string_to_object (this->cc_factory_key_
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 #if 0
           // The test cannot currently run without the naming service.
           this->factory_ =
             CosConcurrencyControl::LockSetFactory::_narrow
-            (factory_object.in () TAO_ENV_ARG_PARAMETER);
+            (factory_object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (this->factory_.in ()))
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index 3023e65b043..541d04b0eea 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -41,7 +41,7 @@ CC_Command::CC_Command(void)
 
 CosConcurrencyControl::LockSet_var
 CC_Command::GetLockSet (const char *lock_set_name
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   CosConcurrencyControl::LockSet_var ccls_ret;
 
@@ -52,12 +52,12 @@ CC_Command::GetLockSet (const char *lock_set_name
           CORBA::Object_var ccls_obj =
             CC_naming_service::Instance()->get_obj_from_name ("",
                                                               lock_set_name
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ccls_ret =
             CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -160,7 +160,7 @@ int CC_CreateLockSet_Cmd::execute(void)
 
   printf("Executing create command (lock set: %s)\n", name_);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CosConcurrencyControl::LockSet_ptr lock_set =
@@ -168,7 +168,7 @@ int CC_CreateLockSet_Cmd::execute(void)
       if(ACE_OS::strcmp(name_,"")!=0)// Do not bind an empty name
         {
           CC_naming_service::Instance()->bind_name(name_,
-                                                   lock_set TAO_ENV_ARG_PARAMETER);
+                                                   lock_set ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -214,14 +214,14 @@ int CC_Lock_Cmd::execute(void)
   printf("Executing lock command (lock set: %s, mode: %s)\n",
          name_, CC_TestUtils::get_lock_mode_name(mode_));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CosConcurrencyControl::LockSet_var ccls =
-        GetLockSet(name_ TAO_ENV_ARG_PARAMETER);
+        GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ccls->lock (mode_
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -261,14 +261,14 @@ int CC_UnLock_Cmd::execute(void)
   printf("Executing unlock command (lock set: %s, mode: %s)\n",
          name_, CC_TestUtils::get_lock_mode_name(mode_));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ TAO_ENV_ARG_PARAMETER);
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ccls->unlock (mode_
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -311,14 +311,14 @@ int CC_TryLock_Cmd::execute(void)
 
   CORBA::Boolean lock_not_held;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ TAO_ENV_ARG_PARAMETER);
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       lock_not_held = ccls->try_lock (mode_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (lock_not_held)
@@ -376,14 +376,14 @@ int CC_ChangeMode_Cmd::execute(void)
          name_, CC_TestUtils::get_lock_mode_name(held_mode_),
          CC_TestUtils::get_lock_mode_name(new_mode_));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ TAO_ENV_ARG_PARAMETER);
+      CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ccls->change_mode (held_mode_, new_mode_
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -570,18 +570,18 @@ CC_Lookup_Cmd::execute(void)
   // Do the lookup if we haven't done it before
   if(cc_lockset_.in() == 0)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
           CORBA::Object_var ccls_obj =
             CC_naming_service::Instance()->get_obj_from_name ("",
                                                               name_
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CosConcurrencyControl::LockSet_var ccls =
             CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           cc_lockset_ = ccls;
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h
index 0d075725d06..735d38d7c21 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h
@@ -45,7 +45,7 @@ class CC_Command
  protected:
   CosConcurrencyControl::LockSet_var
     GetLockSet (const char *lock_set_name
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
   // Function to look up the lock set we are operating on, or if the
   // name is "" return the global lock set variable
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index 7333698f6b6..48dc3110cdf 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -22,12 +22,12 @@
 ACE_RCSID(Concurrency, CC_naming_service, "$Id$")
 
 CC_naming_service::CC_naming_service (CORBA::ORB_var orb
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
   : cc_factory_key_ (0),
     orb_ (0),
     factory_ (0)
 {
-  this->Init(orb TAO_ENV_ARG_PARAMETER);
+  this->Init(orb ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   instance_ = this;
@@ -42,7 +42,7 @@ CC_naming_service::CC_naming_service(void)
 
 void
 CC_naming_service::Init(CORBA::ORB_var orb
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   this->orb_ = orb;
 
@@ -71,7 +71,7 @@ CC_naming_service::Instance(void)
 CORBA::Object_var
 CC_naming_service::get_obj_from_name (const char *c_name,
                                       const char *name
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "C: %s, N: %s\n", c_name, name));
   CORBA::Object_var obj;
@@ -83,7 +83,7 @@ CC_naming_service::get_obj_from_name (const char *c_name,
           CosNaming::Name ns_name (1);
           ns_name.length (1);
           ns_name[0].id = CORBA::string_dup (name);
-          obj = my_name_client_->resolve (ns_name TAO_ENV_ARG_PARAMETER);
+          obj = my_name_client_->resolve (ns_name ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -92,7 +92,7 @@ CC_naming_service::get_obj_from_name (const char *c_name,
           ns_name.length (2);
           ns_name[0].id = CORBA::string_dup (c_name);
           ns_name[1].id = CORBA::string_dup (name);
-          obj = my_name_client_->resolve (ns_name TAO_ENV_ARG_PARAMETER);
+          obj = my_name_client_->resolve (ns_name ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (CORBA::is_nil (obj.in ()) )
@@ -113,7 +113,7 @@ CC_naming_service::get_obj_from_name (const char *c_name,
 void
 CC_naming_service::bind_name (const char *n,
                               CORBA::Object_ptr obj
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "CC_Client::bind_name\n"));
 
@@ -124,7 +124,7 @@ CC_naming_service::bind_name (const char *n,
       ns_name[0].id = CORBA::string_dup (n);
       my_name_client_->bind (ns_name,
                              obj
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -144,7 +144,7 @@ CC_naming_service::get_lock_set_factory (void)
 int
 CC_naming_service::init_naming_service (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the naming services
@@ -156,12 +156,12 @@ CC_naming_service::init_naming_service (void)
 
       CORBA::Object_var factory_obj = get_obj_from_name ("CosConcurrency",
                                                          "LockSetFactory"
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->factory_ =
         CosConcurrencyControl::LockSetFactory::_narrow
-        (factory_obj.in () TAO_ENV_ARG_PARAMETER);
+        (factory_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->factory_.in ()))
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
index f86de983f9b..2b42fb5da9e 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
@@ -39,24 +39,24 @@ public:
   CC_naming_service ();
   // Default constructor
 
-  CC_naming_service (CORBA::ORB_var orb_ TAO_ENV_ARG_DECL);
+  CC_naming_service (CORBA::ORB_var orb_ ACE_ENV_ARG_DECL);
   // Constructor
 
   ~CC_naming_service (void);
   // Default destructor.
 
-  void Init (CORBA::ORB_var orb_ TAO_ENV_ARG_DECL);
+  void Init (CORBA::ORB_var orb_ ACE_ENV_ARG_DECL);
   // Initialization method must be called after first call of Instance()
   // in order to initialize the object correctly
 
   CORBA::Object_var get_obj_from_name (const char *c_name,
                                        const char *name
-                                       TAO_ENV_ARG_DECL);
+                                       ACE_ENV_ARG_DECL);
   // Lookup a name in the naming service (context, name)
 
   void bind_name (const char *n,
                   CORBA::Object_ptr obj
-                  TAO_ENV_ARG_DECL);
+                  ACE_ENV_ARG_DECL);
   // Bind a name in the concurrency context.
 
   CosConcurrencyControl::LockSetFactory_var get_lock_set_factory (void);
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 428869028e4..baf8c02bdda 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -53,7 +53,7 @@ CC_TestUtils::create_lock_set (void)
   ACE_TRY
     {
       lock_set =
-        CC_naming_service::Instance()->get_lock_set_factory ()->create (TAO_ENV_SINGLE_ARG_PARAMETER);
+        CC_naming_service::Instance()->get_lock_set_factory ()->create (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (lock_set))
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index fdcddbb53bf..d4e132a0617 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -37,11 +37,11 @@ CC_Test::create_lock_set (void)
   // Create the lock set and return an obj ref corresponding to the
   // key.
   CosConcurrencyControl::LockSet_ptr lock_set(0);
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       lock_set =
-        this->naming_service_->get_lock_set_factory ()->create (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->naming_service_->get_lock_set_factory ()->create (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (lock_set))
@@ -101,10 +101,10 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
 
   CosConcurrencyControl::LockSet_ptr cc_lock_set_ = create_lock_set ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      cc_lock_set_->lock (mode_ TAO_ENV_ARG_PARAMETER);
+      cc_lock_set_->lock (mode_ ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
@@ -112,7 +112,7 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
                   get_lock_mode_name (mode_)));
 
       lock_not_held = cc_lock_set_->try_lock (mode_
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (lock_not_held)
@@ -128,13 +128,13 @@ Test_Single_Lock_With_Mode::run (int /* times_to_run */)
                     get_lock_mode_name (mode_)));
 
       cc_lock_set_->unlock (mode_
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock released\n",
                   get_lock_mode_name (mode_)));
 
       lock_not_held = cc_lock_set_->try_lock (mode_
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (lock_not_held)
@@ -179,20 +179,20 @@ Test_Setup_LockSet::~Test_Setup_LockSet (void)
 int
 Test_Setup_LockSet::run (int /* times_to_run */)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CosConcurrencyControl::LockSet_ptr cc_lock_set_ =
         create_lock_set ();
       this->naming_service_->bind_name (my_name_, cc_lock_set_
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Name bound\n"));
 
       cc_lock_set_->lock (CosConcurrencyControl::read
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -226,22 +226,22 @@ Test_Use_Already_Created_LockSet::~Test_Use_Already_Created_LockSet (void)
 int
 Test_Use_Already_Created_LockSet::run (int /* times_to_run */)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::Object_var ccls_obj =
         this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""),
                                                   my_name_
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosConcurrencyControl::LockSet_var ccls =
         CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ccls->lock (CosConcurrencyControl::read
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -273,21 +273,21 @@ Test_Unlock_Already_Created_LockSet::~Test_Unlock_Already_Created_LockSet (void)
 int
 Test_Unlock_Already_Created_LockSet::run (int /* times_to_run */)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::Object_var ccls_obj =
         this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""), my_name_
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosConcurrencyControl::LockSet_var ccls =
         CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ccls->unlock (CosConcurrencyControl::read
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
     }
   ACE_CATCHANY
     {
@@ -320,11 +320,11 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
 
   // Create the lock set
   CosConcurrencyControl::LockSet_ptr cc_lock_set_ = create_lock_set ();
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // lock the lock
-      cc_lock_set_->lock (mode_ TAO_ENV_ARG_PARAMETER);
+      cc_lock_set_->lock (mode_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -333,7 +333,7 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
 
       // check to see if the lock is held
       lock_not_held = cc_lock_set_->try_lock (mode_
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
 
       if (lock_not_held)
         {
@@ -349,14 +349,14 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
 
       // release the lock
       cc_lock_set_->unlock (mode_
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_DEBUG ((LM_DEBUG,
                   "%s lock released\n",
                   get_lock_mode_name (mode_)));
 
       // release the lock again. this should raise an exception
       cc_lock_set_->unlock (mode_
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
 
       ACE_DEBUG ((LM_DEBUG,
                   "attemptet to release %s lock\n",
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index a2e9d894079..14bff5925b2 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -11,47 +11,47 @@ ACE_RCSID(CEC_Tests, Disconnect, "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
 int
 main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -68,44 +68,44 @@ main (int argc, char* argv[])
 
 void
 deactivate_servant (PortableServer::Servant servant
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
           int use_callbacks
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
 {
   TAO_CEC_EventChannel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
 
   TAO_CEC_EventChannel ec_impl (attributes);
-  ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
 
   // Obtain the consumer admin..
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // and the supplier admin..
   CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
@@ -120,50 +120,50 @@ run_test (PortableServer::POA_ptr poa,
   for (int i = 0; i != iterations; ++i)
     {
       supplier_0.connect (supplier_admin.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       consumer_0.connect (consumer_admin.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
           supplier_1.connect (supplier_admin.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           consumer_1.connect (consumer_admin.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
-      supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
-          consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
-          supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 
   supplier_0.connect (supplier_admin.in ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   consumer_0.connect (consumer_admin.in ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER);
+  deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER);
+  deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER);
+  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count_0 = 1;
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index 2f661daad58..5587b6584fd 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -11,47 +11,47 @@ ACE_RCSID(CEC_Tests, MT_Disconnect, "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
 int
 main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -68,32 +68,32 @@ main (int argc, char* argv[])
 
 void
 deactivate_servant (PortableServer::Servant servant
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
           int use_callbacks
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
 {
   TAO_CEC_EventChannel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
 
   TAO_CEC_EventChannel ec_impl (attributes);
-  ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Task task (event_channel.in (), use_callbacks);
@@ -106,10 +106,10 @@ run_test (PortableServer::POA_ptr poa,
   // Wait for all the threads to complete and the return
   ACE_Thread_Manager::instance ()->wait ();
 
-  event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER);
+  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -128,7 +128,7 @@ Task::svc ()
     {
       ACE_TRY_NEW_ENV
         {
-          this->run_iteration (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->run_iteration (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -141,16 +141,16 @@ Task::svc ()
 }
 
 void
-Task::run_iteration (TAO_ENV_SINGLE_ARG_DECL)
+Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Obtain the consumer admin..
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // and the supplier admin..
   CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
@@ -165,37 +165,37 @@ Task::run_iteration (TAO_ENV_SINGLE_ARG_DECL)
   for (int i = 0; i != iterations; ++i)
     {
       supplier_0.connect (supplier_admin.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       consumer_0.connect (consumer_admin.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
           supplier_1.connect (supplier_admin.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           consumer_1.connect (consumer_admin.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
-      supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
-          consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
-          supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 
-  deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER);
+  deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER);
+  deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count_0 = 0;
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
index 10ad1725717..06a263e9178 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
@@ -34,7 +34,7 @@ public:
   // = Check the ACE_Task_Base documentation.
   int svc (void);
 
-  void run_iteration (TAO_ENV_SINGLE_ARG_DECL);
+  void run_iteration (ACE_ENV_SINGLE_ARG_DECL);
   // Run a single iteration of the test
 
 private:
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index bce8e4efbc6..9f117d025b3 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -12,24 +12,24 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
@@ -38,23 +38,23 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_CEC_EventChannel ec_impl (attributes);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -64,7 +64,7 @@ main (int argc, char* argv[])
       CEC_Counting_Supplier supplier_00;
 
       supplier_00.connect (supplier_admin.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -72,7 +72,7 @@ main (int argc, char* argv[])
       CEC_Counting_Supplier supplier_01;
 
       supplier_01.connect (supplier_admin.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -80,7 +80,7 @@ main (int argc, char* argv[])
       CEC_Pull_Counting_Supplier supplier_10;
 
       supplier_10.connect (supplier_admin.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -88,7 +88,7 @@ main (int argc, char* argv[])
       CEC_Pull_Counting_Supplier supplier_11;
 
       supplier_11.connect (supplier_admin.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -97,21 +97,21 @@ main (int argc, char* argv[])
       // connnect to the event channel....
       CEC_Counting_Consumer consumer_00 ("Consumer/00");
       consumer_00.connect (consumer_admin.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       CEC_Pull_Counting_Consumer consumer_01 ("Consumer/01");
       consumer_01.connect (consumer_admin.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       CEC_Pull_Counting_Consumer consumer_10 ("Consumer/10");
       consumer_10.connect (consumer_admin.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -171,35 +171,35 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_10.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      consumer_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier_11.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_11.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_10.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index cb46f224cc6..f4fffebd1ad 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -12,24 +12,24 @@ main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
@@ -38,23 +38,23 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_CEC_EventChannel ec_impl (attributes);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -64,7 +64,7 @@ main (int argc, char* argv[])
       CEC_Counting_Supplier supplier_00;
 
       supplier_00.connect (supplier_admin.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -72,7 +72,7 @@ main (int argc, char* argv[])
       CEC_Counting_Supplier supplier_01;
 
       supplier_01.connect (supplier_admin.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -80,7 +80,7 @@ main (int argc, char* argv[])
       CEC_Counting_Supplier supplier_10;
 
       supplier_10.connect (supplier_admin.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -88,7 +88,7 @@ main (int argc, char* argv[])
       CEC_Counting_Supplier supplier_11;
 
       supplier_11.connect (supplier_admin.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -97,14 +97,14 @@ main (int argc, char* argv[])
       // connnect to the event channel....
       CEC_Counting_Consumer consumer_00 ("Consumer/00");
       consumer_00.connect (consumer_admin.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       CEC_Counting_Consumer consumer_01 ("Consumer/01");
       consumer_01.connect (consumer_admin.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -144,32 +144,32 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier_11.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_11.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_10.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 7c3f444bf1d..ec6ffd9effb 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -18,15 +18,15 @@ main (int argc, char* argv[])
 
 void
 deactivate_servant (PortableServer::Servant servant
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -42,11 +42,11 @@ RND_Driver::RND_Driver (void)
 int
 RND_Driver::run (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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;
 
       // ****************************************************************
@@ -103,15 +103,15 @@ RND_Driver::run (int argc, char *argv[])
       // ****************************************************************
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
@@ -122,29 +122,29 @@ RND_Driver::run (int argc, char *argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_CEC_EventChannel ec_impl (attributes);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       this->consumer_admin_ =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       this->supplier_admin_ =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       this->supplier_.connect (this->supplier_admin_.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -159,7 +159,7 @@ RND_Driver::run (int argc, char *argv[])
                           1);
 
           CORBA::Object_var obj =
-            this->consumers_[i]->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->consumers_[i]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -176,7 +176,7 @@ RND_Driver::run (int argc, char *argv[])
           this->suppliers_[j]->activate ();
 
           CORBA::Object_var obj =
-            this->suppliers_[j]->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->suppliers_[j]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -186,7 +186,7 @@ RND_Driver::run (int argc, char *argv[])
         {
           ACE_Time_Value tv (0, 50000);
           orb->run (tv);
-          this->supplier_.push_new_event (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->supplier_.push_new_event (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -198,9 +198,9 @@ RND_Driver::run (int argc, char *argv[])
         for (int k = 0; k != this->nsuppliers_; ++k)
           {
             deactivate_servant (this->suppliers_[k]
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->suppliers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->suppliers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
         delete[] this->suppliers_;
@@ -211,7 +211,7 @@ RND_Driver::run (int argc, char *argv[])
 
       // We destroy now to verify that the callbacks work and do not
       // produce any problems.
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -220,9 +220,9 @@ RND_Driver::run (int argc, char *argv[])
         for (int k = 0; k != this->nconsumers_; ++k)
           {
             deactivate_servant (this->consumers_[k]
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->consumers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->consumers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
         delete[] this->consumers_;
@@ -232,17 +232,17 @@ RND_Driver::run (int argc, char *argv[])
       // ****************************************************************
 
       deactivate_servant (&ec_impl
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 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
@@ -256,7 +256,7 @@ RND_Driver::run (int argc, char *argv[])
 
 void
 RND_Driver::timer (const CORBA::Any &e
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   int r = ACE_OS::rand ();
   if (r < 0)
@@ -277,7 +277,7 @@ RND_Driver::timer (const CORBA::Any &e
             CORBA::Any new_event;
             recursion++;
             new_event <<= recursion;
-            this->supplier_.push (new_event TAO_ENV_ARG_PARAMETER);
+            this->supplier_.push (new_event ACE_ENV_ARG_PARAMETER);
             ACE_CHECK;
           }
       }
@@ -298,7 +298,7 @@ RND_Driver::timer (const CORBA::Any &e
         // ACE_DEBUG ((LM_DEBUG, "Connecting supplier %d\n", n));
 
         this->suppliers_[n]->connect (this->supplier_admin_.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -310,7 +310,7 @@ RND_Driver::timer (const CORBA::Any &e
         // ACE_DEBUG ((LM_DEBUG, "Connecting consumer %d\n", n));
 
         this->consumers_[n]->connect (this->consumer_admin_.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -321,7 +321,7 @@ RND_Driver::timer (const CORBA::Any &e
 
         // ACE_DEBUG ((LM_DEBUG, "Disconnecting supplier %d\n", n));
 
-        this->suppliers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->suppliers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -332,7 +332,7 @@ RND_Driver::timer (const CORBA::Any &e
 
         // ACE_DEBUG ((LM_DEBUG, "Disconnecting consumer %d\n", n));
 
-        this->consumers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->consumers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -341,16 +341,16 @@ RND_Driver::timer (const CORBA::Any &e
 
 void
 RND_Driver::event (const CORBA::Any &e
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
-  this->timer (e TAO_ENV_ARG_PARAMETER);
+  this->timer (e ACE_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
 
 void
 RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   CosEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -358,28 +358,28 @@ RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin
 
     if (CORBA::is_nil (this->proxy_.in ()))
       {
-        this->proxy_ = admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->proxy_ = admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
     proxy =
       CosEventChannelAdmin::ProxyPushSupplier::_duplicate(this->proxy_.in ());
   }
   CosEventComm::PushConsumer_var me =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   proxy->connect_push_consumer (me.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RND_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+RND_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (CORBA::is_nil (this->proxy_.in ()))
     return;
-  this->proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->proxy_ =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -387,14 +387,14 @@ RND_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 RND_Consumer::push (const CORBA::Any &event
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->event (event TAO_ENV_ARG_PARAMETER);
+  this->driver_->event (event ACE_ENV_ARG_PARAMETER);
 }
 
 void
-RND_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+RND_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -403,7 +403,7 @@ RND_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   CosEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -411,7 +411,7 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
 
     if (CORBA::is_nil (this->proxy_.in ()))
       {
-        this->proxy_ = admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->proxy_ = admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
 
@@ -423,40 +423,40 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
   int r = ACE_OS::rand () % 2;
   if (r == 0)
     {
-      me = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      me = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   proxy->connect_push_supplier (me.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RND_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+RND_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (CORBA::is_nil (this->proxy_.in ()))
     return;
-  this->proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->proxy_ =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-RND_Supplier::push_new_event (TAO_ENV_SINGLE_ARG_DECL)
+RND_Supplier::push_new_event (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Any event;
   CORBA::Long recursion = 0;
   event <<= recursion;
 
-  this->push (event TAO_ENV_ARG_PARAMETER);
+  this->push (event ACE_ENV_ARG_PARAMETER);
 }
 
 void
 RND_Supplier::push (CORBA::Any &event
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   CosEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -469,11 +469,11 @@ RND_Supplier::push (CORBA::Any &event
       CosEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ());
   }
 
-  proxy->push (event TAO_ENV_ARG_PARAMETER);
+  proxy->push (event ACE_ENV_ARG_PARAMETER);
 }
 
 void
-RND_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+RND_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -486,13 +486,13 @@ RND_Supplier::svc (void)
   int niterations = 5000;
   for (int i = 0; i != niterations; ++i)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
           ACE_Time_Value tv (0, 10000);
           ACE_OS::sleep (tv);
 
-          this->push_new_event (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->push_new_event (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
index d2ee42666bb..450fe418668 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
@@ -48,14 +48,14 @@ public:
   // Constructor
 
   void push (const CORBA::Any &event
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin
-                TAO_ENV_ARG_DECL);
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+                ACE_ENV_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
   RND_Driver *driver_;
@@ -82,7 +82,7 @@ public:
   RND_Timer (RND_Driver *driver);
 
   void push (const CORBA::Any &event
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -109,15 +109,15 @@ public:
   // Constructor
 
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin
-                TAO_ENV_ARG_DECL);
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+                ACE_ENV_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
-  void push_new_event (TAO_ENV_SINGLE_ARG_DECL);
+  void push_new_event (ACE_ENV_SINGLE_ARG_DECL);
   void push (CORBA::Any &event
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Push a single event...
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual int svc (void);
@@ -147,11 +147,11 @@ public:
   // Run the test
 
   void timer (const CORBA::Any &e
-              TAO_ENV_ARG_DECL);
+              ACE_ENV_ARG_DECL);
   // The main timer has expired
 
   void event (const CORBA::Any &e
-              TAO_ENV_ARG_DECL);
+              ACE_ENV_ARG_DECL);
   // One of the consumers has received an event
 
 private:
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index fa56d3cc978..b69af879380 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -9,47 +9,47 @@ ACE_RCSID(CEC_Tests_Basic, Shutdown, "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
                       int with_callbacks
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
 int
 main (int argc, char* argv[])
 {
   TAO_CEC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 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
@@ -63,45 +63,45 @@ main (int argc, char* argv[])
 
 void
 deactivate_servant (PortableServer::Servant servant
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 static void
 run_test (PortableServer::POA_ptr poa,
           int with_callbacks
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
 {
   TAO_CEC_EventChannel_Attributes attributes (poa,
                                               poa);
   attributes.disconnect_callbacks = with_callbacks;
 
   TAO_CEC_EventChannel ec_impl (attributes);
-  ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
 
   // Obtain the consumer admin..
   CosEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Obtain the supplier admin..
   CosEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
@@ -126,10 +126,10 @@ run_test (PortableServer::POA_ptr poa,
 
   for (i = 0; i != n; ++i)
     {
-      consumer[i]->connect (consumer_admin.in () TAO_ENV_ARG_PARAMETER);
+      consumer[i]->connect (consumer_admin.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      supplier[i]->connect (supplier_admin.in () TAO_ENV_ARG_PARAMETER);
+      supplier[i]->connect (supplier_admin.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -137,7 +137,7 @@ run_test (PortableServer::POA_ptr poa,
 
   // Destroy the event channel, *before* disconnecting the
   // clients.
-  event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
@@ -163,18 +163,18 @@ run_test (PortableServer::POA_ptr poa,
 
   for (i = 0; i != n; ++i)
     {
-      deactivate_servant (supplier[i] TAO_ENV_ARG_PARAMETER);
+      deactivate_servant (supplier[i] ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       delete supplier[i];
 
-      deactivate_servant (consumer[i] TAO_ENV_ARG_PARAMETER);
+      deactivate_servant (consumer[i] ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       delete consumer[i];
     }
   delete[] supplier;
   delete[] consumer;
 
-  deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER);
+  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
index 997b18880c4..6f870422a1e 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp
@@ -13,42 +13,42 @@ CEC_Counting_Consumer::CEC_Counting_Consumer (const char* name)
 
 void
 CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   // The canonical protocol to connect to the EC
 
   CosEventComm::PushConsumer_var consumer =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_ =
-        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->supplier_proxy_->connect_push_consumer (consumer.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CEC_Counting_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   PortableServer::POA_var consumer_poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER);
+  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -77,7 +77,7 @@ CEC_Counting_Consumer::dump_results (int expected_count, int tolerance)
 
 void
 CEC_Counting_Consumer::push (const CORBA::Any&
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->event_count ++;
@@ -93,7 +93,7 @@ CEC_Counting_Consumer::push (const CORBA::Any&
 }
 
 void
-CEC_Counting_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Counting_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -112,42 +112,42 @@ CEC_Pull_Counting_Consumer::CEC_Pull_Counting_Consumer (const char* name)
 
 void
 CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   // The canonical protocol to connect to the EC
 
   CosEventComm::PullConsumer_var consumer =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_ =
-        consumer_admin->obtain_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+        consumer_admin->obtain_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->supplier_proxy_->connect_pull_consumer (consumer.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->supplier_proxy_->disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   PortableServer::POA_var consumer_poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER);
+  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -155,19 +155,19 @@ CEC_Pull_Counting_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Consumer::pull (TAO_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Consumer::pull (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       return 0;
     }
   this->event_count++;
-  return this->supplier_proxy_->pull (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->supplier_proxy_->pull (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Any*
 CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
@@ -176,7 +176,7 @@ CEC_Pull_Counting_Consumer::try_pull (CORBA::Boolean_out has_event
     }
 
   CORBA::Any_var event =
-    this->supplier_proxy_->try_pull (has_event TAO_ENV_ARG_PARAMETER);
+    this->supplier_proxy_->try_pull (has_event ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (has_event)
@@ -206,7 +206,7 @@ CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance)
 }
 
 void
-CEC_Pull_Counting_Consumer::disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Pull_Counting_Consumer::disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -231,7 +231,7 @@ CEC_Counting_Consumer_Task::svc ()
 {
   ACE_TRY_NEW_ENV
     {
-      this->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -256,7 +256,7 @@ CEC_Counting_Consumer_Task::pull_count (void)
 }
 
 void
-CEC_Counting_Consumer_Task::run (TAO_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Consumer_Task::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
@@ -266,7 +266,7 @@ CEC_Counting_Consumer_Task::run (TAO_ENV_SINGLE_ARG_DECL)
     CORBA::Boolean has_event;
     CORBA::Any_var event =
       this->consumer_->try_pull (has_event
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (this->milliseconds_ != 0)
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index 2d6d5f671e2..d3ec2cbbb33 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -40,8 +40,8 @@ public:
   // Constructor
 
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL);
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+                ACE_ENV_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Simple connect/disconnect methods..
 
   void dump_results (int expected_count, int tolerance);
@@ -51,9 +51,9 @@ public:
   // = The CosEventComm::PushConsumer methods
 
   virtual void push (const CORBA::Any& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -86,20 +86,20 @@ public:
   // Constructor
 
   void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL);
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+                ACE_ENV_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Simple connect/disconnect methods..
 
   void dump_results (int expected_count, int tolerance);
   // Print out an error message if the event count is too far from the
   // expected count.
 
-  CORBA::Any *pull (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Any *pull (ACE_ENV_SINGLE_ARG_DECL);
   CORBA::Any *try_pull (CORBA::Boolean_out has_event
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
   // = The CosEventComm::PullConsumer methods
-  virtual void disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -132,7 +132,7 @@ public:
   void stop (void);
   CORBA::ULong pull_count (void);
 
-  void run (TAO_ENV_SINGLE_ARG_DECL);
+  void run (ACE_ENV_SINGLE_ARG_DECL);
   // Run a single iteration of the test
 
 private:
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
index 80f15496418..7a88b4bf868 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp
@@ -13,40 +13,40 @@ CEC_Counting_Supplier::CEC_Counting_Supplier (void)
 void
 CEC_Counting_Supplier::connect (
     CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   CosEventComm::PushSupplier_var supplier =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     {
       this->consumer_proxy_ =
-        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->consumer_proxy_->connect_push_supplier (supplier.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CEC_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
-      this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   PortableServer::POA_var supplier_poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER);
+  supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -55,7 +55,7 @@ CEC_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 CEC_Counting_Supplier::push (const CORBA::Any&
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -64,13 +64,13 @@ CEC_Counting_Supplier::push (const CORBA::Any&
   CORBA::Any event;
   event <<= CORBA::Long(0);
 
-  this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->event_count++;
 }
 
 void
-CEC_Counting_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Counting_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -95,7 +95,7 @@ CEC_Counting_Supplier_Task::svc ()
 {
   ACE_TRY_NEW_ENV
     {
-      this->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -120,14 +120,14 @@ CEC_Counting_Supplier_Task::push_count (void)
 }
 
 void
-CEC_Counting_Supplier_Task::run (TAO_ENV_SINGLE_ARG_DECL)
+CEC_Counting_Supplier_Task::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Any event;
   event <<= CORBA::Long(0);
 
   int stop = 0;
   do {
-    this->supplier_->push (event TAO_ENV_ARG_PARAMETER);
+    this->supplier_->push (event ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (this->milliseconds_ != 0)
@@ -160,40 +160,40 @@ CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier (void)
 void
 CEC_Pull_Counting_Supplier::connect (
     CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   CosEventComm::PullSupplier_var supplier =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     {
       this->consumer_proxy_ =
-        supplier_admin->obtain_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+        supplier_admin->obtain_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->consumer_proxy_->connect_pull_supplier (supplier.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CEC_Pull_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
-      this->consumer_proxy_->disconnect_pull_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumer_proxy_->disconnect_pull_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   PortableServer::POA_var supplier_poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER);
+  supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -201,7 +201,7 @@ CEC_Pull_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any*
-CEC_Pull_Counting_Supplier::pull (TAO_ENV_SINGLE_ARG_DECL)
+CEC_Pull_Counting_Supplier::pull (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -222,7 +222,7 @@ CEC_Pull_Counting_Supplier::pull (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Any*
 CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -247,7 +247,7 @@ CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event
 }
 
 void
-CEC_Pull_Counting_Supplier::disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CEC_Pull_Counting_Supplier::disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index 41fd430d1e3..5f557db27ee 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -42,16 +42,16 @@ public:
   // = The CosEventComm::PushSupplier methods
 
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                TAO_ENV_ARG_DECL);
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+                ACE_ENV_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Simple connect/disconnect methods..
 
   void push (const CORBA::Any& events
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Push an event.
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -79,7 +79,7 @@ public:
   void stop (void);
   CORBA::ULong push_count (void);
 
-  void run (TAO_ENV_SINGLE_ARG_DECL);
+  void run (ACE_ENV_SINGLE_ARG_DECL);
   // Run a single iteration of the test
 
 private:
@@ -116,17 +116,17 @@ public:
   // = The CosEventComm::PullSupplier methods
 
   void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin
-                TAO_ENV_ARG_DECL);
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+                ACE_ENV_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Simple connect/disconnect methods..
 
   // The PullSupplier methods.
-  CORBA::Any* pull (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::Any* pull (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
   CORBA::Any* try_pull (CORBA::Boolean_out has_event
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,CosEventComm::Disconnected));
-  virtual void disconnect_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_pull_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong event_count;
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index b48029fdcff..7a9916086f9 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -41,15 +41,15 @@ Driver::Driver (void)
 int
 Driver::run (int argc, char* argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -58,11 +58,11 @@ Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (this->parse_args (argc, argv))
@@ -119,7 +119,7 @@ Driver::run (int argc, char* argv[])
 
       CORBA::Object_var naming_obj =
         orb->resolve_initial_references ("NameService"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -128,7 +128,7 @@ Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name name (1);
@@ -136,7 +136,7 @@ Driver::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name TAO_ENV_ARG_PARAMETER);
+        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var channel;
@@ -144,27 +144,27 @@ Driver::run (int argc, char* argv[])
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
         channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.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;
 
-      this->connect_consumers (channel.in () TAO_ENV_ARG_PARAMETER);
+      this->connect_consumers (channel.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
 
       ACE_DEBUG ((LM_DEBUG, "running the test\n"));
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sys_ex)
@@ -183,7 +183,7 @@ void
 Driver::push_consumer (void* /* consumer_cookie */,
                        ACE_hrtime_t /* arrival */,
                        const RtecEventComm::EventSet& events
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
 {
   // int ID =
   //   (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
@@ -274,7 +274,7 @@ Driver::push_consumer (void* /* consumer_cookie */,
 
 void
 Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
@@ -287,17 +287,17 @@ Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel
       this->consumers_[i]->connect (this->event_a_,
                                     this->event_b_,
                                     channel
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Driver::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
+Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -382,7 +382,7 @@ void
 Test_Consumer::connect (int event_a,
                         int event_b,
                         RtecEventChannelAdmin::EventChannel_ptr ec
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
@@ -392,25 +392,25 @@ Test_Consumer::connect (int event_a,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  RtecEventComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
                                                 qos.get_ConsumerQOS ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
 
 void
-Test_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Test_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
@@ -418,20 +418,20 @@ Test_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
     this->supplier_proxy_._retn ();
 
-  proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->driver_->push_consumer (this->cookie_, arrival, events TAO_ENV_ARG_PARAMETER);
+  this->driver_->push_consumer (this->cookie_, arrival, events ACE_ENV_ARG_PARAMETER);
 }
 
 void
-Test_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index 3a5df9b97b2..41a90adaf34 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -35,16 +35,16 @@ public:
   void connect (int event_a,
                 int event_b,
                 RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
   // This method connects the consumer to the EC.
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -81,7 +81,7 @@ public:
   void push_consumer (void* consumer_cookie,
                       ACE_hrtime_t arrival,
                       const RtecEventComm::EventSet& events
-                      TAO_ENV_ARG_DECL_NOT_USED);
+                      ACE_ENV_ARG_DECL_NOT_USED);
   // Callback method for consumers, if any of our consumers has
   // received events it will invoke this method.
 
@@ -90,8 +90,8 @@ private:
   // parse the command line args
 
   void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          TAO_ENV_ARG_DECL);
-  void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
+  void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
   // Connect and disconnect the consumers.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index e1c50294c76..6205748d9f2 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -36,15 +36,15 @@ ECMS_Driver::ECMS_Driver (void)
 int
 ECMS_Driver::run (int argc, char* argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -52,11 +52,11 @@ ECMS_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (this->parse_args (argc, argv))
@@ -116,7 +116,7 @@ ECMS_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -124,7 +124,7 @@ ECMS_Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name name (1);
@@ -132,7 +132,7 @@ ECMS_Driver::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name TAO_ENV_ARG_PARAMETER);
+        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var channel;
@@ -140,18 +140,18 @@ ECMS_Driver::run (int argc, char* argv[])
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
         channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.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;
 
-      this->connect_suppliers (channel.in () TAO_ENV_ARG_PARAMETER);
+      this->connect_suppliers (channel.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
-      this->activate_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->activate_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
@@ -165,7 +165,7 @@ ECMS_Driver::run (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "suppliers finished\n"));
 
-      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // @@ Deactivate the suppliers (as CORBA Objects?)
@@ -186,7 +186,7 @@ int
 ECMS_Driver::supplier_task (Test_Supplier *supplier,
                             void* /* cookie */)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       ACE_Time_Value tv (0, this->event_period_);
@@ -258,7 +258,7 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier,
           // in just one memory allocation;
           event[0].data.payload.replace (mblen, mb);
 
-          supplier->consumer_proxy ()->push(event TAO_ENV_ARG_PARAMETER);
+          supplier->consumer_proxy ()->push(event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
@@ -280,7 +280,7 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier,
 
 void
 ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -293,13 +293,13 @@ ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel
                                     this->event_a_,
                                     this->event_b_,
                                     channel
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECMS_Driver::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECMS_Driver::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -308,11 +308,11 @@ ECMS_Driver::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-ECMS_Driver::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+ECMS_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -417,7 +417,7 @@ Test_Supplier::connect (const char* name,
                         int event_a,
                         int event_b,
                         RtecEventChannelAdmin::EventChannel_ptr ec
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG,
@@ -437,25 +437,25 @@ Test_Supplier::connect (const char* name,
               0, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushSupplier_var objref =
-    this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
                                                 qos.get_SupplierQOS ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Test_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Test_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -465,7 +465,7 @@ Test_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
@@ -492,7 +492,7 @@ Test_Supplier::svc ()
 }
 
 void
-Test_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->consumer_proxy_ =
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index 6d66ed280a7..10b3adb9270 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -40,13 +40,13 @@ public:
                 int event_a,
                 int event_b,
                 RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
   // This method connects the supplier to the EC.
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The methods in the skeleton.
 
@@ -100,7 +100,7 @@ public:
   void push_supplier (void* supplier_cookie,
                       RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
                       const RtecEventComm::EventSet &events
-                      TAO_ENV_ARG_DECL_NOT_USED);
+                      ACE_ENV_ARG_DECL_NOT_USED);
   // Callback method for suppliers, we push for them to their
   // consumers and take statistics on the way.
   // It is possible that we ignore the <consumer> parameter when
@@ -111,11 +111,11 @@ private:
   // parse the command line args
 
   void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          TAO_ENV_ARG_DECL);
-  void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
+  void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
   // Connect the suppliers.
 
-  void activate_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+  void activate_suppliers (ACE_ENV_SINGLE_ARG_DECL);
   // Activate the suppliers, i.e. they start generating events.
 
 private:
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index f8673a5ec88..2a1fb10d802 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -41,16 +41,16 @@ ECM_Driver::ECM_Driver (void)
 int
 ECM_Driver::run (int argc, char* argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references("RootPOA"
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -59,11 +59,11 @@ ECM_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (this->parse_args (argc, argv))
@@ -137,43 +137,43 @@ ECM_Driver::run (int argc, char* argv[])
 
       // Register Event_Service with the Naming Service.
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        this->orb_->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: local EC objref ready\n"));
 
       this->open_federations (ec.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_federations done\n"));
 
       this->open_senders (ec.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_senders done\n"));
 
       this->open_receivers (ec.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_receivers done\n"));
 
       this->activate_federations (ec.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate_federations done\n"));
@@ -184,17 +184,17 @@ ECM_Driver::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->close_receivers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->close_receivers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      this->close_senders (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->close_senders (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->close_federations (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->close_federations (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown the EC\n"));
 
-      ec_impl.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -212,7 +212,7 @@ ECM_Driver::run (int argc, char* argv[])
 
 void
 ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, "Federation <%s> shuting down\n",
               federation->name ()));
@@ -222,19 +222,19 @@ ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation
 
 void
 ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->open (this->event_count_,
-                                         ec TAO_ENV_ARG_PARAMETER);
+                                         ec ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   this->federations_running_ = this->local_federations_count_;
   RtecEventComm::Time interval = this->event_period_;
@@ -243,24 +243,24 @@ ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec
     {
       this->local_federations_[i]->activate (ec,
                                              interval
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECM_Driver::close_federations (TAO_ENV_SINGLE_ARG_DECL)
+ECM_Driver::close_federations (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->local_federations_[i]->close (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   if (this->endpoint_.dgram ().open (ACE_Addr::sap_any) == -1)
     {
@@ -278,17 +278,17 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec
     {
       this->all_federations_[i]->open (&this->endpoint_,
                                        ec
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECM_Driver::close_senders (TAO_ENV_SINGLE_ARG_DECL)
+ECM_Driver::close_senders (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->all_federations_count_; ++i)
     {
-      this->all_federations_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->all_federations_[i]->close (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   this->endpoint_.dgram ().close ();
@@ -296,23 +296,23 @@ ECM_Driver::close_senders (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->open_receiver (ec,
                                                   &this->endpoint_
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECM_Driver::close_receivers (TAO_ENV_SINGLE_ARG_DECL)
+ECM_Driver::close_receivers (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->close_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->local_federations_[i]->close_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -594,16 +594,16 @@ ECM_Federation::~ECM_Federation (void)
 void
 ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
                       RtecEventChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   RtecUDPAdmin::AddrServer_var addr_server =
-    this->addr_server (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->addr_server (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->sender_.init (ec,
                       addr_server.in (),
                       endpoint
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ TODO Make this a parameter....
@@ -622,23 +622,23 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
       qos.insert_type (this->consumer_ipaddr (i), 0);
     }
   RtecEventChannelAdmin::ConsumerQOS qos_copy = qos.get_ConsumerQOS ();
-  this->sender_.open (qos_copy TAO_ENV_ARG_PARAMETER);
+  this->sender_.open (qos_copy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECM_Federation::close (TAO_ENV_SINGLE_ARG_DECL)
+ECM_Federation::close (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->sender_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->sender_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->sender_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->sender_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 RtecUDPAdmin::AddrServer_ptr
-ECM_Federation::addr_server (TAO_ENV_SINGLE_ARG_DECL)
+ECM_Federation::addr_server (ACE_ENV_SINGLE_ARG_DECL)
 {
-  return this->addr_server_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->addr_server_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -652,7 +652,7 @@ ECM_Supplier::ECM_Supplier (ECM_Local_Federation* federation)
 void
 ECM_Supplier::open (const char* name,
                     RtecEventChannelAdmin::EventChannel_ptr ec
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
@@ -670,29 +670,29 @@ ECM_Supplier::open (const char* name,
               0, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  RtecEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  RtecEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
                                                 qos.get_SupplierQOS ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECM_Supplier::close (TAO_ENV_SINGLE_ARG_DECL)
+ECM_Supplier::close (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ = 0;
@@ -701,7 +701,7 @@ ECM_Supplier::close (TAO_ENV_SINGLE_ARG_DECL)
 void
 ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
                         RtecEventComm::Time interval
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   ACE_ConsumerQOS_Factory consumer_qos;
   consumer_qos.start_disjunction_group ();
@@ -711,20 +711,20 @@ ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushConsumer_var cref =
-    this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->consumer_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (cref.in (),
                                                 consumer_qos.get_ConsumerQOS ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -736,7 +736,7 @@ ECM_Supplier::supplier_id (void) const
 
 void
 ECM_Supplier::push (const RtecEventComm::EventSet& events
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   for (u_int i = 0; i < events.length (); ++i)
     {
@@ -745,20 +745,20 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events
         continue;
 
       this->federation_->supplier_timeout (this->consumer_proxy_.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECM_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECM_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  // this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-ECM_Supplier::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECM_Supplier::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
@@ -775,7 +775,7 @@ void
 ECM_Consumer::open (const char*,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
                     ACE_RANDR_TYPE &seed
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -784,21 +784,21 @@ ECM_Consumer::open (const char*,
   ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
 
   // = Connect as a consumer.
-  this->consumer_admin_ = ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_admin_ = ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->connect (seed TAO_ENV_ARG_PARAMETER);
+  this->connect (seed ACE_ENV_ARG_PARAMETER);
 }
 
 void
 ECM_Consumer::connect (ACE_RANDR_TYPE &seed
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->consumer_admin_->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ConsumerQOS_Factory qos;
@@ -825,17 +825,17 @@ ECM_Consumer::connect (ACE_RANDR_TYPE &seed
       qos.insert_type (federation->consumer_ipaddr (i), 0);
     }
 
-  RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  RtecEventComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
                                                 qos.get_ConsumerQOS ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECM_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+ECM_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
@@ -844,16 +844,16 @@ ECM_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   RtecEventChannelAdmin::ProxyPushSupplier_var tmp =
     this->supplier_proxy_._retn ();
-  tmp->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  tmp->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-ECM_Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
+ECM_Consumer::close (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
-      this->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->consumer_admin_ =
         RtecEventChannelAdmin::ConsumerAdmin::_nil ();
@@ -869,15 +869,15 @@ ECM_Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 ECM_Consumer::push (const RtecEventComm::EventSet& events
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->federation_->consumer_push (arrival, events TAO_ENV_ARG_PARAMETER);
+  this->federation_->consumer_push (arrival, events ACE_ENV_ARG_PARAMETER);
 }
 
 void
-ECM_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECM_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -914,7 +914,7 @@ ECM_Local_Federation::~ECM_Local_Federation (void)
 void
 ECM_Local_Federation::open (int event_count,
                             RtecEventChannelAdmin::EventChannel_ptr ec
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   this->event_count_ = event_count;
 
@@ -923,38 +923,38 @@ ECM_Local_Federation::open (int event_count,
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/supplier");
 
-  this->supplier_.open (buf, ec TAO_ENV_ARG_PARAMETER);
+  this->supplier_.open (buf, ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/consumer");
-  this->consumer_.open (buf, ec, this->seed_ TAO_ENV_ARG_PARAMETER);
+  this->consumer_.open (buf, ec, this->seed_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->last_subscription_change_ = ACE_OS::gettimeofday ();
 }
 
 void
-ECM_Local_Federation::close (TAO_ENV_SINGLE_ARG_DECL)
+ECM_Local_Federation::close (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->consumer_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->supplier_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 ECM_Local_Federation::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
                                 RtecEventComm::Time interval
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
-  this->supplier_.activate (ec, interval TAO_ENV_ARG_PARAMETER);
+  this->supplier_.activate (ec, interval ACE_ENV_ARG_PARAMETER);
 }
 
 void
 ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   RtecEventComm::EventSet sent (1);
   sent.length (1);
@@ -973,14 +973,14 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
 
   if (this->event_count_ < 0)
     {
-      this->driver_->federation_has_shutdown (this TAO_ENV_ARG_PARAMETER);
+      this->driver_->federation_has_shutdown (this ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       return;
     }
   int i = this->event_count_ % this->federation_->supplier_types ();
   s.header.type = this->federation_->supplier_ipaddr (i);
 
-  consumer->push (sent TAO_ENV_ARG_PARAMETER);
+  consumer->push (sent ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->send_count_++;
@@ -997,9 +997,9 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
       ACE_DEBUG ((LM_DEBUG,
                   "Reconfiguring federation %s: %f %f [%d]\n",
                   this->name (), p, maxp, x));
-      this->consumer_.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumer_.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->consumer_.connect (this->seed_ TAO_ENV_ARG_PARAMETER);
+      this->consumer_.connect (this->seed_ ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       this->last_subscription_change_ = ACE_OS::gettimeofday ();
     }
@@ -1008,7 +1008,7 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
 void
 ECM_Local_Federation::consumer_push (ACE_hrtime_t,
                                      const RtecEventComm::EventSet &event
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (event.length () == 0)
     {
@@ -1040,10 +1040,10 @@ ECM_Local_Federation::consumer_push (ACE_hrtime_t,
 void
 ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
                                      TAO_ECG_UDP_Out_Endpoint* ignore_from
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   RtecUDPAdmin::AddrServer_var addr_server =
-    this->federation_->addr_server (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->federation_->addr_server (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_Reactor* reactor = TAO_ORB_Core_instance ()->reactor ();
@@ -1057,7 +1057,7 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
                         reactor,
                         expire_interval,
                         max_timeouts
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const int bufsize = 512;
@@ -1069,7 +1069,7 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   this->mcast_eh_.reactor (reactor);
 
-  this->mcast_eh_.open (ec TAO_ENV_ARG_PARAMETER);
+  this->mcast_eh_.open (ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_SupplierQOS_Factory qos;
@@ -1082,20 +1082,20 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
 
   RtecEventChannelAdmin::SupplierQOS qos_copy =
     qos.get_SupplierQOS ();
-  this->receiver_.open (qos_copy TAO_ENV_ARG_PARAMETER);
+  this->receiver_.open (qos_copy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 
 }
 
 void
-ECM_Local_Federation::close_receiver (TAO_ENV_SINGLE_ARG_DECL)
+ECM_Local_Federation::close_receiver (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->receiver_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->receiver_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->receiver_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->receiver_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->mcast_eh_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->mcast_eh_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 2deaef26ab4..547afb93036 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -115,16 +115,16 @@ public:
 
   void open (TAO_ECG_UDP_Out_Endpoint *endoint,
              RtecEventChannelAdmin::EventChannel_ptr ec
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Connect the UDP sender to the EC.
 
-  void close (TAO_ENV_SINGLE_ARG_DECL);
+  void close (ACE_ENV_SINGLE_ARG_DECL);
   // Close the UDP sender, disconnect from the EC
 
   int sender_local_addr (ACE_INET_Addr& addr);
   // Return the sender local address
 
-  RtecUDPAdmin::AddrServer_ptr addr_server (TAO_ENV_SINGLE_ARG_DECL);
+  RtecUDPAdmin::AddrServer_ptr addr_server (ACE_ENV_SINGLE_ARG_DECL);
   // This address server can be used to convert event headers
   // (type,source) to UDP addresses (ipaddr,port)
 
@@ -168,27 +168,27 @@ public:
 
   void open (const char* name,
              RtecEventChannelAdmin::EventChannel_ptr event_channel
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // This method connects the supplier to the EC.
 
-  void close (TAO_ENV_SINGLE_ARG_DECL);
+  void close (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
   void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
                  RtecEventComm::Time interval
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
   // Connect as a consumer to start receiving events.
 
   RtecEventComm::EventSourceID supplier_id (void) const;
   // The supplier ID.
 
   void push (const RtecEventComm::EventSet& events
-             TAO_ENV_ARG_DECL);
-  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+             ACE_ENV_ARG_DECL);
+  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Implement the callbacks for our consumer personality.
 
   // = The POA_RtecEventComm::PushSupplier methods.
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -225,23 +225,23 @@ public:
   void open (const char* name,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
              ACE_RANDR_TYPE &seed
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // This method connects the consumer to the EC.
 
-  void close (TAO_ENV_SINGLE_ARG_DECL);
+  void close (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
   void connect (ACE_RANDR_TYPE& seed
-                TAO_ENV_ARG_DECL);
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+                ACE_ENV_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
   // = The POA_RtecEventComm::PushComsumer methods.
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -270,24 +270,24 @@ public:
 
   void open (int event_count,
              RtecEventChannelAdmin::EventChannel_ptr event_channel
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Connect both the supplier and the consumer.
 
-  void close (TAO_ENV_SINGLE_ARG_DECL);
+  void close (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect everybody from the EC
 
   void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
                  RtecEventComm::Time interval
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
   // Activate the supplier
 
   void supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   // The supplier is ready to send a new event.
 
   void consumer_push (ACE_hrtime_t arrival,
                       const RtecEventComm::EventSet& event
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   // The consumer just received an event.
 
   const ECM_Federation *federation (void) const;
@@ -295,10 +295,10 @@ public:
 
   void open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
                       TAO_ECG_UDP_Out_Endpoint* ignore_from
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   // Connect the UDP receiver to the EC.
 
-  void close_receiver (TAO_ENV_SINGLE_ARG_DECL);
+  void close_receiver (ACE_ENV_SINGLE_ARG_DECL);
   // Close the UDP receiver, disconnect from the EC
 
   void dump_results (void) const;
@@ -418,40 +418,40 @@ public:
   // Run the test, read all the configuration files, etc.
 
   void federation_has_shutdown (ECM_Local_Federation *federation
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
   // One of the federations has completed its simulation, once all of
   // them finish the test exists.
 
 
 private:
   void open_federations (RtecEventChannelAdmin::EventChannel_ptr ec
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   // Connect the federations to the EC.
 
   void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   // Activate all the federations
 
-  void close_federations (TAO_ENV_SINGLE_ARG_DECL);
+  void close_federations (ACE_ENV_SINGLE_ARG_DECL);
   // Close the federations, i.e. disconnect from the EC, deactivate
   // the objects, etc.
 
   void open_senders (RtecEventChannelAdmin::EventChannel_ptr ec
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   // Connect all the senders, so we can start multicasting events.
 
   void open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // Connect all the receivers, thus we accept events arriving through
   // multicast.
 
-  void close_senders (TAO_ENV_SINGLE_ARG_DECL);
+  void close_senders (ACE_ENV_SINGLE_ARG_DECL);
   // Close all the senders to cleanup resources.
 
-  void close_receivers (TAO_ENV_SINGLE_ARG_DECL);
+  void close_receivers (ACE_ENV_SINGLE_ARG_DECL);
   // Close all the receivers to cleanup resources.
 
-  int shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Called when the main thread.
 
   int parse_args (int argc, char* argv[]);
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index d7db5c3d7f9..ec6491c4da2 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -133,16 +133,16 @@ print_priority_info (const char *const name)
 int
 Test_ECG::run (int argc, char* argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA"
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -151,14 +151,14 @@ Test_ECG::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv))
@@ -260,7 +260,7 @@ Test_ECG::run (int argc, char* argv[])
       print_priority_info ("Test_ECG::run (Main after thr_setprio)");
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -269,7 +269,7 @@ Test_ECG::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       auto_ptr<POA_RtecScheduler::Scheduler> scheduler_impl;
@@ -291,7 +291,7 @@ Test_ECG::run (int argc, char* argv[])
           }
           if (scheduler_impl.get () == 0)
             return -1;
-          scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
 
@@ -314,7 +314,7 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+              scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else if (ACE_OS::strcmp (this->lcl_name_, "ECM2") == 0)
@@ -335,7 +335,7 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+              scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else if (ACE_OS::strcmp (this->lcl_name_, "ECM3") == 0)
@@ -356,7 +356,7 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+              scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
@@ -370,7 +370,7 @@ Test_ECG::run (int argc, char* argv[])
 
               if (scheduler_impl.get () == 0)
                 return -1;
-              scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+              scheduler = scheduler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           break;
@@ -393,7 +393,7 @@ Test_ECG::run (int argc, char* argv[])
         case Test_ECG::ss_runtime:
           {
             CORBA::String_var str =
-              orb->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER);
+              orb->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
             ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
                         str.in ()));
@@ -405,7 +405,7 @@ Test_ECG::run (int argc, char* argv[])
             CosNaming::Name schedule_name (1);
             schedule_name.length (1);
             schedule_name[0].id = CORBA::string_dup (buf);
-            naming_context->bind (schedule_name, scheduler.in () TAO_ENV_ARG_PARAMETER);
+            naming_context->bind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             if (ACE_Scheduler_Factory::use_config (naming_context.in (),
@@ -422,11 +422,11 @@ Test_ECG::run (int argc, char* argv[])
 
       // Register Event_Service with the Naming Service.
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::sleep (5);
@@ -438,7 +438,7 @@ Test_ECG::run (int argc, char* argv[])
       CosNaming::Name channel_name (1);
       channel_name.length (1);
       channel_name[0].id = CORBA::string_dup (buf);
-      naming_context->bind (channel_name, ec.in () TAO_ENV_ARG_PARAMETER);
+      naming_context->bind (channel_name, ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "waiting to start\n"));
@@ -447,7 +447,7 @@ Test_ECG::run (int argc, char* argv[])
 
       if (this->rmt_name_ != 0)
         {
-          orb->run (&tv TAO_ENV_ARG_PARAMETER);
+          orb->run (&tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -456,22 +456,22 @@ Test_ECG::run (int argc, char* argv[])
       RtecEventChannelAdmin::EventChannel_var local_ec =
         this->get_ec (naming_context.in (),
                       this->lcl_name_
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "located local EC\n"));
 
       for (int sd = 0; sd < this->supplier_disconnects_; ++sd)
         {
-          this->connect_suppliers (local_ec.in () TAO_ENV_ARG_PARAMETER);
+          this->connect_suppliers (local_ec.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_OS::sleep (5);
           ACE_DEBUG ((LM_DEBUG, "Supplier disconnection %d\n", sd));
         }
 
-      this->connect_suppliers (local_ec.in () TAO_ENV_ARG_PARAMETER);
+      this->connect_suppliers (local_ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier\n"));
@@ -480,13 +480,13 @@ Test_ECG::run (int argc, char* argv[])
       if (this->rmt_name_ != 0)
         {
           tv.set (5, 0);
-          orb->run (&tv TAO_ENV_ARG_PARAMETER);
+          orb->run (&tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           RtecEventChannelAdmin::EventChannel_var remote_ec =
             this->get_ec (naming_context.in (),
                           this->rmt_name_
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_DEBUG ((LM_DEBUG, "located remote EC\n"));
 
@@ -500,48 +500,48 @@ Test_ECG::run (int argc, char* argv[])
             }
           rsch_name[0].id = CORBA::string_dup (buf);
           CORBA::Object_var tmpobj =
-            naming_context->resolve (rsch_name TAO_ENV_ARG_PARAMETER);
+            naming_context->resolve (rsch_name ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           RtecScheduler::Scheduler_var remote_sch =
-            RtecScheduler::Scheduler::_narrow (tmpobj.in () TAO_ENV_ARG_PARAMETER);
+            RtecScheduler::Scheduler::_narrow (tmpobj.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->connect_ecg (local_ec.in (),
                              remote_ec.in (),
                              remote_sch.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "connected proxy\n"));
 
           tv.set (5, 0);
-          orb->run (&tv TAO_ENV_ARG_PARAMETER);
+          orb->run (&tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           RtecEventChannelAdmin::Observer_ptr observer =
-            this->ecg_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->ecg_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           observer_handle = ec_impl.append_observer (observer
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       for (int cd = 0; cd < this->consumer_disconnects_; ++cd)
         {
-          this->connect_consumers (local_ec.in () TAO_ENV_ARG_PARAMETER);
+          this->connect_consumers (local_ec.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_OS::sleep (5);
           ACE_DEBUG ((LM_DEBUG, "Consumer disconnection %d\n", cd));
         }
-      this->connect_consumers (local_ec.in () TAO_ENV_ARG_PARAMETER);
+      this->connect_consumers (local_ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer\n"));
 
-      this->activate_suppliers (local_ec.in () TAO_ENV_ARG_PARAMETER);
+      this->activate_suppliers (local_ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
@@ -560,7 +560,7 @@ Test_ECG::run (int argc, char* argv[])
 
       if (this->rmt_name_ != 0)
         {
-          ec_impl.remove_observer (observer_handle TAO_ENV_ARG_PARAMETER);
+          ec_impl.remove_observer (observer_handle ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -568,7 +568,7 @@ Test_ECG::run (int argc, char* argv[])
       ec_impl.activate ();
 
       ACE_DEBUG ((LM_DEBUG, "running the test\n"));
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->test_stop_ = ACE_OS::gethrtime ();
@@ -603,7 +603,7 @@ Test_ECG::run (int argc, char* argv[])
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out, configs_out, anomalies_out TAO_ENV_ARG_PARAMETER);
+             infos_out, configs_out, anomalies_out ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 #else  /* ! __SUNPRO_CC */
           ACE_Scheduler_Factory::server ()->compute_scheduling
@@ -612,7 +612,7 @@ Test_ECG::run (int argc, char* argv[])
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
              infos.out (), configs.out (), anomalies.out ()
-             TAO_ENV_ARG_PARAMETER);
+             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 #endif /* ! __SUNPRO_CC */
 
@@ -622,25 +622,25 @@ Test_ECG::run (int argc, char* argv[])
                                                 this->schedule_file_);
         }
 
-      naming_context->unbind (channel_name TAO_ENV_ARG_PARAMETER);
+      naming_context->unbind (channel_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->rmt_name_ != 0)
         {
-          this->ecg_.close (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->ecg_.close (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          this->ecg_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->ecg_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "shutdown grace period\n"));
       tv.set (5, 0);
-      orb->run (&tv TAO_ENV_ARG_PARAMETER);
+      orb->run (&tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sys_ex)
@@ -658,7 +658,7 @@ Test_ECG::run (int argc, char* argv[])
 RtecEventChannelAdmin::EventChannel_ptr
 Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
                   const char* process_name
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   const int bufsize = 512;
   char buf[bufsize];
@@ -670,28 +670,28 @@ Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context,
   channel_name[0].id = CORBA::string_dup (buf);
 
   CORBA::Object_var ec_ptr =
-    naming_context->resolve (channel_name TAO_ENV_ARG_PARAMETER);
+    naming_context->resolve (channel_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (RtecEventChannelAdmin::EventChannel::_nil ());
   if (CORBA::is_nil (ec_ptr.in ()))
     return RtecEventChannelAdmin::EventChannel::_nil ();
 
   return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
 }
 
 void
-Test_ECG::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+Test_ECG::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->hp_suppliers_ + this->lp_suppliers_; ++i)
     {
-      this->suppliers_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->suppliers_[i]->close (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   int i;
   for (i = 0; i < this->hp_suppliers_; ++i)
@@ -713,7 +713,7 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
                                  mc,
                                  this->hp_interval_ * 10,
                                  local_ec
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -737,24 +737,24 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
                                  mc,
                                  this->lp_interval_ * 10,
                                  local_ec
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Test_ECG::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
+Test_ECG::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->hp_consumers_ + this->lp_consumers_; ++i)
     {
-      this->consumers_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumers_[i]->close (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -772,7 +772,7 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
           this->suppliers_[i]->activate (buf,
                                          this->hp_interval_ * 10,
                                          local_ec
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -790,7 +790,7 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
           this->suppliers_[i]->activate (buf,
                                          this->lp_interval_ * 10,
                                          local_ec
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -803,7 +803,7 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
 
 void
 Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   int i;
   for (i = 0; i < this->hp_consumers_; ++i)
@@ -818,7 +818,7 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
                                  this->hpc_event_a_,
                                  this->hpc_event_b_,
                                  local_ec
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       this->stats_[i].total_time_ = 0;
       this->stats_[i].lcl_count_ = 0;
@@ -838,7 +838,7 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
                                  this->lpc_event_a_,
                                  this->lpc_event_b_,
                                  local_ec
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       this->stats_[i].total_time_ = 0;
       this->stats_[i].lcl_count_ = 0;
@@ -851,7 +851,7 @@ void
 Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
                        RtecEventChannelAdmin::EventChannel_ptr remote_ec,
                        RtecScheduler::Scheduler_ptr remote_sch
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   RtecScheduler::Scheduler_ptr local_sch =
     ACE_Scheduler_Factory::server ();
@@ -877,7 +877,7 @@ Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
   ACE_OS::strcat (lcl, this->lcl_name_);
 
   this->ecg_.init (remote_ec, local_ec, remote_sch, local_sch,
-                   rmt, lcl TAO_ENV_ARG_PARAMETER);
+                   rmt, lcl ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -885,14 +885,14 @@ void
 Test_ECG::push_supplier (void * /* cookie */,
                          RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
                          const RtecEventComm::EventSet &events
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   this->wait_until_ready ();
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) events sent by supplier\n"));
   // @@ TODO we could keep somekind of stats here...
   if (!this->short_circuit_)
     {
-      consumer->push (events TAO_ENV_ARG_PARAMETER);
+      consumer->push (events ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -900,12 +900,12 @@ Test_ECG::push_supplier (void * /* cookie */,
       int i = 0;
       for (; i < this->hp_consumers_; ++i)
         {
-          this->consumers_[i]->push (events TAO_ENV_ARG_PARAMETER);
+          this->consumers_[i]->push (events ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       for (; i < this->hp_consumers_ + this->lp_consumers_; ++i)
         {
-          this->consumers_[i]->push (events TAO_ENV_ARG_PARAMETER);
+          this->consumers_[i]->push (events ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -915,7 +915,7 @@ void
 Test_ECG::push_consumer (void *consumer_cookie,
                          ACE_hrtime_t arrival,
                          const RtecEventComm::EventSet &events
-                         TAO_ENV_ARG_DECL_NOT_USED)
+                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   int ID =
     (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
@@ -1009,7 +1009,7 @@ Test_ECG::wait_until_ready (void)
 void
 Test_ECG::shutdown_supplier (void* /* supplier_cookie */,
                              RtecEventComm::PushConsumer_ptr consumer
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
 
   this->running_suppliers_--;
@@ -1027,7 +1027,7 @@ Test_ECG::shutdown_supplier (void* /* supplier_cookie */,
   ACE_hrtime_t t = ACE_OS::gethrtime ();
   ORBSVCS_Time::hrtime_to_TimeT (s.header.creation_time, t);
   s.header.type = ACE_ES_EVENT_SHUTDOWN;
-  consumer->push (shutdown TAO_ENV_ARG_PARAMETER);
+  consumer->push (shutdown ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1048,13 +1048,13 @@ Test_ECG::shutdown_consumer (int id)
 }
 
 int
-Test_ECG::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_ECG::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "Shutting down the multiple EC test\n"));
 
   if (this->rmt_name_ != 0)
     {
-      this->ecg_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->ecg_.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -1307,7 +1307,7 @@ Test_Supplier::open (const char* name,
                      int message_count,
                      const RtecScheduler::Period_t& rate,
                      RtecEventChannelAdmin::EventChannel_ptr ec
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   this->event_a_ = event_a;
   this->event_b_ = event_b;
@@ -1317,7 +1317,7 @@ Test_Supplier::open (const char* name,
     ACE_Scheduler_Factory::server ();
 
   RtecScheduler::handle_t rt_info =
-    server->create (name TAO_ENV_ARG_PARAMETER);
+    server->create (name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The execution times are set to reasonable values, but
@@ -1336,7 +1336,7 @@ Test_Supplier::open (const char* name,
                time,
                1,
                    RtecScheduler::OPERATION
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_id_ = ACE::crc32 (name);
@@ -1355,38 +1355,38 @@ Test_Supplier::open (const char* name,
               rt_info, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  RtecEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  RtecEventComm::PushSupplier_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
                                                 qos.get_SupplierQOS ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Test_Supplier::close (TAO_ENV_SINGLE_ARG_DECL)
+Test_Supplier::close (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy =
     this->consumer_proxy_._retn ();
-  proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+  proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 Test_Supplier::activate (const char* name,
                          const RtecScheduler::Period_t& rate,
                          RtecEventChannelAdmin::EventChannel_ptr ec
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   RtecScheduler::Scheduler_ptr server =
     ACE_Scheduler_Factory::server ();
@@ -1396,7 +1396,7 @@ Test_Supplier::activate (const char* name,
   ACE_OS::strcpy (buf, "consumer_");
   ACE_OS::strcat (buf, name);
   RtecScheduler::handle_t rt_info =
-    server->create (buf TAO_ENV_ARG_PARAMETER);
+    server->create (buf ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The execution times are set to reasonable values, but
@@ -1415,7 +1415,7 @@ Test_Supplier::activate (const char* name,
                time,
                1,
                RtecScheduler::OPERATION
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Also connect our consumer for timeout events from the EC.
@@ -1433,27 +1433,27 @@ Test_Supplier::activate (const char* name,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushConsumer_var cref =
-    this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->consumer_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (
        cref.in (),
        consumer_qos.get_ConsumerQOS ()
-       TAO_ENV_ARG_PARAMETER);
+       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Test_Supplier::push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
 #if 0
    const int bufsize = 128;
@@ -1491,11 +1491,11 @@ Test_Supplier::push (const RtecEventComm::EventSet& events
 
       if (this->message_count_ < 0)
         {
-          //this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
-          //if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0) return;
+          //this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
+          //if (ACE_ENV_SINGLE_ARG_PARAMETER.exception () != 0) return;
           this->test_->shutdown_supplier (this->cookie_,
                                           this->consumer_proxy_.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
         }
       if (this->message_count_ % 2 == 0)
         {
@@ -1510,21 +1510,21 @@ Test_Supplier::push (const RtecEventComm::EventSet& events
   this->test_->push_supplier (this->cookie_,
                               this->consumer_proxy_.in (),
                               sent
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 void
-Test_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+Test_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Test_Supplier::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Supplier::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
@@ -1544,13 +1544,13 @@ void
 Test_Consumer::open (const char* name,
                      int event_a, int event_b,
                      RtecEventChannelAdmin::EventChannel_ptr ec
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   RtecScheduler::Scheduler_ptr server =
     ACE_Scheduler_Factory::server ();
 
   RtecScheduler::handle_t rt_info =
-    server->create (name TAO_ENV_ARG_PARAMETER);
+    server->create (name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The worst case execution time is far less than 2
@@ -1567,7 +1567,7 @@ Test_Consumer::open (const char* name,
                time,
                0,
                RtecScheduler::OPERATION
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ConsumerQOS_Factory qos;
@@ -1578,44 +1578,44 @@ Test_Consumer::open (const char* name,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  RtecEventComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
                                                 qos.get_ConsumerQOS ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Test_Consumer::close (TAO_ENV_SINGLE_ARG_DECL)
+Test_Consumer::close (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy =
     this->supplier_proxy_._retn ();
-  proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t arrival = ACE_OS::gethrtime ();
-  this->test_->push_consumer (this->cookie_, arrival, events TAO_ENV_ARG_PARAMETER);
+  this->test_->push_consumer (this->cookie_, arrival, events ACE_ENV_ARG_PARAMETER);
 }
 
 void
-Test_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 11516552aad..d34efacbb9b 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -50,24 +50,24 @@ public:
              int message_count,
              const RtecScheduler::Period_t& rate,
              RtecEventChannelAdmin::EventChannel_ptr ec
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // This method connects the supplier to the EC.
 
-  void close (TAO_ENV_SINGLE_ARG_DECL);
+  void close (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
   void activate (const char* name,
                  const RtecScheduler::Period_t& rate,
                  RtecEventChannelAdmin::EventChannel_ptr ec
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
 
   void push (const RtecEventComm::EventSet& events
-             TAO_ENV_ARG_DECL);
-  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+             ACE_ENV_ARG_DECL);
+  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Implement the callbacks for our consumer personality.
 
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The methods in the skeleton.
 
@@ -120,16 +120,16 @@ public:
   void open (const char* name,
              int event_a, int event_b,
              RtecEventChannelAdmin::EventChannel_ptr ec
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // This method connects the consumer to the EC.
 
-  void close (TAO_ENV_SINGLE_ARG_DECL);
+  void close (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -185,7 +185,7 @@ public:
   void push_supplier (void* supplier_cookie,
                       RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer,
                       const RtecEventComm::EventSet &events
-                      TAO_ENV_ARG_DECL_NOT_USED);
+                      ACE_ENV_ARG_DECL_NOT_USED);
   // Callback method for suppliers, we push for them to their
   // consumers and take statistics on the way.
   // It is possible that we ignore the <consumer> parameter when
@@ -194,44 +194,44 @@ public:
   void push_consumer (void* consumer_cookie,
                       ACE_hrtime_t arrival,
                       const RtecEventComm::EventSet& events
-                      TAO_ENV_ARG_DECL_NOT_USED);
+                      ACE_ENV_ARG_DECL_NOT_USED);
   // Callback method for consumers, if any of our consumers has
   // received events it will invoke this method.
 
   void shutdown_supplier (void* supplier_cookie,
                           RtecEventComm::PushConsumer_ptr consumer
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   // One of the suppliers has completed its work.
 
 private:
   RtecEventChannelAdmin::EventChannel_ptr
     get_ec (CosNaming::NamingContext_ptr naming_context,
             const char* ec_name
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Helper routine to obtain an EC given its name.
 
   void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          TAO_ENV_ARG_DECL);
-  void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
+  void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
   // Connect the suppliers.
 
   void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
   // Activate the suppliers, i.e. they start generating events.
 
   void connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec,
                     RtecEventChannelAdmin::EventChannel_ptr remote_ec,
                     RtecScheduler::Scheduler_ptr remote_sch
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // Connect the EC gateway, it builds the Subscriptions and the
   // Publications list.
 
   void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          TAO_ENV_ARG_DECL);
-  void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
+  void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
   // Connect and disconnect the consumers.
 
-  int shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Called when the main thread (i.e. not the scavenger thread) is
   // shutting down.
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 346cc25fbe4..171604e78f2 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -32,10 +32,10 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
                         int type_start,
                         int type_count,
                         RtecEventChannelAdmin::EventChannel_ptr ec
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name TAO_ENV_ARG_PARAMETER);
+    scheduler->create (name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The worst case execution time is far less than 2
@@ -51,7 +51,7 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
                   time,
                   0,
                   RtecScheduler::OPERATION
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ConsumerQOS_Factory qos;
@@ -64,29 +64,29 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  RtecEventComm::PushConsumer_var objref = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
                                                 qos.get_ConsumerQOS ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Test_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Test_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -94,12 +94,12 @@ Test_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -118,7 +118,7 @@ Test_Consumer::accumulate (ACE_Throughput_Stats& stats) const
 
 void
 Test_Consumer::push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -157,7 +157,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events
             {
               // We stop the timer as soon as we realize it is time to
               // do so.
-              this->driver_->shutdown_consumer (this->cookie_ TAO_ENV_ARG_PARAMETER);
+              this->driver_->shutdown_consumer (this->cookie_ ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -175,7 +175,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-Test_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index 6490b55497b..d384a8bea82 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -45,10 +45,10 @@ public:
                 int type_start,
                 int type_count,
                 RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
   // This method connects the consumer to the EC.
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
   void dump_results (const char* name,
@@ -59,9 +59,9 @@ public:
   // Add our throughput and latency statistics to <stats>
 
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index d233ca90453..5cb9dcba533 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -43,16 +43,16 @@ ECT_Consumer_Driver::~ECT_Consumer_Driver (void)
 int
 ECT_Consumer_Driver::run (int argc, char* argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references("RootPOA"
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -61,11 +61,11 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (this->parse_args (argc, argv))
@@ -125,7 +125,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
 
       CORBA::Object_var naming_obj =
         this->orb_->resolve_initial_references ("NameService"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -134,7 +134,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name schedule_name (1);
@@ -142,13 +142,13 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::Object_var sched_obj =
-        naming_context->resolve (schedule_name TAO_ENV_ARG_PARAMETER);
+        naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (sched_obj.in ()))
         return 1;
       RtecScheduler::Scheduler_var scheduler =
         RtecScheduler::Scheduler::_narrow (sched_obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name name (1);
@@ -156,7 +156,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name TAO_ENV_ARG_PARAMETER);
+        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var channel;
@@ -164,13 +164,13 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
         channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.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;
 
-      this->connect_consumers (scheduler.in (), channel.in () TAO_ENV_ARG_PARAMETER);
+      this->connect_consumers (scheduler.in (), channel.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
@@ -179,7 +179,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
       for (;;)
         {
           ACE_Time_Value tv (1, 0);
-          this->orb_->perform_work (tv TAO_ENV_ARG_PARAMETER);
+          this->orb_->perform_work (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1);
           if (this->active_count_ <= 0)
@@ -189,19 +189,19 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->shutdown_event_channel_ != 0)
         {
-          channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sys_ex)
@@ -218,7 +218,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
 
 void
 ECT_Consumer_Driver::shutdown_consumer (void*
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   // int ID =
   //   (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
@@ -234,7 +234,7 @@ void
 ECT_Consumer_Driver::connect_consumers
      (RtecScheduler::Scheduler_ptr scheduler,
       RtecEventChannelAdmin::EventChannel_ptr channel
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -255,7 +255,7 @@ ECT_Consumer_Driver::connect_consumers
                                     this->type_start_,
                                     this->type_count_,
                                     channel
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -278,11 +278,11 @@ ECT_Consumer_Driver::dump_results (void)
 }
 
 void
-ECT_Consumer_Driver::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
+ECT_Consumer_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       delete this->consumers_[i];
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index 67579078b74..4af70e0f7a8 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -45,7 +45,7 @@ public:
   // Execute the test.
 
   virtual void shutdown_consumer (void* consumer_cookie
-                                  TAO_ENV_ARG_DECL_NOT_USED);
+                                  ACE_ENV_ARG_DECL_NOT_USED);
   // Callback method for consumers, each consumer will call this
   // method once it receives all the shutdown events from the
   // suppliers.
@@ -56,8 +56,8 @@ private:
 
   void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
                           RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          TAO_ENV_ARG_DECL);
-  void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
+  void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
   // Connect and disconnect the consumers.
 
   void dump_results (void);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
index 9d474f5ff65..372a9eced34 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -26,7 +26,7 @@ public:
   virtual ~ECT_Driver (void);
 
   virtual void shutdown_consumer (void* consumer_cookie
-                                  TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                                  ACE_ENV_ARG_DECL_NOT_USED) = 0;
   // Callback method for consumers, each consumer will call this
   // method once it receives all the shutdown events from the
   // suppliers.
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 73730d301e1..13dd1a46abb 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -44,7 +44,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
                         int type_start,
                         int type_count,
                         RtecEventChannelAdmin::EventChannel_ptr ec
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   this->burst_count_ = burst_count;
   this->burst_size_ = burst_size;
@@ -54,7 +54,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
   this->type_count_ = type_count;
 
   RtecScheduler::handle_t rt_info =
-    scheduler->create (name TAO_ENV_ARG_PARAMETER);
+    scheduler->create (name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_Time_Value tv (0, burst_pause);
@@ -75,7 +75,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
                   time,
                   1,
                   RtecScheduler::OPERATION
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_id_ = ACE::crc32 (name);
@@ -94,30 +94,30 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
               rt_info, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventComm::PushSupplier_var objref =
-    this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
                                                 qos.get_SupplierQOS ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Test_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+Test_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -125,19 +125,19 @@ Test_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->supplier_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->supplier_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (&this->supplier_ TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (&this->supplier_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 Test_Supplier::svc ()
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize a time value to pace the test
@@ -173,7 +173,7 @@ Test_Supplier::svc ()
               ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                              request_start);
               // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
-              this->consumer_proxy ()->push (event TAO_ENV_ARG_PARAMETER);
+              this->consumer_proxy ()->push (event ACE_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
               ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -197,7 +197,7 @@ Test_Supplier::svc ()
       ACE_hrtime_t request_start = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      request_start);
-      this->consumer_proxy ()->push(event TAO_ENV_ARG_PARAMETER);
+      this->consumer_proxy ()->push(event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_hrtime_t end = ACE_OS::gethrtime ();
       this->throughput_.sample (end - test_start,
@@ -220,7 +220,7 @@ Test_Supplier::svc ()
 }
 
 void
-Test_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index 8fb44c736b7..17fbcb8ce02 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -46,13 +46,13 @@ public:
                 int type_start,
                 int type_count,
                 RtecEventChannelAdmin::EventChannel_ptr ec
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
   // This method connects the supplier to the EC.
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC.
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // The methods in the skeleton.
 
   RtecEventComm::EventSourceID supplier_id (void) const;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 90c8dac6867..eb5e9103bcd 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -43,22 +43,22 @@ ECT_Supplier_Driver::~ECT_Supplier_Driver (void)
 
 void
 ECT_Supplier_Driver::shutdown_consumer (void*
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 int
 ECT_Supplier_Driver::run (int argc, char* argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -67,11 +67,11 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (this->parse_args (argc, argv))
@@ -136,7 +136,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -145,7 +145,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name schedule_name (1);
@@ -153,20 +153,20 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::Object_var sched_obj =
-        naming_context->resolve (schedule_name TAO_ENV_ARG_PARAMETER);
+        naming_context->resolve (schedule_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (sched_obj.in ()))
         return 1;
       RtecScheduler::Scheduler_var scheduler =
         RtecScheduler::Scheduler::_narrow (sched_obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CosNaming::Name name (1);
       name.length (1);
       name[0].id = CORBA::string_dup ("EventService");
 
       CORBA::Object_var ec_obj =
-        naming_context->resolve (name TAO_ENV_ARG_PARAMETER);
+        naming_context->resolve (name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var channel;
@@ -174,20 +174,20 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
         channel = RtecEventChannelAdmin::EventChannel::_nil ();
       else
         channel = RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.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;
 
       this->connect_suppliers (scheduler.in (),
                                channel.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
-      this->activate_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->activate_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
@@ -203,17 +203,17 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n"));
 
       // @@ Deactivate the suppliers (as CORBA Objects?)
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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_DEBUG ((LM_DEBUG, "orb and poa destroyed\n"));
@@ -234,7 +234,7 @@ void
 ECT_Supplier_Driver::connect_suppliers
     (RtecScheduler::Scheduler_ptr scheduler,
      RtecEventChannelAdmin::EventChannel_ptr channel
-     TAO_ENV_ARG_DECL)
+     ACE_ENV_ARG_DECL)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -252,13 +252,13 @@ ECT_Supplier_Driver::connect_suppliers
                                     this->type_start_,
                                     this->type_count_,
                                     channel
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECT_Supplier_Driver::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECT_Supplier_Driver::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -267,11 +267,11 @@ ECT_Supplier_Driver::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-ECT_Supplier_Driver::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+ECT_Supplier_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       delete this->suppliers_[i];
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
index 67efa007c52..e51f0f73551 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
@@ -35,7 +35,7 @@ public:
   virtual ~ECT_Supplier_Driver (void);
 
   virtual void shutdown_consumer (void* consumer_cookie
-                                  TAO_ENV_ARG_DECL_NOT_USED);
+                                  ACE_ENV_ARG_DECL_NOT_USED);
   // Not used....
 
   enum {
@@ -52,11 +52,11 @@ private:
 
   void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
                           RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          TAO_ENV_ARG_DECL);
-  void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
+  void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
   // Connect the suppliers.
 
-  void activate_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+  void activate_suppliers (ACE_ENV_SINGLE_ARG_DECL);
   // Activate the suppliers, i.e. they start generating events.
 
   void dump_results (void);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 6e69d0feb01..66518a6ec95 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -70,12 +70,12 @@ ECT_Throughput::run (int argc, char* argv[])
       ACE_High_Res_Timer::calibrate ();
 
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references("RootPOA"
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -84,14 +84,14 @@ ECT_Throughput::run (int argc, char* argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv))
@@ -189,13 +189,13 @@ ECT_Throughput::run (int argc, char* argv[])
         runtime_infos);
 #endif
       RtecScheduler::Scheduler_var scheduler =
-        scheduler_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        scheduler_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if 0
       CORBA::Object_var naming_obj =
         this->orb_->resolve_initial_references ("NameService"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_obj.in ()))
@@ -204,7 +204,7 @@ ECT_Throughput::run (int argc, char* argv[])
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This is the name we (potentially) register the Scheduling
@@ -214,13 +214,13 @@ ECT_Throughput::run (int argc, char* argv[])
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
       CORBA::String_var str =
-        this->orb_->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
                   str.in ()));
 
       // Register the servant with the Naming Context....
-      naming_context->rebind (schedule_name, scheduler.in () TAO_ENV_ARG_PARAMETER);
+      naming_context->rebind (schedule_name, scheduler.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::use_config (naming_context.in ());
@@ -263,7 +263,7 @@ ECT_Throughput::run (int argc, char* argv[])
           TAO_EC_Event_Channel *ec =
             new TAO_EC_Event_Channel (attr);
 
-          ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           auto_ptr<POA_RtecEventChannelAdmin::EventChannel> auto_ec_impl (ec);
@@ -271,23 +271,23 @@ ECT_Throughput::run (int argc, char* argv[])
         }
 
       RtecEventChannelAdmin::EventChannel_var channel =
-        ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->connect_consumers (scheduler.in (),
-                               channel.in () TAO_ENV_ARG_PARAMETER);
+                               channel.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
 
       this->connect_suppliers (scheduler.in (),
                                channel.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "connected supplier(s)\n"));
 
-      this->activate_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->activate_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
@@ -303,17 +303,17 @@ ECT_Throughput::run (int argc, char* argv[])
 
       this->dump_results ();
 
-      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "consumers disconnected\n"));
 
-      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n"));
 
-      channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "channel destroyed\n"));
@@ -321,12 +321,12 @@ ECT_Throughput::run (int argc, char* argv[])
       {
         // Deactivate the EC
         PortableServer::POA_var poa =
-          ec_impl->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ec_impl->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
         PortableServer::ObjectId_var id =
-          poa->servant_to_id (ec_impl.get () TAO_ENV_ARG_PARAMETER);
+          poa->servant_to_id (ec_impl.get () ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+        poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         ACE_DEBUG ((LM_DEBUG, "EC deactivated\n"));
@@ -335,12 +335,12 @@ ECT_Throughput::run (int argc, char* argv[])
       {
         // Deactivate the Scheduler
         PortableServer::POA_var poa =
-          scheduler_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+          scheduler_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
         PortableServer::ObjectId_var id =
-          poa->servant_to_id (&scheduler_impl TAO_ENV_ARG_PARAMETER);
+          poa->servant_to_id (&scheduler_impl ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-        poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+        poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         ACE_DEBUG ((LM_DEBUG, "scheduler deactivated\n"));
@@ -362,7 +362,7 @@ ECT_Throughput::run (int argc, char* argv[])
 
 void
 ECT_Throughput::shutdown_consumer (void*
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
 {
   // int ID =
   //   (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
@@ -376,7 +376,7 @@ ECT_Throughput::shutdown_consumer (void*
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%t) shutting down the ORB\n"));
-      // Not needed: this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+      // Not needed: this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
     }
 }
 
@@ -384,7 +384,7 @@ void
 ECT_Throughput::connect_consumers
      (RtecScheduler::Scheduler_ptr scheduler,
       RtecEventChannelAdmin::EventChannel_ptr channel
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
@@ -408,7 +408,7 @@ ECT_Throughput::connect_consumers
                                     start,
                                     this->consumer_type_count_,
                                     channel
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -417,7 +417,7 @@ void
 ECT_Throughput::connect_suppliers
      (RtecScheduler::Scheduler_ptr scheduler,
       RtecEventChannelAdmin::EventChannel_ptr channel
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
@@ -436,13 +436,13 @@ ECT_Throughput::connect_suppliers
                                     start,
                                     this->supplier_type_count_,
                                     channel
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECT_Throughput::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ECT_Throughput::activate_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -461,21 +461,21 @@ ECT_Throughput::activate_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-ECT_Throughput::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+ECT_Throughput::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-ECT_Throughput::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
+ECT_Throughput::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
index 99d6f7b15e1..43ed45298bd 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
@@ -44,7 +44,7 @@ public:
   // Execute the test.
 
   virtual void shutdown_consumer (void* consumer_cookie
-                                  TAO_ENV_ARG_DECL_NOT_USED);
+                                  ACE_ENV_ARG_DECL_NOT_USED);
   // Callback method for consumers, each consumer will call this
   // method once it receives all the shutdown events from the
   // suppliers.
@@ -55,17 +55,17 @@ private:
 
   void connect_consumers (RtecScheduler::Scheduler_ptr scheduler,
                           RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          TAO_ENV_ARG_DECL);
-  void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
+  void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
   // Connect and disconnect the consumers.
 
   void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler,
                           RtecEventChannelAdmin::EventChannel_ptr local_ec
-                          TAO_ENV_ARG_DECL);
-  void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
+  void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
   // Connect the suppliers.
 
-  void activate_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+  void activate_suppliers (ACE_ENV_SINGLE_ARG_DECL);
   // Activate the suppliers, i.e. they start generating events.
 
   void dump_results (void);
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index d3a33e84377..5130896ad70 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -18,24 +18,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
@@ -46,11 +46,11 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -58,12 +58,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -76,7 +76,7 @@ main (int argc, char* argv[])
                          event_type,
                          event_source,
                          event_type
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       supplier1.connect (supplier_admin.in (),
@@ -84,7 +84,7 @@ main (int argc, char* argv[])
                          event_type + 1,
                          event_source,
                          event_type + 1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -108,7 +108,7 @@ main (int argc, char* argv[])
 
       consumer01.connect (consumer_admin.in (),
                           consumer_qos01.get_ConsumerQOS ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Consumer consumer0 ("Consumer/0", event_type);
@@ -117,7 +117,7 @@ main (int argc, char* argv[])
 
       consumer0.connect (consumer_admin.in (),
                          consumer_qos0.get_ConsumerQOS ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Consumer consumer1 ("Consumer/1", event_type);
@@ -126,7 +126,7 @@ main (int argc, char* argv[])
 
       consumer1.connect (consumer_admin.in (),
                          consumer_qos1.get_ConsumerQOS ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -146,24 +146,24 @@ main (int argc, char* argv[])
           ACE_Time_Value tv (0, 10000);
           consumer0.connect (consumer_admin.in (),
                              consumer_qos0.get_ConsumerQOS ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           consumer1.connect (consumer_admin.in (),
                              consumer_qos1.get_ConsumerQOS ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (i % 2 == 0)
             {
               consumer01.connect (consumer_admin.in (),
                                   consumer_qos0.get_ConsumerQOS ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
             {
               consumer01.connect (consumer_admin.in (),
                                   consumer_qos01.get_ConsumerQOS ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -180,28 +180,28 @@ main (int argc, char* argv[])
 
       // Cleanup..
 
-      consumer01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      supplier1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -291,7 +291,7 @@ Consumer::dump_results (int base_count,
 
 void
 Consumer::push (const RtecEventComm::EventSet& events
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
index 76f5ee25e49..e808ca3d26a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
@@ -45,7 +45,7 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong event_base_count;
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index c5587bc8de6..ca521ef8056 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -74,7 +74,7 @@ EC_BCast::modify_attributes (TAO_EC_Event_Channel_Attributes&)
 }
 
 void
-EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL)
+EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_ECG_UDP_Sender sender;
   TAO_ECG_UDP_Out_Endpoint endpoint;
@@ -83,7 +83,7 @@ EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL)
 
   Simple_Address_Server address_server_impl (udp_addr);
   RtecUDPAdmin::AddrServer_var address_server =
-    address_server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    address_server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (endpoint.dgram ().open (ACE_Addr::sap_any) == -1)
@@ -95,15 +95,15 @@ EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL)
   sender.init (this->event_channel_.in (),
                address_server.in (),
                &endpoint
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::ConsumerQOS sub;
   int shutdown_event_type;
-  this->build_consumer_qos (0, sub, shutdown_event_type TAO_ENV_ARG_PARAMETER);
+  this->build_consumer_qos (0, sub, shutdown_event_type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  sender.open (sub TAO_ENV_ARG_PARAMETER);
+  sender.open (sub ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_ECG_UDP_Receiver receiver;
@@ -116,7 +116,7 @@ EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL)
                  address_server.in (),
                  this->orb_->orb_core ()->reactor (),
                  expire, 5
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   udp_eh.reactor (this->orb_->orb_core ()->reactor ());
@@ -127,16 +127,16 @@ EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   RtecEventChannelAdmin::SupplierQOS pub;
-  this->build_supplier_qos (0, pub, shutdown_event_type TAO_ENV_ARG_PARAMETER);
+  this->build_supplier_qos (0, pub, shutdown_event_type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  receiver.open (pub TAO_ENV_ARG_PARAMETER);
+  receiver.open (pub ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->allocate_tasks () == -1)
     return;
 
-  this->activate_tasks (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->activate_tasks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
@@ -159,10 +159,10 @@ EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL)
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "BCast (%P|%t) suppliers finished\n"));
 
-  receiver.close (TAO_ENV_SINGLE_ARG_PARAMETER);
+  receiver.close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  sender.close (TAO_ENV_SINGLE_ARG_PARAMETER);
+  sender.close (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ Deactivate all the objects...!
@@ -170,12 +170,12 @@ EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL)
   {
     // Deactivate the Address Server
     PortableServer::POA_var poa =
-      address_server_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+      address_server_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
     PortableServer::ObjectId_var id =
-      poa->servant_to_id (&address_server_impl TAO_ENV_ARG_PARAMETER);
+      poa->servant_to_id (&address_server_impl ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
-    poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+    poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (this->verbose ())
@@ -201,7 +201,7 @@ Simple_Address_Server (const ACE_INET_Addr& address)
 void
 Simple_Address_Server::get_addr (const RtecEventComm::EventHeader&,
                                  RtecUDPAdmin::UDP_Addr& address
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   address = this->address_;
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 91151483da1..85e4f32437d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -45,7 +45,7 @@ public:
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
   // set the bcastion flags
 
-  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
+  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
   // Don't run the suppliers, just test connect and disconnect calls.
 
   void dump_results (void);
@@ -71,7 +71,7 @@ public:
 
   virtual void get_addr (const RtecEventComm::EventHeader& header,
                          RtecUDPAdmin::UDP_Addr& address
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
index 6486aa05c1c..c34c27eea06 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -15,24 +15,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
@@ -43,11 +43,11 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -55,12 +55,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -71,28 +71,28 @@ main (int argc, char* argv[])
 
       first_supplier.activate (consumer_admin.in (),
                                milliseconds
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       first_supplier.connect (supplier_admin.in (),
                               0x00001111UL,
                               0x11110000UL,
                               0x00001111UL,
                               0x11110000UL
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       EC_Counting_Supplier second_supplier;
 
       second_supplier.activate (consumer_admin.in (),
                                 milliseconds
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       second_supplier.connect (supplier_admin.in (),
                                0x01100000UL,
                                0x00000110UL,
                                0x01100000UL,
                                0x00000110UL
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -109,7 +109,7 @@ main (int argc, char* argv[])
 
         consumer_bitmask_reject.connect (consumer_admin.in (),
                                          consumer_qos.get_ConsumerQOS ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -126,7 +126,7 @@ main (int argc, char* argv[])
 
         consumer_bitmask_accept.connect (consumer_admin.in (),
                                          consumer_qos.get_ConsumerQOS ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -143,7 +143,7 @@ main (int argc, char* argv[])
 
         consumer_bitmask_filter.connect (consumer_admin.in (),
                                          consumer_qos.get_ConsumerQOS ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -161,7 +161,7 @@ main (int argc, char* argv[])
 
         consumer_bitmask_value.connect (consumer_admin.in (),
                                         consumer_qos.get_ConsumerQOS ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -179,7 +179,7 @@ main (int argc, char* argv[])
 
         consumer_bitmask_loose.connect (consumer_admin.in (),
                                         consumer_qos.get_ConsumerQOS ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -192,36 +192,36 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_bitmask_loose.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_bitmask_loose.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer_bitmask_value.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_bitmask_value.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer_bitmask_filter.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_bitmask_filter.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer_bitmask_accept.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_bitmask_accept.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      consumer_bitmask_reject.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_bitmask_reject.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      second_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      second_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      second_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      second_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      first_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      first_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      first_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      first_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -239,7 +239,7 @@ main (int argc, char* argv[])
       expected = second_supplier.event_count;
       consumer_bitmask_loose.dump_results (expected, 5);
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
index af1af27c30f..05ed9b5f448 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -14,24 +14,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
@@ -40,11 +40,11 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -52,12 +52,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -70,14 +70,14 @@ main (int argc, char* argv[])
 
       supplier_00.activate (consumer_admin.in (),
                             milliseconds
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier_00.connect (supplier_admin.in (),
                            event_source,
                            event_type,
                            event_source,
                            event_type
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -86,14 +86,14 @@ main (int argc, char* argv[])
 
       supplier_01.activate (consumer_admin.in (),
                             milliseconds
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier_01.connect (supplier_admin.in (),
                            event_source,
                            event_type + 1,
                            event_source,
                            event_type + 1
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -102,14 +102,14 @@ main (int argc, char* argv[])
 
       supplier_10.activate (consumer_admin.in (),
                             milliseconds
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier_10.connect (supplier_admin.in (),
                            event_source + 1,
                            event_type,
                            event_source + 1,
                            event_type
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -118,14 +118,14 @@ main (int argc, char* argv[])
 
       supplier_11.activate (consumer_admin.in (),
                             milliseconds
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier_11.connect (supplier_admin.in (),
                            event_source + 1,
                            event_type + 1,
                            event_source + 1,
                            event_type + 1
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -144,7 +144,7 @@ main (int argc, char* argv[])
 
         consumer_00.connect (consumer_admin.in (),
                              consumer_qos.get_ConsumerQOS ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -164,7 +164,7 @@ main (int argc, char* argv[])
 
         consumer_01.connect (consumer_admin.in (),
                              consumer_qos.get_ConsumerQOS ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -177,41 +177,41 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier_11.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_11.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_10.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_10.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_01.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_01.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_00.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_00.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier_11.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_11.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_10.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index af0ed3d1bde..b84226a540c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -18,24 +18,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
@@ -46,11 +46,11 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -58,12 +58,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -75,7 +75,7 @@ main (int argc, char* argv[])
                          event_type,
                          event_source,
                          event_type
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -90,7 +90,7 @@ main (int argc, char* argv[])
 
       consumer0.connect (consumer_admin.in (),
                          consumer_qos0.get_ConsumerQOS ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Consumer consumer1 ("Consumer/1", 200);
@@ -99,7 +99,7 @@ main (int argc, char* argv[])
 
       consumer1.connect (consumer_admin.in (),
                          consumer_qos0.get_ConsumerQOS ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -124,24 +124,24 @@ main (int argc, char* argv[])
 
       // The consumers should be disconnected already, but make sure
       // that they did...
-      //consumer1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      //consumer1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       //ACE_TRY_CHECK;
-      //consumer0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      //consumer0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       //ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      supplier0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -174,7 +174,7 @@ Consumer::Consumer (const char* name,
 
 void
 Consumer::push (const RtecEventComm::EventSet& events
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -192,7 +192,7 @@ Consumer::push (const RtecEventComm::EventSet& events
       return;
   }
 
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h
index 9f467e6c711..7ad7d9772f5 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.h
@@ -39,7 +39,7 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index c2b2605dd4d..124ffcb5e2e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -12,47 +12,47 @@ ACE_RCSID(EC_Tests, Disconnect, "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
 int
 main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -69,44 +69,44 @@ main (int argc, char* argv[])
 
 void
 deactivate_servant (PortableServer::Servant servant
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
           int use_callbacks
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
 {
   TAO_EC_Event_Channel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
 
   TAO_EC_Event_Channel ec_impl (attributes);
-  ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
 
   // Obtain the consumer admin..
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // and the supplier admin..
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
@@ -134,55 +134,55 @@ run_test (PortableServer::POA_ptr poa,
     {
       supplier_0.connect (supplier_admin.in (),
                           supplier_qos.get_SupplierQOS ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       consumer_0.connect (consumer_admin.in (),
                           consumer_qos.get_ConsumerQOS ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
           supplier_1.connect (supplier_admin.in (),
                               supplier_qos.get_SupplierQOS ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           consumer_1.connect (consumer_admin.in (),
                               consumer_qos.get_ConsumerQOS ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
-      supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
-          consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
-          supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 
   supplier_0.connect (supplier_admin.in (),
                       supplier_qos.get_SupplierQOS ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   consumer_0.connect (consumer_admin.in (),
                       consumer_qos.get_ConsumerQOS ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER);
+  deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER);
+  deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER);
+  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count_0 = 1;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index b02ef2f8546..527d1c124e2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -15,24 +15,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
@@ -43,45 +43,45 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl_1 (attributes);
-      ec_impl_1.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl_1.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel_1 =
-        ec_impl_1._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl_1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       TAO_EC_Event_Channel ec_impl_2 (attributes);
-      ec_impl_2.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl_2.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel_2 =
-        ec_impl_2._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl_2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_1 =
-        event_channel_1->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel_1->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_1 =
-        event_channel_1->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel_1->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_2 =
-        event_channel_2->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel_2->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_2 =
-        event_channel_2->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel_2->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -89,14 +89,14 @@ main (int argc, char* argv[])
       TAO_EC_Gateway_IIOP gateway;
       gateway.init (event_channel_1.in (),
                     event_channel_2.in ()
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
 
       RtecEventChannelAdmin::Observer_var obs =
-        gateway._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        gateway._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::Observer_Handle h =
-        event_channel_2->append_observer (obs.in () TAO_ENV_ARG_PARAMETER);
+        event_channel_2->append_observer (obs.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       gateway.observer_handle (h);
@@ -111,28 +111,28 @@ main (int argc, char* argv[])
 
       supplier_00.activate (consumer_admin_1.in (),
                             milliseconds
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier_00.connect (supplier_admin_1.in (),
                            event_source,
                            event_type,
                            event_source,
                            event_type
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       EC_Counting_Supplier supplier_01;
 
       supplier_01.activate (consumer_admin_1.in (),
                             milliseconds
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier_01.connect (supplier_admin_1.in (),
                            event_source,
                            event_type + 1,
                            event_source,
                            event_type + 1
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -149,7 +149,7 @@ main (int argc, char* argv[])
 
         consumer_00.connect (consumer_admin_2.in (),
                              consumer_qos.get_ConsumerQOS ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -180,7 +180,7 @@ main (int argc, char* argv[])
 
         consumer_00.connect (consumer_admin_2.in (),
                              consumer_qos.get_ConsumerQOS ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -207,7 +207,7 @@ main (int argc, char* argv[])
 
         consumer_00.connect (consumer_admin_2.in (),
                              consumer_qos.get_ConsumerQOS ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -226,7 +226,7 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -238,7 +238,7 @@ main (int argc, char* argv[])
 
         consumer_00.connect (consumer_admin_2.in (),
                              consumer_qos.get_ConsumerQOS ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -269,7 +269,7 @@ main (int argc, char* argv[])
 
         consumer_00.connect (consumer_admin_2.in (),
                              consumer_qos.get_ConsumerQOS ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -296,7 +296,7 @@ main (int argc, char* argv[])
 
         consumer_00.connect (consumer_admin_2.in (),
                              consumer_qos.get_ConsumerQOS ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -315,36 +315,36 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier_01.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_01.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_00.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_00.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      gateway.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      gateway.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel_1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel_1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      event_channel_2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel_2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 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/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index 104c76200c7..28b60cf41bf 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -13,47 +13,47 @@ ACE_RCSID(EC_Tests, MT_Disconnect, "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
 int
 main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
 
-      run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER);
+      run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -70,32 +70,32 @@ main (int argc, char* argv[])
 
 void
 deactivate_servant (PortableServer::Servant servant
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 run_test (PortableServer::POA_ptr poa,
           int use_callbacks
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
 {
   TAO_EC_Event_Channel_Attributes attributes (poa, poa);
   attributes.disconnect_callbacks = use_callbacks;
 
   TAO_EC_Event_Channel ec_impl (attributes);
-  ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::EventChannel_var event_channel =
-    ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Task task (event_channel.in (), use_callbacks);
@@ -108,10 +108,10 @@ run_test (PortableServer::POA_ptr poa,
   // Wait for all the threads to complete and the return
   ACE_Thread_Manager::instance ()->wait ();
 
-  event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER);
+  deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -130,7 +130,7 @@ Task::svc ()
     {
       ACE_TRY_NEW_ENV
         {
-          this->run_iteration (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->run_iteration (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -143,16 +143,16 @@ Task::svc ()
 }
 
 void
-Task::run_iteration (TAO_ENV_SINGLE_ARG_DECL)
+Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Obtain the consumer admin..
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // and the supplier admin..
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ****************************************************************
@@ -180,40 +180,40 @@ Task::run_iteration (TAO_ENV_SINGLE_ARG_DECL)
     {
       supplier_0.connect (supplier_admin.in (),
                           supplier_qos.get_SupplierQOS ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       consumer_0.connect (consumer_admin.in (),
                           consumer_qos.get_ConsumerQOS ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
           supplier_1.connect (supplier_admin.in (),
                               supplier_qos.get_SupplierQOS ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           consumer_1.connect (consumer_admin.in (),
                               consumer_qos.get_ConsumerQOS ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
-      supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       if (i % 2 == 1)
         {
-          consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
-          supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 
-  deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER);
+  deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER);
+  deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count_0 = 0;
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
index 68cb65381d6..4448774b248 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
@@ -34,7 +34,7 @@ public:
   // = Check the ACE_Task_Base documentation.
   int svc (void);
 
-  void run_iteration (TAO_ENV_SINGLE_ARG_DECL);
+  void run_iteration (ACE_ENV_SINGLE_ARG_DECL);
   // Run a single iteration of the test
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index e8775059df6..e94876eff99 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -15,24 +15,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
@@ -43,11 +43,11 @@ main (int argc, char* argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -55,12 +55,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -73,42 +73,42 @@ main (int argc, char* argv[])
 
       first_supplier.activate (consumer_admin.in (),
                                milliseconds
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       first_supplier.connect (supplier_admin.in (),
                               event_source,
                               event_type,
                               event_source,
                               event_type
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       EC_Counting_Supplier second_supplier;
 
       second_supplier.activate (consumer_admin.in (),
                                 milliseconds
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       second_supplier.connect (supplier_admin.in (),
                                event_source,
                                event_type + 1,
                                event_source,
                                event_type + 1
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       EC_Counting_Supplier third_supplier;
 
       third_supplier.activate (consumer_admin.in (),
                                milliseconds
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       third_supplier.connect (supplier_admin.in (),
                               event_source,
                               event_type + 1,
                               event_source,
                               event_type + 1
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -125,7 +125,7 @@ main (int argc, char* argv[])
 
         regular_consumer.connect (consumer_admin.in (),
                                   consumer_qos.get_ConsumerQOS ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -143,7 +143,7 @@ main (int argc, char* argv[])
 
         negation_consumer.connect (consumer_admin.in (),
                                    consumer_qos.get_ConsumerQOS ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -156,37 +156,37 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      negation_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      negation_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      regular_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      regular_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      third_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      third_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      third_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      third_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      second_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      second_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      second_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      second_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      first_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      first_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      first_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      first_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -199,7 +199,7 @@ main (int argc, char* argv[])
         first_supplier.event_count;
       regular_consumer.dump_results (expected, 5);
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index b8b90e089fd..8ea3d55d74b 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -48,7 +48,7 @@ EC_Master::run (int argc, char* argv[])
 
       this->seed_ = ACE_OS::time (0);
 
-      this->initialize_orb_and_poa (argc, argv TAO_ENV_ARG_PARAMETER);
+      this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (this->parse_args (argc, argv))
@@ -84,7 +84,7 @@ EC_Master::run (int argc, char* argv[])
             int targc = argc;
             for (int j = 0; j < targc; ++j)
               targv[j] = argv[j];
-            this->channels_[i]->run_init (targc, targv TAO_ENV_ARG_PARAMETER);
+            this->channels_[i]->run_init (targc, targv ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
         delete[] targv;
@@ -93,7 +93,7 @@ EC_Master::run (int argc, char* argv[])
       {
         for (int i = 0; i != this->n_channels_; ++i)
           {
-            this->channels_[i]->execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->channels_[i]->execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
       }
@@ -115,7 +115,7 @@ EC_Master::run (int argc, char* argv[])
       {
         for (int i = 0; i != this->n_channels_; ++i)
           {
-            this->channels_[i]->run_cleanup (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->channels_[i]->run_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
       }
@@ -123,13 +123,13 @@ EC_Master::run (int argc, char* argv[])
       {
         for (int i = 0; i != this->n_channels_; ++i)
           {
-            this->channels_[i]->disconnect_clients (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->channels_[i]->disconnect_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->channels_[i]->shutdown_clients (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->channels_[i]->shutdown_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->channels_[i]->destroy_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->channels_[i]->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->channels_[i]->deactivate_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->channels_[i]->deactivate_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             this->channels_[i]->cleanup_tasks ();
             this->channels_[i]->cleanup_suppliers ();
@@ -140,10 +140,10 @@ EC_Master::run (int argc, char* argv[])
 
       this->root_poa_->destroy (1,
                                 1
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
    }
   ACE_CATCHANY
@@ -160,14 +160,14 @@ EC_Master::run (int argc, char* argv[])
 
 void
 EC_Master::initialize_orb_and_poa (int &argc, char* argv[]
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+    CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (poa_object.in ()))
@@ -178,14 +178,14 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[]
     }
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -250,7 +250,7 @@ EC_Observer::~EC_Observer (void)
 
 void
 EC_Observer::initialize_orb_and_poa (int&, char*[]
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -273,7 +273,7 @@ EC_Observer::print_usage (void)
 }
 
 void
-EC_Observer::execute_test (TAO_ENV_SINGLE_ARG_DECL)
+EC_Observer::execute_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   int peer_count = this->master_->channel_count ();
   ACE_NEW (this->gwys_, TAO_EC_Gateway_IIOP[peer_count]);
@@ -288,14 +288,14 @@ EC_Observer::execute_test (TAO_ENV_SINGLE_ARG_DECL)
 
       this->gwys_[i].init (rmt_ec,
                            this->event_channel_.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
       RtecEventChannelAdmin::Observer_var obs =
-        this->gwys_[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->gwys_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       RtecEventChannelAdmin::Observer_Handle h =
-        rmt_ec->append_observer (obs.in () TAO_ENV_ARG_PARAMETER);
+        rmt_ec->append_observer (obs.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->gwys_[i].observer_handle (h);
@@ -306,7 +306,7 @@ EC_Observer::execute_test (TAO_ENV_SINGLE_ARG_DECL)
   if (this->allocate_tasks () == -1)
     return;
 
-  this->activate_tasks (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->activate_tasks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
@@ -315,7 +315,7 @@ EC_Observer::execute_test (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Observer::run_cleanup (TAO_ENV_SINGLE_ARG_DECL)
+EC_Observer::run_cleanup (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int j = 0; j != this->master_->channel_count (); ++j)
     {
@@ -325,10 +325,10 @@ EC_Observer::run_cleanup (TAO_ENV_SINGLE_ARG_DECL)
       RtecEventChannelAdmin::EventChannel_ptr rmt_ec =
         this->master_->channel (j)->event_channel_.in ();
       rmt_ec->remove_observer (this->gwys_[j].observer_handle ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->gwys_[j].shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->gwys_[j].shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -363,24 +363,24 @@ void
 EC_Observer::connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     int i
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   if (i == 0)
     {
       this->EC_Driver::connect_consumer (consumer_admin, i
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       return;
     }
   unsigned int x = ACE_OS::rand_r (this->seed_);
   if (x < RAND_MAX / 8)
     this->EC_Driver::connect_consumer (consumer_admin, i
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 void
 EC_Observer::consumer_push (void*,
                             const RtecEventComm::EventSet&
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   unsigned int x = ACE_OS::rand_r (this->seed_);
   if (x < (RAND_MAX / 64))
@@ -390,7 +390,7 @@ EC_Observer::consumer_push (void*,
                     "EC_Observer[%d] (%P|%t) reconnecting\n", this->id_));
 
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       for (int i = 1; i < this->n_consumers_; ++i)
@@ -399,13 +399,13 @@ EC_Observer::consumer_push (void*,
 
           if (this->consumers_[i]->connected ())
             {
-              this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
             }
           else
             {
               this->EC_Driver::connect_consumer (consumer_admin.in (),
-                                                 i TAO_ENV_ARG_PARAMETER);
+                                                 i ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
index 655ad3e9111..7c562cfab60 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h
@@ -44,7 +44,7 @@ public:
   // Execute the test.
 
   virtual void initialize_orb_and_poa (int& argc, char* argv[]
-                                       TAO_ENV_ARG_DECL);
+                                       ACE_ENV_ARG_DECL);
   // Obtain the orb and the poa pointers
 
   int channel_count (void) const;
@@ -90,24 +90,24 @@ public:
 
   // = The EC_Driver methods
   virtual void initialize_orb_and_poa (int& argc, char* argv[]
-                                       TAO_ENV_ARG_DECL);
+                                       ACE_ENV_ARG_DECL);
   virtual int parse_args (int& argc, char* argv[]);
   virtual void print_args (void) const;
   virtual void print_usage (void);
   // add some command line args to enable/disable observerions
 
-  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
-  void run_cleanup (TAO_ENV_SINGLE_ARG_DECL);
+  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
+  void run_cleanup (ACE_ENV_SINGLE_ARG_DECL);
   // Run the suppliers, using the <thread_manager> parameter
 
   void dump_results (void);
   void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     int i
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
   void consumer_push (void*,
                       const RtecEventComm::EventSet&
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
 private:
   EC_Master *master_;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index 5b9b6cbcf73..967f69b7edd 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -22,15 +22,15 @@ const int base_type = 20;
 
 void
 deactivate_servant (PortableServer::Servant servant
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   PortableServer::POA_var poa =
-    servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -49,11 +49,11 @@ RND_Driver::RND_Driver (void)
 int
 RND_Driver::run (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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;
 
       // ****************************************************************
@@ -116,15 +116,15 @@ RND_Driver::run (int argc, char *argv[])
       // ****************************************************************
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
@@ -135,23 +135,23 @@ RND_Driver::run (int argc, char *argv[])
       attributes.supplier_reconnect = 1;
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
       // Obtain the consumer admin..
       this->consumer_admin_ =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       this->supplier_admin_ =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -173,7 +173,7 @@ RND_Driver::run (int argc, char *argv[])
 
         this->timer_.connect (this->consumer_admin_.in (),
                               qos.get_ConsumerQOS ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -185,7 +185,7 @@ RND_Driver::run (int argc, char *argv[])
 
         this->supplier_.connect (this->supplier_admin_.in (),
                                  qos.get_SupplierQOS ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -201,7 +201,7 @@ RND_Driver::run (int argc, char *argv[])
                           1);
 
           CORBA::Object_var obj =
-            this->consumers_[i]->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->consumers_[i]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -218,7 +218,7 @@ RND_Driver::run (int argc, char *argv[])
           this->suppliers_[j]->activate ();
 
           CORBA::Object_var obj =
-            this->suppliers_[j]->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->suppliers_[j]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -235,9 +235,9 @@ RND_Driver::run (int argc, char *argv[])
         for (int k = 0; k != this->nsuppliers_; ++k)
           {
             deactivate_servant (this->suppliers_[k]
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->suppliers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->suppliers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
         delete[] this->suppliers_;
@@ -248,7 +248,7 @@ RND_Driver::run (int argc, char *argv[])
 
       // We destroy now to verify that the callbacks work and do not
       // produce any problems.
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -257,9 +257,9 @@ RND_Driver::run (int argc, char *argv[])
         for (int k = 0; k != this->nconsumers_; ++k)
           {
             deactivate_servant (this->consumers_[k]
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
-            this->consumers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->consumers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
         delete[] this->consumers_;
@@ -269,17 +269,17 @@ RND_Driver::run (int argc, char *argv[])
       // ****************************************************************
 
       deactivate_servant (&ec_impl
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 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
@@ -293,7 +293,7 @@ RND_Driver::run (int argc, char *argv[])
 
 void
 RND_Driver::timer (const RtecEventComm::Event &e
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   int r = ACE_OS::rand ();
   if (r < 0)
@@ -313,7 +313,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
             event.length (1);
             event[0] = e;
             event[0].header.source ++;
-            this->supplier_.push (event TAO_ENV_ARG_PARAMETER);
+            this->supplier_.push (event ACE_ENV_ARG_PARAMETER);
             ACE_CHECK;
           }
       }
@@ -338,7 +338,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
 
         this->suppliers_[n]->connect (this->supplier_admin_.in (),
                                       qos.get_SupplierQOS ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -355,7 +355,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
 
         this->consumers_[n]->connect (this->consumer_admin_.in (),
                                       qos.get_ConsumerQOS ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -366,7 +366,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
 
         // ACE_DEBUG ((LM_DEBUG, "Disconnecting supplier %d\n", n));
 
-        this->suppliers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->suppliers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -377,7 +377,7 @@ RND_Driver::timer (const RtecEventComm::Event &e
 
         // ACE_DEBUG ((LM_DEBUG, "Disconnecting consumer %d\n", n));
 
-        this->consumers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->consumers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
       break;
@@ -386,21 +386,21 @@ RND_Driver::timer (const RtecEventComm::Event &e
 
 void
 RND_Driver::event (const RtecEventComm::Event &e
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
-  this->timer (e TAO_ENV_ARG_PARAMETER);
+  this->timer (e ACE_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
 
 void
 RND_Timer::push (const RtecEventComm::EventSet &event
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->driver_->timer (event[0] TAO_ENV_ARG_PARAMETER);
+      this->driver_->timer (event[0] ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -414,7 +414,7 @@ RND_Timer::push (const RtecEventComm::EventSet &event
 void
 RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
                        const RtecEventChannelAdmin::ConsumerQOS &qos
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -422,29 +422,29 @@ RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
 
     if (CORBA::is_nil (this->proxy_.in ()))
       {
-        this->proxy_ = admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->proxy_ = admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
     proxy =
       RtecEventChannelAdmin::ProxyPushSupplier::_duplicate(this->proxy_.in ());
   }
   RtecEventComm::PushConsumer_var me =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   proxy->connect_push_consumer (me.in (),
                                 qos
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RND_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+RND_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (CORBA::is_nil (this->proxy_.in ()))
     return;
-  this->proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -452,14 +452,14 @@ RND_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 RND_Consumer::push (const RtecEventComm::EventSet &event
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->event (event[0] TAO_ENV_ARG_PARAMETER);
+  this->driver_->event (event[0] ACE_ENV_ARG_PARAMETER);
 }
 
 void
-RND_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+RND_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -469,7 +469,7 @@ RND_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
                        const RtecEventChannelAdmin::SupplierQOS &qos
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -477,7 +477,7 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
 
     if (CORBA::is_nil (this->proxy_.in ()))
       {
-        this->proxy_ = admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->proxy_ = admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
       }
 
@@ -485,41 +485,41 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
       RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ());
   }
   RtecEventComm::PushSupplier_var me =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   proxy->connect_push_supplier (me.in (),
                                 qos
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RND_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+RND_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   if (CORBA::is_nil (this->proxy_.in ()))
     return;
-  this->proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 }
 
 void
-RND_Supplier::push_new_event (TAO_ENV_SINGLE_ARG_DECL)
+RND_Supplier::push_new_event (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventComm::EventSet event (1);
   event.length (1);
   event[0].header.type   = base_type;
   event[0].header.source = 0;
 
-  this->push (event TAO_ENV_ARG_PARAMETER);
+  this->push (event ACE_ENV_ARG_PARAMETER);
 }
 
 void
 RND_Supplier::push (RtecEventComm::EventSet &event
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -532,11 +532,11 @@ RND_Supplier::push (RtecEventComm::EventSet &event
       RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ());
   }
 
-  proxy->push (event TAO_ENV_ARG_PARAMETER);
+  proxy->push (event ACE_ENV_ARG_PARAMETER);
 }
 
 void
-RND_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+RND_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -549,13 +549,13 @@ RND_Supplier::svc (void)
   int niterations = 5000;
   for (int i = 0; i != niterations; ++i)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
           ACE_Time_Value tv (0, 10000);
           ACE_OS::sleep (tv);
 
-          this->push_new_event (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->push_new_event (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h
index 3ef3e1f0bb9..fbbb5ee8468 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.h
@@ -48,15 +48,15 @@ public:
   // Constructor
 
   void push (const RtecEventComm::EventSet &event
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin,
                 const RtecEventChannelAdmin::ConsumerQOS &qos
-                TAO_ENV_ARG_DECL);
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+                ACE_ENV_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
   RND_Driver *driver_;
@@ -83,7 +83,7 @@ public:
   RND_Timer (RND_Driver *driver);
 
   void push (const RtecEventComm::EventSet &event
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -111,15 +111,15 @@ public:
 
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin,
                 const RtecEventChannelAdmin::SupplierQOS &qos
-                TAO_ENV_ARG_DECL);
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+                ACE_ENV_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
 
-  void push_new_event (TAO_ENV_SINGLE_ARG_DECL);
+  void push_new_event (ACE_ENV_SINGLE_ARG_DECL);
   void push (RtecEventComm::EventSet &event
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Push a single event...
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual int svc (void);
@@ -153,11 +153,11 @@ public:
   // Run the test
 
   void timer (const RtecEventComm::Event &e
-              TAO_ENV_ARG_DECL);
+              ACE_ENV_ARG_DECL);
   // The main timer has expired
 
   void event (const RtecEventComm::Event &e
-              TAO_ENV_ARG_DECL);
+              ACE_ENV_ARG_DECL);
   // One of the consumers has received an event
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 4b8879820ec..8e80572c29e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -88,18 +88,18 @@ EC_Reconnect::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
 }
 
 void
-EC_Reconnect::execute_test (TAO_ENV_SINGLE_ARG_DECL)
+EC_Reconnect::execute_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->execute_consumer_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->execute_consumer_test (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->execute_supplier_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->execute_supplier_test (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
   this->consumer_reconnect_.dump_results ("Reconnect/consumer", gsf);
   this->supplier_reconnect_.dump_results ("Reconnect/supplier", gsf);
 
-  // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+  // this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -108,11 +108,11 @@ EC_Reconnect::dump_results (void)
 }
 
 void
-EC_Reconnect::execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL)
+EC_Reconnect::execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerQOS qos;
   int shutdown_event_type;
-  this->build_consumer_qos (0, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER);
+  this->build_consumer_qos (0, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->allow_consumer_reconnect_)
@@ -123,7 +123,7 @@ EC_Reconnect::execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL)
           ACE_hrtime_t start = ACE_OS::gethrtime ();
           this->consumers_[0]->connect (qos,
                                         shutdown_event_type
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->consumer_reconnect_.sample (stop - start_time,
@@ -136,7 +136,7 @@ EC_Reconnect::execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL)
         {
           this->consumers_[0]->connect (qos,
                                         shutdown_event_type
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_ERROR, "Expected exception\n"));
@@ -153,19 +153,19 @@ EC_Reconnect::execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL)
       ACE_ENDTRY;
 
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_hrtime_t start_time = ACE_OS::gethrtime ();
       for (int i = 0; i < this->disconnections_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
-          this->consumers_[0]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->consumers_[0]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
           this->consumers_[0]->connect (consumer_admin.in (),
                                         qos,
                                         shutdown_event_type
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->consumer_reconnect_.sample (stop - start_time,
@@ -175,11 +175,11 @@ EC_Reconnect::execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Reconnect::execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL)
+EC_Reconnect::execute_supplier_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierQOS qos;
   int shutdown_event_type;
-  this->build_supplier_qos (0, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER);
+  this->build_supplier_qos (0, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->allow_supplier_reconnect_)
@@ -189,7 +189,7 @@ EC_Reconnect::execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
           this->suppliers_[0]->connect (qos, shutdown_event_type
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->supplier_reconnect_.sample (stop - start_time,
@@ -201,7 +201,7 @@ EC_Reconnect::execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL)
       ACE_TRY
         {
           this->suppliers_[0]->connect (qos, shutdown_event_type
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_ERROR, "Expected exception\n"));
@@ -218,19 +218,19 @@ EC_Reconnect::execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL)
       ACE_ENDTRY;
 
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_hrtime_t start_time = ACE_OS::gethrtime ();
       for (int i = 0; i < this->disconnections_; ++i)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
-          this->suppliers_[0]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->suppliers_[0]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
           this->suppliers_[0]->connect (supplier_admin.in (),
                                         qos,
                                         shutdown_event_type
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           ACE_hrtime_t stop = ACE_OS::gethrtime ();
           this->supplier_reconnect_.sample (stop - start_time,
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
index 34f32a5388d..5430aebd876 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
@@ -54,14 +54,14 @@ public:
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
   // set the reconnection flags
 
-  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
+  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
   // Don't run the suppliers, just test connect and disconnect calls.
 
   void dump_results (void);
   // Don't dump the EC_Driver results, they are meaningless.
 
-  void execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void execute_supplier_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Separate the suppliers and consumers.
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index 3b51c048d04..63ca69d88b1 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -49,13 +49,13 @@ EC_Schedule::print_usage (void)
 }
 
 void
-EC_Schedule::initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL)
+EC_Schedule::initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->scheduler_impl_ = new ACE_Config_Scheduler;
-  this->scheduler_ = this->scheduler_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->scheduler_ = this->scheduler_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->EC_Driver::initialize_ec_impl (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->EC_Driver::initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -72,7 +72,7 @@ EC_Schedule::cleanup_ec (void)
 }
 
 void
-EC_Schedule::execute_test (TAO_ENV_SINGLE_ARG_DECL)
+EC_Schedule::execute_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Long min_priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -91,7 +91,7 @@ EC_Schedule::execute_test (TAO_ENV_SINGLE_ARG_DECL)
                                         infos.out (),
                                         configs.out (),
                                         anomalies.out ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
@@ -113,13 +113,13 @@ EC_Schedule::build_consumer_qos (
   int i,
   RtecEventChannelAdmin::ConsumerQOS& qos,
   int& shutdown_event_type
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   char name[128];
   ACE_OS::sprintf (name, "EC_Schedule::Consumer::%04x", i);
 
   RtecScheduler::handle_t rt_info =
-    this->scheduler_->create (name TAO_ENV_ARG_PARAMETER);
+    this->scheduler_->create (name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The worst case execution time is far less than 2
@@ -135,7 +135,7 @@ EC_Schedule::build_consumer_qos (
                          time,
                          0,
                          RtecScheduler::OPERATION
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int type_start =
@@ -159,13 +159,13 @@ EC_Schedule::build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
       int& shutdown_event_type
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   char name[128];
   ACE_OS::sprintf (name, "EC_Schedule::Supplier::%04x", i);
 
   RtecScheduler::handle_t rt_info =
-    this->scheduler_->create (name TAO_ENV_ARG_PARAMETER);
+    this->scheduler_->create (name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_Time_Value tv (0, this->burst_pause_);
@@ -186,7 +186,7 @@ EC_Schedule::build_supplier_qos (
                          time,
                          1,
                          RtecScheduler::OPERATION
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
index 54a448f532c..4cb08296b1f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
@@ -59,12 +59,12 @@ public:
   // add some command line args to change the scheduling service to
   // use.
 
-  void initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL);
+  void initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL);
   void cleanup_ec (void);
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
   // Set the scheduling service attribute
 
-  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
+  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
   // Don't run the suppliers, just compute the schedule.
 
   void dump_results (void);
@@ -74,12 +74,12 @@ public:
       int i,
       RtecEventChannelAdmin::ConsumerQOS& qos,
       int& shutdown_event_type
-      TAO_ENV_ARG_DECL_NOT_USED);
+      ACE_ENV_ARG_DECL_NOT_USED);
   virtual void build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
       int& shutdown_event_type
-      TAO_ENV_ARG_DECL_NOT_USED);
+      ACE_ENV_ARG_DECL_NOT_USED);
   // This time really connect to the scheduler
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
index 2dfa9322b2c..35b530df511 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -22,18 +22,18 @@ EC_Shutdown::EC_Shutdown (void)
 }
 
 void
-EC_Shutdown::execute_test (TAO_ENV_SINGLE_ARG_DECL)
+EC_Shutdown::execute_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) destroying EC\n"));
 
-  this->destroy_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec destroyed\n"));
 
-  this->deactivate_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
@@ -44,16 +44,16 @@ EC_Shutdown::execute_test (TAO_ENV_SINGLE_ARG_DECL)
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec cleanup\n"));
 
-  this->initialize_ec_impl (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) status reset\n"));
 
-  // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+  // this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -72,7 +72,7 @@ EC_Shutdown::dump_results (void)
 
 void
 EC_Shutdown::consumer_disconnect (void* cookie
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->consumer_disconnects_++;
   if (this->verbose ())
@@ -81,7 +81,7 @@ EC_Shutdown::consumer_disconnect (void* cookie
 
 void
 EC_Shutdown::supplier_disconnect (void* cookie
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->supplier_disconnects_++;
   if (this->verbose ())
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
index b97deb5536a..f0d9af6c43f 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
@@ -39,18 +39,18 @@ public:
   // Constructor
 
   // = The EC_Driver methods
-  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
+  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
   // Don't run the suppliers just create the EC and then destroy it.
 
   void dump_results (void);
   // Don't dump the EC_Driver results, they are meaningless.
 
   virtual void consumer_disconnect (void* consumer_cookie
-                                    TAO_ENV_ARG_DECL);
+                                    ACE_ENV_ARG_DECL);
   // One of the consumers in the test has been disconnected from the EC
 
   virtual void supplier_disconnect (void* supplier_cookie
-                                    TAO_ENV_ARG_DECL);
+                                    ACE_ENV_ARG_DECL);
   // One of the suppliers in the test has been disconnected from the EC
 
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
index 8d2ff984a88..50363e86a26 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -17,24 +17,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
@@ -43,11 +43,11 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -55,12 +55,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -68,12 +68,12 @@ main (int argc, char* argv[])
       EC_Counting_Supplier supplier;
 
       supplier.activate (consumer_admin.in (),
-                         50 TAO_ENV_ARG_PARAMETER);
+                         50 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier.connect (supplier_admin.in (),
                         0, 20,
                         0, 20
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -100,7 +100,7 @@ main (int argc, char* argv[])
 
         interval_consumer.connect (consumer_admin.in (),
                                    consumer_qos.get_ConsumerQOS ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -127,7 +127,7 @@ main (int argc, char* argv[])
 
         conjunction_consumer.connect (consumer_admin.in (),
                                       consumer_qos.get_ConsumerQOS ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -150,7 +150,7 @@ main (int argc, char* argv[])
 
         deadline_consumer.connect (consumer_admin.in (),
                                    consumer_qos.get_ConsumerQOS ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -163,28 +163,28 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      deadline_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      deadline_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      conjunction_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      conjunction_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      interval_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      interval_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
index 6a2569745fb..30690628e96 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -14,24 +14,24 @@ main (int argc, char* argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       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;
 
       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 poa =
-        PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (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;
 
       // ****************************************************************
@@ -40,11 +40,11 @@ main (int argc, char* argv[])
                                                   poa.in ());
 
       TAO_EC_Event_Channel ec_impl (attributes);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var event_channel =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -52,12 +52,12 @@ main (int argc, char* argv[])
 
       // Obtain the consumer admin..
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the supplier admin..
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -70,14 +70,14 @@ main (int argc, char* argv[])
 
       supplier.activate (consumer_admin.in (),
                          milliseconds
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       supplier.connect (supplier_admin.in (),
                         event_source,
                         event_type,
                         event_source,
                         event_type
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -86,14 +86,14 @@ main (int argc, char* argv[])
 
       other_supplier.activate (consumer_admin.in (),
                                milliseconds
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       other_supplier.connect (supplier_admin.in (),
                               event_source + 1,
                               event_type + 1,
                               event_source + 1,
                               event_type + 1
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -102,14 +102,14 @@ main (int argc, char* argv[])
 
       any_source_supplier.activate (consumer_admin.in (),
                                     milliseconds
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       any_source_supplier.connect (supplier_admin.in (),
                                    0,
                                    event_type,
                                    event_source,
                                    event_type
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -118,14 +118,14 @@ main (int argc, char* argv[])
 
       any_type_supplier.activate (consumer_admin.in (),
                                   milliseconds
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       any_type_supplier.connect (supplier_admin.in (),
                                  event_source,
                                  0,
                                  event_source,
                                  event_type
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -134,14 +134,14 @@ main (int argc, char* argv[])
 
       wildcard_supplier.activate (consumer_admin.in (),
                                   milliseconds
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       wildcard_supplier.connect (supplier_admin.in (),
                                  0,
                                  0,
                                  event_source,
                                  event_type
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
@@ -158,7 +158,7 @@ main (int argc, char* argv[])
 
         regular_consumer.connect (consumer_admin.in (),
                                   consumer_qos.get_ConsumerQOS ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -176,7 +176,7 @@ main (int argc, char* argv[])
 
         any_type_consumer.connect (consumer_admin.in (),
                                    consumer_qos.get_ConsumerQOS ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -194,7 +194,7 @@ main (int argc, char* argv[])
 
         any_source_consumer.connect (consumer_admin.in (),
                                      consumer_qos.get_ConsumerQOS ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -212,7 +212,7 @@ main (int argc, char* argv[])
 
         wildcard_consumer.connect (consumer_admin.in (),
                                    consumer_qos.get_ConsumerQOS ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -225,52 +225,52 @@ main (int argc, char* argv[])
 
       // ****************************************************************
 
-      wildcard_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      wildcard_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      any_source_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      any_source_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      any_type_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      any_type_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      regular_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      regular_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      wildcard_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      wildcard_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      wildcard_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      wildcard_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      any_type_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      any_type_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      any_source_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      any_source_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      any_source_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      any_source_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      other_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      other_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      other_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      other_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
 
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index a9f009ecf92..bc3dc16a191 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -24,9 +24,9 @@ EC_Connect::EC_Connect (void)
 }
 
 void
-EC_Connect::execute_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Connect::execute_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
-  // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+  // this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
@@ -109,12 +109,12 @@ void
 EC_Connect::connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     int i
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Driver::connect_consumer (consumer_admin,
                                      i
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->consumer_connect_.sample (now - this->start_time_,
                                   now - start);
@@ -124,12 +124,12 @@ void
 EC_Connect::connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
     int i
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Driver::connect_supplier (supplier_admin,
                                      i
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->supplier_connect_.sample (now - this->start_time_,
                                   now - start);
@@ -148,23 +148,23 @@ EC_Connect::allocate_supplier (int i)
 }
 
 void
-EC_Connect::connect_clients (TAO_ENV_SINGLE_ARG_DECL)
+EC_Connect::connect_clients (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->start_time_ = ACE_OS::gethrtime ();
   switch (this->order_)
     {
     default:
     case 0:
-      this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
 
     case 1:
-      this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
 
@@ -177,23 +177,23 @@ EC_Connect::connect_clients (TAO_ENV_SINGLE_ARG_DECL)
     max = this->n_suppliers_;
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (int i = 0; i != max; ++i)
     {
       if (i < this->n_consumers_)
         {
-          this->connect_consumer (consumer_admin.in (), i TAO_ENV_ARG_PARAMETER);
+          this->connect_consumer (consumer_admin.in (), i ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       if (i < this->n_suppliers_)
         {
-          this->connect_supplier (supplier_admin.in (), i TAO_ENV_ARG_PARAMETER);
+          this->connect_supplier (supplier_admin.in (), i ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -201,22 +201,22 @@ EC_Connect::connect_clients (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Connect::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL)
+EC_Connect::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
 {
   switch (this->order_)
     {
     default:
     case 0:
-      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
 
     case 1:
-      this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
 
@@ -229,11 +229,11 @@ EC_Connect::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL)
     max = this->n_suppliers_;
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
@@ -243,7 +243,7 @@ EC_Connect::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -254,7 +254,7 @@ EC_Connect::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -268,14 +268,14 @@ EC_Connect::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Connect::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
+EC_Connect::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_consumers_; ++i)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -290,14 +290,14 @@ EC_Connect::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Connect::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+EC_Connect::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_hrtime_t start_time = ACE_OS::gethrtime ();
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
       ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-      this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -324,24 +324,24 @@ ECC_Consumer::connect (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     const RtecEventChannelAdmin::ConsumerQOS& qos,
     int shutdown_event_type
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   this->EC_Consumer::connect (consumer_admin,
                               qos,
                               shutdown_event_type
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 void
 ECC_Consumer::connect (
     const RtecEventChannelAdmin::ConsumerQOS& qos,
     int shutdown_event_type
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Consumer::connect (qos,
                               shutdown_event_type
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->connect_time_.sample (now, now - start);
 }
@@ -366,24 +366,24 @@ ECC_Supplier::connect (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
     const RtecEventChannelAdmin::SupplierQOS& qos,
     int shutdown_event_type
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   this->EC_Supplier::connect (supplier_admin,
                               qos,
                               shutdown_event_type
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 void
 ECC_Supplier::connect (
     const RtecEventChannelAdmin::SupplierQOS& qos,
     int shutdown_event_type
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   ACE_hrtime_t start = ACE_OS::gethrtime ();
   this->EC_Supplier::connect (qos,
                               shutdown_event_type
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_hrtime_t now = ACE_OS::gethrtime ();
   this->connect_time_.sample (now, now - start);
 }
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h
index 5d09185b9ae..caaf08b425a 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h
@@ -51,7 +51,7 @@ public:
   virtual void print_usage (void);
   virtual void print_args (void) const;
 
-  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
+  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
   // Don't run the suppliers, just test connect and disconnect calls.
 
   virtual void dump_results (void);
@@ -59,19 +59,19 @@ public:
   virtual void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     int i
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
   virtual void connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
     int i
-    TAO_ENV_ARG_DECL);
-  virtual void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL);
-  virtual void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+    ACE_ENV_ARG_DECL);
+  virtual void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
 
   virtual EC_Consumer* allocate_consumer (int i);
   virtual EC_Supplier* allocate_supplier (int i);
 
-  virtual void connect_clients (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
-  virtual void disconnect_clients (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void connect_clients (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void disconnect_clients (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   ACE_hrtime_t start_time_;
@@ -95,11 +95,11 @@ public:
       RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
       const RtecEventChannelAdmin::ConsumerQOS& qos,
       int shutdown_event_type
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
   virtual void connect (
       const RtecEventChannelAdmin::ConsumerQOS& qos,
       int shutdown_event_type
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
   virtual void dump_results (const char* name,
                              ACE_UINT32 global_scale_factor);
 
@@ -118,11 +118,11 @@ public:
         RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
         const RtecEventChannelAdmin::SupplierQOS& qos,
         int shutdown_event_type
-        TAO_ENV_ARG_DECL);
+        ACE_ENV_ARG_DECL);
   virtual void connect (
       const RtecEventChannelAdmin::SupplierQOS& qos,
       int shutdown_event_type
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
   virtual void dump_results (const char* name,
                              ACE_UINT32 global_scale_factor);
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index 8d01cace479..cb09add9977 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -54,10 +54,10 @@ EC_Inversion::parse_args (int &argc, char *argv [])
 }
 
 void
-EC_Inversion::connect_consumers (TAO_ENV_SINGLE_ARG_DECL)
+EC_Inversion::connect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ConsumerQOS_Factory qos0;
@@ -68,7 +68,7 @@ EC_Inversion::connect_consumers (TAO_ENV_SINGLE_ARG_DECL)
   this->consumers_[0]->connect (consumer_admin.in (),
                                 qos0.get_ConsumerQOS (),
                                 ACE_ES_EVENT_UNDEFINED + 1
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 
   for (int i = 1; i < this->n_consumers_; ++i)
     {
@@ -84,17 +84,17 @@ EC_Inversion::connect_consumers (TAO_ENV_SINGLE_ARG_DECL)
       this->consumers_[i]->connect (consumer_admin.in (),
                                     qos1.get_ConsumerQOS (),
                                     base_event + 1
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     }
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Inversion (%P|%t) connected consumer(s)\n"));
 }
 
 void
-EC_Inversion::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+EC_Inversion::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_SupplierQOS_Factory qos0;
@@ -104,7 +104,7 @@ EC_Inversion::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
   this->suppliers_[0]->connect (supplier_admin.in (),
                                 qos0.get_SupplierQOS (),
                                 ACE_ES_EVENT_UNDEFINED + 1
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 
   for (int j = 1; j != this->n_suppliers_; ++j)
     {
@@ -119,7 +119,7 @@ EC_Inversion::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
       this->suppliers_[j]->connect (supplier_admin.in (),
                                     qos1.get_SupplierQOS (),
                                     base_event + 1
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     }
 
   if (this->verbose ())
@@ -127,7 +127,7 @@ EC_Inversion::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Inversion::activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Inversion::activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   int priority;
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.h b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
index 4f9bc592bfc..6811eb6c794 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
@@ -41,14 +41,14 @@ public:
   // The options controlling the event types are ignored, and only two
   // consumers are created.
 
-  virtual void connect_consumers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  virtual void connect_suppliers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void connect_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void connect_suppliers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // In this test there are two consumers, the high priority consumer
   // receives only events from a single high priority supplier.  The
   // other consumer receives events from a set of low priority
   // suppliers.
 
-  virtual void activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  virtual void activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Activate the suppliers at different priorities
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 6debc2655ba..8ab0220c0d8 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -49,18 +49,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 (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::Object_var manager_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 (manager_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -71,11 +71,11 @@ main (int argc, char *argv [])
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_scope
-                            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;
 #else
       ACE_DEBUG ((LM_DEBUG,
@@ -84,7 +84,7 @@ main (int argc, char *argv [])
 #endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -93,14 +93,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -108,12 +108,12 @@ main (int argc, char *argv [])
 
       // Get the event channel object reference
       CORBA::Object_var object =
-        orb->string_to_object (ec_ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ec_ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
         RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (ec.in ()))
         {
@@ -135,15 +135,15 @@ main (int argc, char *argv [])
       // Connect the consumer
 
       RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier =
-        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushConsumer_var consumer_reference =
-        consumer._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        consumer._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Simple subscription, but usually the helper classes in
@@ -162,7 +162,7 @@ main (int argc, char *argv [])
 
       proxy_supplier->connect_push_consumer (consumer_reference.in (),
                                              consumer_qos
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Connected consumer\n"));
@@ -172,15 +172,15 @@ main (int argc, char *argv [])
 
       // The canonical protocol to connect to the EC
       RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::ProxyPushConsumer_var proxy_consumer =
-        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventComm::PushSupplier_var supplier_reference =
-        supplier._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        supplier._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Simple publication, but usually the helper classes in
@@ -194,7 +194,7 @@ main (int argc, char *argv [])
 
       proxy_consumer->connect_push_supplier (supplier_reference.in (),
                                              supplier_qos
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Connected supplier\n"));
@@ -207,7 +207,7 @@ main (int argc, char *argv [])
       while (!task.done () || !consumer.done ())
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv TAO_ENV_ARG_PARAMETER);
+          orb->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -238,24 +238,24 @@ main (int argc, char *argv [])
 
       ACE_DEBUG ((LM_DEBUG, "Throughtput: %f\n", throughput));
 
-      proxy_supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy_supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      proxy_consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      proxy_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id;
 
-      id = root_poa->servant_to_id (&consumer TAO_ENV_ARG_PARAMETER);
+      id = root_poa->servant_to_id (&consumer ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      id = root_poa->servant_to_id (&supplier TAO_ENV_ARG_PARAMETER);
-      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      id = root_poa->servant_to_id (&supplier ACE_ENV_ARG_PARAMETER);
+      root_poa->deactivate_object (id.in () 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_CATCH (CORBA::Exception, ex)
@@ -323,7 +323,7 @@ EC_Latency_Consumer::done (void)
 
 void
 EC_Latency_Consumer::push (const RtecEventComm::EventSet& events
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t creation;
@@ -343,7 +343,7 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-EC_Latency_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Latency_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -355,7 +355,7 @@ EC_Latency_Supplier::EC_Latency_Supplier (void)
 }
 
 void
-EC_Latency_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Latency_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -393,7 +393,7 @@ Task::svc (void)
           ACE_hrtime_t creation = ACE_OS::gethrtime ();
           ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                          creation);
-          this->consumer_->push (event TAO_ENV_ARG_PARAMETER);
+          this->consumer_->push (event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_Time_Value tv (0, 5000);
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h
index 4d9b2287736..3b6880e36b5 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h
@@ -40,9 +40,9 @@ public:
   int done (void);
 
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -64,7 +64,7 @@ public:
   /// Constructor
   EC_Latency_Supplier (void);
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 30b38cfe38a..d9b322e648e 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -48,18 +48,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 (TAO_HAS_CORBA_MESSAGING == 1)
       CORBA::Object_var manager_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 (manager_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -70,11 +70,11 @@ main (int argc, char *argv [])
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_scope
-                            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;
 #else
       ACE_DEBUG ((LM_DEBUG,
@@ -83,7 +83,7 @@ main (int argc, char *argv [])
 #endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -92,14 +92,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -108,15 +108,15 @@ main (int argc, char *argv [])
       TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
                                             root_poa.in ());
       TAO_EC_Event_Channel ec_impl (attr);
-      ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ior_file_name != 0)
@@ -131,15 +131,15 @@ main (int argc, char *argv [])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&ec_impl TAO_ENV_ARG_PARAMETER);
-      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+        root_poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER);
+      root_poa->deactivate_object (id.in () 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_CATCH (CORBA::Exception, ex)
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index 5955b95febc..1ebbb09a649 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -47,9 +47,9 @@ EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes&)
 }
 
 void
-EC_Throughput::execute_test (TAO_ENV_SINGLE_ARG_DECL)
+EC_Throughput::execute_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
index 8d8b222b3b2..f3d5ee6cc04 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
@@ -44,7 +44,7 @@ public:
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
   // set the throughpution flags
 
-  void execute_test (TAO_ENV_SINGLE_ARG_DECL);
+  void execute_test (ACE_ENV_SINGLE_ARG_DECL);
   // Don't run the suppliers, just test connect and disconnect calls.
 
   void dump_results (void);
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index c8fdfc9a2f5..ed9c16e3de3 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -23,20 +23,20 @@ EC_Consumer::connect (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     const RtecEventChannelAdmin::ConsumerQOS& qos,
     int shutdown_event_type
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->connect (qos, shutdown_event_type TAO_ENV_ARG_PARAMETER);
+  this->connect (qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
 }
 
 void
 EC_Consumer::connect (
     const RtecEventChannelAdmin::ConsumerQOS& qos,
     int shutdown_event_type
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return; // @@ Throw?
@@ -45,14 +45,14 @@ EC_Consumer::connect (
 
   if (CORBA::is_nil (this->myself_.in ()))
     {
-      this->myself_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->myself_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   this->is_active_ = 1;
 
   this->supplier_proxy_->connect_push_consumer (this->myself_.in (),
                                                 qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -63,12 +63,12 @@ EC_Consumer::connected (void) const
 }
 
 void
-EC_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+EC_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
@@ -76,19 +76,19 @@ EC_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Consumer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+EC_Consumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!this->is_active_)
     return;
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->myself_ = RtecEventComm::PushConsumer::_nil ();
   this->is_active_ = 0;
@@ -109,10 +109,10 @@ EC_Consumer::accumulate (ACE_Throughput_Stats& throughput) const
 
 void
 EC_Consumer::push (const RtecEventComm::EventSet& events
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->consumer_push (this->cookie_, events TAO_ENV_ARG_PARAMETER);
+  this->driver_->consumer_push (this->cookie_, events ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (events.length () == 0)
@@ -149,16 +149,16 @@ EC_Consumer::push (const RtecEventComm::EventSet& events
                                 now - creation);
 
       if (e.header.type == this->shutdown_event_type_)
-        this->driver_->consumer_shutdown (this->cookie_ TAO_ENV_ARG_PARAMETER);
+        this->driver_->consumer_shutdown (this->cookie_ ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-EC_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+EC_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->consumer_disconnect (this->cookie_ TAO_ENV_ARG_PARAMETER);
+  this->driver_->consumer_disconnect (this->cookie_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index 8aaaed1d37f..9bb507daf0f 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -48,14 +48,14 @@ public:
       RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
       const RtecEventChannelAdmin::ConsumerQOS& qos,
       int shutdown_event_type
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
   // The driver program can build the QoS attributes and obtain the
   // ConsumerAdmin, we do the rest.
 
   virtual void connect (
       const RtecEventChannelAdmin::ConsumerQOS& qos,
       int shutdown_event_type
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
   // The driver program can build the QoS attributes and we use
   // whatevet supplier_proxy we already have (useful for reconnection
   // tests).
@@ -63,11 +63,11 @@ public:
   virtual int connected (void) const;
   // returns 0 if it is not connected
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // The application can invoke this method to disconnect from the EC
   // and deactivate this class.
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // The application is shutting down, deactivate the consumer.
 
   void accumulate (ACE_Throughput_Stats& throughput) const;
@@ -80,9 +80,9 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index cfb93e722cf..27d761b753a 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -14,50 +14,50 @@ EC_Counting_Consumer::EC_Counting_Consumer (const char* name)
 void
 EC_Counting_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
                    const RtecEventChannelAdmin::ConsumerQOS &qos
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   // The canonical protocol to connect to the EC
 
   RtecEventComm::PushConsumer_var consumer =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     {
       this->supplier_proxy_ =
-        consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+        consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->supplier_proxy_->connect_push_consumer (consumer.in (),
                                                 qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Counting_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+EC_Counting_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->supplier_proxy_.in ()))
     {
-      this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       this->supplier_proxy_ =
         RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
     }
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-EC_Counting_Consumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+EC_Counting_Consumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var consumer_poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER);
+  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
@@ -84,7 +84,7 @@ EC_Counting_Consumer::dump_results (int expected_count, int tolerance)
 
 void
 EC_Counting_Consumer::push (const RtecEventComm::EventSet& events
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (events.length () == 0)
@@ -107,7 +107,7 @@ EC_Counting_Consumer::push (const RtecEventComm::EventSet& events
 }
 
 void
-EC_Counting_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Counting_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
index 1a87e648171..83de36443e9 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
@@ -40,9 +40,9 @@ public:
 
   void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
                 const RtecEventChannelAdmin::ConsumerQOS &qos
-                TAO_ENV_ARG_DECL);
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
+                ACE_ENV_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
   // Simple connect/disconnect methods..
 
   void dump_results (int expected_count, int tolerance);
@@ -52,9 +52,9 @@ public:
   // = The RtecEventComm::PushConsumer methods
 
   virtual void push (const RtecEventComm::EventSet& events
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 696cf024273..0c9d83d8fcb 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -17,14 +17,14 @@ EC_Counting_Supplier::EC_Counting_Supplier (void)
 void
 EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
                     int milliseconds
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   RtecEventComm::PushConsumer_var consumer =
-    this->consumer_adapter_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->consumer_adapter_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Let's say that the execution time for event 2 is 1
@@ -41,23 +41,23 @@ EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consume
 
   this->supplier_proxy_->connect_push_consumer (consumer.in (),
                                                 consumer_qos.get_ConsumerQOS ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Counting_Supplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+EC_Counting_Supplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POA_var consumer_poa =
-    this->consumer_adapter_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->consumer_adapter_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var consumer_id =
-    consumer_poa->servant_to_id (&this->consumer_adapter_ TAO_ENV_ARG_PARAMETER);
+    consumer_poa->servant_to_id (&this->consumer_adapter_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER);
+  consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -68,7 +68,7 @@ EC_Counting_Supplier::connect (
     int published_type,
     int event_source,
     int event_type
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   this->event_source_ = event_source;
   this->event_type_ = event_type;
@@ -79,48 +79,48 @@ EC_Counting_Supplier::connect (
                        0, 1);
   this->connect (supplier_admin,
                  supplier_qos.get_SupplierQOS ()
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
 EC_Counting_Supplier::connect (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
     const RtecEventChannelAdmin::SupplierQOS &qos
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   RtecEventComm::PushSupplier_var supplier =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     {
       this->consumer_proxy_ =
-        supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+        supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->consumer_proxy_->connect_push_supplier (supplier.in (),
                                                 qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+EC_Counting_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->consumer_proxy_.in ()))
     {
-      this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   PortableServer::POA_var supplier_poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var supplier_id =
-    supplier_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER);
+  supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -129,7 +129,7 @@ EC_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 EC_Counting_Supplier::push (const RtecEventComm::EventSet&
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
@@ -141,19 +141,19 @@ EC_Counting_Supplier::push (const RtecEventComm::EventSet&
   event[0].header.type = this->event_type_;
   event[0].header.ttl = 1;
 
-  this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->event_count++;
 }
 
 void
-EC_Counting_Supplier::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Counting_Supplier::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-EC_Counting_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Counting_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->disconnect_count++;
@@ -176,7 +176,7 @@ EC_Counting_Supplier_Task::svc ()
 {
   ACE_TRY_NEW_ENV
     {
-      this->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -201,13 +201,13 @@ EC_Counting_Supplier_Task::push_count (void)
 }
 
 void
-EC_Counting_Supplier_Task::run (TAO_ENV_SINGLE_ARG_DECL)
+EC_Counting_Supplier_Task::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->event_.length (1);
 
   int stop = 0;
   do {
-    this->supplier_->push (this->event_ TAO_ENV_ARG_PARAMETER);
+    this->supplier_->push (this->event_ ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     // Sleep for a short time to avoid spinning...
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
index 813994c5fc0..16dcdf22acf 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
@@ -43,8 +43,8 @@ public:
 
   void activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
                  int period
-                 TAO_ENV_ARG_DECL);
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
   // Connect as a consumer to receive a TIMEOUT every <period>
   // milliseconds.
   // The class pushes an event (in its supplier role) every time it
@@ -55,21 +55,21 @@ public:
                 int published_type,
                 int event_source,
                 int event_type
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
   void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
                 const RtecEventChannelAdmin::SupplierQOS &qos
-                TAO_ENV_ARG_DECL);
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+                ACE_ENV_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Simple connect/disconnect methods..
 
   void push (const RtecEventComm::EventSet& events
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The Consumer side methods.
 
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The skeleton methods.
 
@@ -108,7 +108,7 @@ public:
   void stop (void);
   CORBA::ULong push_count (void);
 
-  void run (TAO_ENV_SINGLE_ARG_DECL);
+  void run (ACE_ENV_SINGLE_ARG_DECL);
   // Run a single iteration of the test
 
 private:
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index ee0fcaab316..ec5d7342741 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -67,15 +67,15 @@ EC_Driver::run (int argc, char* argv[])
       // test.
       ACE_High_Res_Timer::calibrate ();
 
-      this->run_init (argc, argv TAO_ENV_ARG_PARAMETER);
+      this->run_init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->execute_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->dump_results ();
 
-      this->run_cleanup (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->run_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -92,9 +92,9 @@ EC_Driver::run (int argc, char* argv[])
 
 void
 EC_Driver::run_init (int &argc, char* argv[]
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
-  this->initialize_orb_and_poa (argc, argv TAO_ENV_ARG_PARAMETER);
+  this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->parse_args (argc, argv))
@@ -119,7 +119,7 @@ EC_Driver::run_init (int &argc, char* argv[]
     ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
                                 CORBA::COMPLETED_NO));
 
-  this->initialize_ec_impl (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->allocate_consumers () == -1)
@@ -130,26 +130,26 @@ EC_Driver::run_init (int &argc, char* argv[]
     ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
                                  CORBA::COMPLETED_NO));
 
-  this->connect_clients (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->connect_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Driver::run_cleanup (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::run_cleanup (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect_clients (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->disconnect_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->shutdown_clients (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->destroy_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) channel destroyed\n"));
 
-  this->deactivate_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
@@ -160,25 +160,25 @@ EC_Driver::run_cleanup (TAO_ENV_SINGLE_ARG_DECL)
   this->cleanup_consumers ();
   this->cleanup_ec ();
 
-  this->root_poa_->destroy (0, 0 TAO_ENV_ARG_PARAMETER);
+  this->root_poa_->destroy (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->root_poa_ = PortableServer::POA::_nil ();
 
-  this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   this->orb_ = CORBA::ORB::_nil ();
 }
 
 void
 EC_Driver::initialize_orb_and_poa (int &argc, char* argv[]
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+    CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (poa_object.in ()))
@@ -189,14 +189,14 @@ EC_Driver::initialize_orb_and_poa (int &argc, char* argv[]
     }
 
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -272,12 +272,12 @@ EC_Driver::move_to_rt_class (void)
 }
 
 void
-EC_Driver::initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL)
 {
 #if !defined(EC_DISABLE_REMOTE_EC)
   if (this->use_remote_ec_ == 1)
     {
-      this->obtain_remote_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->obtain_remote_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
     }
@@ -286,21 +286,21 @@ EC_Driver::initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL)
 #if !defined(EC_DISABLE_OLD_EC)
   if (this->use_old_ec_ == 1)
     {
-      this->initialize_old_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->initialize_old_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       return;
     }
 #endif
 
-  this->initialize_new_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->initialize_new_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if !defined(EC_DISABLE_REMOTE_EC)
 void
-EC_Driver::obtain_remote_ec (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::obtain_remote_ec (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::NamingContext_var naming_context =
-    this->get_naming_context (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->get_naming_context (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNaming::Name channel_name (1);
@@ -308,19 +308,19 @@ EC_Driver::obtain_remote_ec (TAO_ENV_SINGLE_ARG_DECL)
   channel_name[0].id = CORBA::string_dup (this->event_service_name_);
 
   CORBA::Object_var tmp =
-    naming_context->resolve (channel_name TAO_ENV_ARG_PARAMETER);
+    naming_context->resolve (channel_name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_channel_ =
-    RtecEventChannelAdmin::EventChannel::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER);
+    RtecEventChannelAdmin::EventChannel::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CosNaming::NamingContext_ptr
-EC_Driver::get_naming_context (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::get_naming_context (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
 
   if (CORBA::is_nil (naming_obj.in ()))
@@ -328,16 +328,16 @@ EC_Driver::get_naming_context (TAO_ENV_SINGLE_ARG_DECL)
                 "EC_Driver (%P|%t) Unable to obtain the "
                 "Naming Service.\n"));
 
-  return CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER);
+  return CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
 }
 #endif
 
 #if !defined(EC_DISABLE_OLD_EC)
 int
-EC_Driver::initialize_old_ec (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::initialize_old_ec (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::NamingContext_var naming_context =
-    this->get_naming_context (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->get_naming_context (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // This is the name we (potentially) register the Scheduling
@@ -358,11 +358,11 @@ EC_Driver::initialize_old_ec (TAO_ENV_SINGLE_ARG_DECL)
 
 
   this->scheduler_ =
-    this->scheduler_impl_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->scheduler_impl_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var str =
-    this->orb_->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ACE_DEBUG ((LM_DEBUG,
               "EC_Driver (%P|%t) The (local) scheduler IOR is <%s>\n",
@@ -385,13 +385,13 @@ EC_Driver::initialize_old_ec (TAO_ENV_SINGLE_ARG_DECL)
                   -1);
 
   this->event_channel_ =
-    this->ec_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 }
 #endif /* */
 
 void
-EC_Driver::initialize_new_ec (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_EC_Event_Channel_Attributes attr (this->root_poa_.in (),
                                         this->root_poa_.in ());
@@ -401,16 +401,16 @@ EC_Driver::initialize_new_ec (TAO_ENV_SINGLE_ARG_DECL)
     new TAO_EC_Event_Channel (attr);
   this->ec_impl_ = ec;
 
-  ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->event_channel_ =
-    this->ec_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Driver::deactivate_ec (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::deactivate_ec (ACE_ENV_SINGLE_ARG_DECL)
 {
 #if !defined(EC_DISABLE_REMOTE_EC)
   if (this->use_remote_ec_ == 1)
@@ -420,12 +420,12 @@ EC_Driver::deactivate_ec (TAO_ENV_SINGLE_ARG_DECL)
   {
     // Deactivate the EC
     PortableServer::POA_var poa =
-      this->ec_impl_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
     PortableServer::ObjectId_var id =
-      poa->servant_to_id (this->ec_impl_ TAO_ENV_ARG_PARAMETER);
+      poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
-    poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+    poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -437,12 +437,12 @@ EC_Driver::deactivate_ec (TAO_ENV_SINGLE_ARG_DECL)
     {
       // Deactivate the Scheduler
       PortableServer::POA_var poa =
-        scheduler_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        scheduler_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (&scheduler_impl TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (&scheduler_impl ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->verbose ())
@@ -452,9 +452,9 @@ EC_Driver::deactivate_ec (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Driver::destroy_ec (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::destroy_ec (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->event_channel_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->event_channel_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -497,45 +497,45 @@ EC_Driver::allocate_supplier (int i)
 }
 
 void
-EC_Driver::connect_clients (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::connect_clients (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Driver::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Driver::shutdown_clients (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::shutdown_clients (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->shutdown_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->shutdown_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Driver::connect_consumers (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::connect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->connect_consumer (consumer_admin.in (), i TAO_ENV_ARG_PARAMETER);
+      this->connect_consumer (consumer_admin.in (), i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   if (this->verbose ())
@@ -546,17 +546,17 @@ void
 EC_Driver::connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     int i
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::ConsumerQOS qos;
   int shutdown_event_type;
-  this->build_consumer_qos (i, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER);
+  this->build_consumer_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumers_[i]->connect (consumer_admin,
                                 qos,
                                 shutdown_event_type
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -564,7 +564,7 @@ EC_Driver::build_consumer_qos (
   int i,
   RtecEventChannelAdmin::ConsumerQOS& qos,
   int& shutdown_event_type
-  TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
   RtecBase::handle_t rt_info = 0;
 
@@ -585,15 +585,15 @@ EC_Driver::build_consumer_qos (
 }
 
 void
-EC_Driver::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->connect_supplier (supplier_admin.in (), i TAO_ENV_ARG_PARAMETER);
+      this->connect_supplier (supplier_admin.in (), i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -605,17 +605,17 @@ void
 EC_Driver::connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
     int i
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   RtecEventChannelAdmin::SupplierQOS qos;
   int shutdown_event_type;
-  this->build_supplier_qos (i, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER);
+  this->build_supplier_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->suppliers_[i]->connect (supplier_admin,
                                 qos,
                                 shutdown_event_type
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -623,7 +623,7 @@ EC_Driver::build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
       int& shutdown_event_type
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
 {
   int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_;
   int supplier_id = i + 1;
@@ -645,12 +645,12 @@ EC_Driver::build_supplier_qos (
 }
 
 void
-EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->allocate_tasks () == -1)
     return;
 
-  this->activate_tasks (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->activate_tasks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose ())
@@ -697,7 +697,7 @@ EC_Driver::allocate_task (int i)
 }
 
 void
-EC_Driver::activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+EC_Driver::activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -723,13 +723,13 @@ EC_Driver::activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-EC_Driver::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->suppliers_ == 0)
     return;
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   if (this->verbose ())
@@ -737,13 +737,13 @@ EC_Driver::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Driver::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->consumers_ == 0)
     return;
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   if (this->verbose ())
@@ -751,13 +751,13 @@ EC_Driver::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Driver::shutdown_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::shutdown_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->suppliers_ == 0)
     return;
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      this->suppliers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->suppliers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   if (this->verbose ())
@@ -765,13 +765,13 @@ EC_Driver::shutdown_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Driver::shutdown_consumers (TAO_ENV_SINGLE_ARG_DECL)
+EC_Driver::shutdown_consumers (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->consumers_ == 0)
     return;
   for (int i = 0; i < this->n_consumers_; ++i)
     {
-      this->consumers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->consumers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   if (this->verbose ())
@@ -1123,24 +1123,24 @@ EC_Driver::decode_supplier_cookie (void* cookie) const
 void
 EC_Driver::consumer_push (void*,
                           const RtecEventComm::EventSet&
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 EC_Driver::consumer_shutdown (void*
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 EC_Driver::consumer_disconnect (void*
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
 EC_Driver::supplier_disconnect (void*
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index 3f94e1f799f..3daa0aa56ce 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -65,14 +65,14 @@ public:
   // Execute the test.
 
   virtual void run_init (int& argc, char* argv[]
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   // The initialization section
 
-  virtual void run_cleanup (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void run_cleanup (ACE_ENV_SINGLE_ARG_DECL);
   // The cleanup section
 
   virtual void initialize_orb_and_poa (int& argc, char* argv[]
-                                       TAO_ENV_ARG_DECL);
+                                       ACE_ENV_ARG_DECL);
   // Initialize the ORB and obtain the RootPOA object
 
   virtual int parse_args (int& argc, char* argv[]);
@@ -87,57 +87,57 @@ public:
   virtual int move_to_rt_class (void);
   // Run the test in the real-time class, return -1 on error.
 
-  virtual void initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL);
   // Construct the EC and its helper objects, also activates the EC in
   // the RootPOA.
 
-  virtual void connect_clients (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void connect_clients (ACE_ENV_SINGLE_ARG_DECL);
   // By default connect the consumers and then the suppliers, other
   // orders should work too.
 
-  virtual void disconnect_clients (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_clients (ACE_ENV_SINGLE_ARG_DECL);
   // By default disconnect the suppliers and then the consumers, other
   // orders should work too.
 
-  virtual void shutdown_clients (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown_clients (ACE_ENV_SINGLE_ARG_DECL);
   // By default deactivate the suppliers and then the consumers, other
   // orders should work too.
 
-  virtual void connect_consumers (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void connect_consumers (ACE_ENV_SINGLE_ARG_DECL);
   // Connect all the consumers, by default it lets each consumer
   // connect itself.
 
   virtual void connect_consumer (
     RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
     int i
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
   // Connect consumer number <i> using the consumer_admin provided.
 
   virtual void build_consumer_qos (
       int i,
       RtecEventChannelAdmin::ConsumerQOS& qos,
       int& shutdown_event_type
-      TAO_ENV_ARG_DECL_NOT_USED);
+      ACE_ENV_ARG_DECL_NOT_USED);
   // Build the QoS requirements for consumer <i>
 
-  virtual void connect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void connect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
   // Connect all the suppliers, by default it lets each supplier
   // connect itself.
 
   virtual void connect_supplier (
     RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
     int i
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
   // Connect supplier number <i> using the supplier_admin provided.
 
   virtual void build_supplier_qos (
       int i,
       RtecEventChannelAdmin::SupplierQOS& qos,
       int& shutdown_event_type
-      TAO_ENV_ARG_DECL_NOT_USED);
+      ACE_ENV_ARG_DECL_NOT_USED);
   // Build the QoS requirements for supplier <i>
 
-  virtual void execute_test (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void execute_test (ACE_ENV_SINGLE_ARG_DECL);
   // Execute the test, by default simply call activate_suppliers()
 
   virtual void dump_results (void);
@@ -145,22 +145,22 @@ public:
   // and consumers, collect the latency and throughput results for
   // each and print the totals too.
 
-  virtual void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect all the consumers.
 
-  virtual void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect all the suppliers.
 
-  virtual void shutdown_consumers (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown_consumers (ACE_ENV_SINGLE_ARG_DECL);
   // Deactivate all the consumers.
 
-  virtual void shutdown_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void shutdown_suppliers (ACE_ENV_SINGLE_ARG_DECL);
   // Deactivate all the suppliers.
 
-  virtual void destroy_ec (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void destroy_ec (ACE_ENV_SINGLE_ARG_DECL);
   // Call EC->destroy
 
-  virtual void deactivate_ec (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void deactivate_ec (ACE_ENV_SINGLE_ARG_DECL);
   // De-activate the EC (and its helper classes).
 
   virtual void cleanup_ec (void);
@@ -180,35 +180,35 @@ public:
 
   virtual void consumer_push (void* consumer_cookie,
                               const RtecEventComm::EventSet& event
-                              TAO_ENV_ARG_DECL);
+                              ACE_ENV_ARG_DECL);
   // One of the consumers in the test has received an event
 
   virtual void consumer_shutdown (void* consumer_cookie
-                                  TAO_ENV_ARG_DECL);
+                                  ACE_ENV_ARG_DECL);
   // One of the consumers has received a shutdown event
 
   virtual void consumer_disconnect (void* consumer_cookie
-                                    TAO_ENV_ARG_DECL);
+                                    ACE_ENV_ARG_DECL);
   // One of the consumers in the test has been disconnected from the EC
 
   virtual void supplier_disconnect (void* supplier_cookie
-                                    TAO_ENV_ARG_DECL);
+                                    ACE_ENV_ARG_DECL);
   // One of the suppliers in the test has been disconnected from the EC
 
 #if !defined(EC_DISABLE_REMOTE_EC)
-  virtual void obtain_remote_ec (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void obtain_remote_ec (ACE_ENV_SINGLE_ARG_DECL);
   // Obtain the EC from the Naming service
 
   virtual CosNaming::NamingContext_ptr
-       get_naming_context (TAO_ENV_SINGLE_ARG_DECL);
+       get_naming_context (ACE_ENV_SINGLE_ARG_DECL);
 #endif
 
 #if !defined(EC_DISABLE_OLD_EC)
-  virtual void initialize_old_ec (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void initialize_old_ec (ACE_ENV_SINGLE_ARG_DECL);
   // Initialize the EC using the old implementation
 #endif
 
-  virtual void initialize_new_ec (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL);
   // Initialize the EC using the old implementation
 
   virtual int allocate_consumers (void);
@@ -223,7 +223,7 @@ public:
   virtual ACE_Task_Base* allocate_task (int i);
   // Allocate one task for supplier number <i>
 
-  virtual void activate_tasks (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void activate_tasks (ACE_ENV_SINGLE_ARG_DECL);
   // Activate all the tasks, by default runs each supplier on its
   // own thread.
 
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index dc58d8ffe24..0eb220e760a 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -24,7 +24,7 @@ EC_Supplier::EC_Supplier (EC_Driver *driver,
 
 void
 EC_Supplier::send_event (int event_number
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
@@ -45,12 +45,12 @@ EC_Supplier::send_event (int event_number
 
   this->event_type (event_number, event[0]);
 
-  this->send_event (event TAO_ENV_ARG_PARAMETER);
+  this->send_event (event ACE_ENV_ARG_PARAMETER);
 }
 
 void
 EC_Supplier::send_event (const RtecEventComm::EventSet& event
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
@@ -69,7 +69,7 @@ EC_Supplier::send_event (const RtecEventComm::EventSet& event
 
   ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-  this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -107,20 +107,20 @@ void
 EC_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
                       const RtecEventChannelAdmin::SupplierQOS& qos,
                       int shutdown_event_type
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+    supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->connect (qos, shutdown_event_type TAO_ENV_ARG_PARAMETER);
+  this->connect (qos, shutdown_event_type ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
                       int shutdown_event_type
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return; // @@ Throw?
@@ -130,24 +130,24 @@ EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
 
   if (CORBA::is_nil (this->myself_.in ()))
     {
-      this->myself_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->myself_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   this->is_active_ = 1;
 
   this->consumer_proxy_->connect_push_supplier (this->myself_.in (),
                                                 qos
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-EC_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+EC_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->consumer_proxy_ =
@@ -155,29 +155,29 @@ EC_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-EC_Supplier::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+EC_Supplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!this->is_active_)
     return;
 
   // Deactivate the servant
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->is_active_ = 0;
   this->myself_ = RtecEventComm::PushSupplier::_nil ();
 }
 
 void
-EC_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+EC_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->driver_->supplier_disconnect (this->cookie_ TAO_ENV_ARG_PARAMETER);
+  this->driver_->supplier_disconnect (this->cookie_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -222,7 +222,7 @@ EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier,
 int
 EC_Supplier_Task::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Initialize a time value to pace the test
   ACE_Time_Value tv (0, this->burst_pause_);
@@ -252,7 +252,7 @@ EC_Supplier_Task::svc (void)
                                              now);
               // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
 
-              this->supplier_->send_event (event TAO_ENV_ARG_PARAMETER);
+              this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
             }
@@ -276,7 +276,7 @@ EC_Supplier_Task::svc (void)
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
                                      now);
-      this->supplier_->send_event (event TAO_ENV_ARG_PARAMETER);
+      this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (SHUTDOWN);
     }
   ACE_CATCH (CORBA::SystemException, sys_ex)
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index d66ab89d90e..9ce8e6b930a 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -54,39 +54,39 @@ public:
   // publications, this is useful for filtering tests.
 
   void send_event (int event_number
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
   // The types of the event is chosen by the driver, based on the
   // cookie and the <event_number>
 
   void send_event (const RtecEventComm::EventSet& event
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
   // Send <event> to the EC.
 
   void send_event (int event_number,
                    const RtecEventComm::Event& event);
   // Set the event type and source in <event>
 
-  void send_shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void send_shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // Send a shutdown event.
 
   virtual void connect (
         RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
         const RtecEventChannelAdmin::SupplierQOS& qos,
         int shutdown_event_type
-        TAO_ENV_ARG_DECL);
+        ACE_ENV_ARG_DECL);
   // Connect using a <supplier_admin> and publications (<qos>)
   // computed by the user
 
   virtual void connect (
         const RtecEventChannelAdmin::SupplierQOS& qos,
         int shutdown_event_type
-        TAO_ENV_ARG_DECL);
+        ACE_ENV_ARG_DECL);
   // Connect using the current consumer_proxy (useful for reconnect test)
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC, also deactivates the object
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the EC, also deactivates the object
 
   virtual void dump_results (const char* name,
@@ -101,7 +101,7 @@ public:
   // Return an event type to push....
 
   // = The PushSupplier methods
-  virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
index 39790e6bf9f..00ab0bec940 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
@@ -42,7 +42,7 @@ public:
   Client_i (CORBA::ORB_ptr orb);
   // Our constructor
 
-  void init (TAO_ENV_SINGLE_ARG_DECL);
+  void init (ACE_ENV_SINGLE_ARG_DECL);
   // Initialize the ORB etc.
 
 private:
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 508bf74dbc1..d5069e49233 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -61,7 +61,7 @@ int
 main (int argc,
       char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   Manager manager;
 
@@ -70,7 +70,7 @@ main (int argc,
       // Initilaize the ORB, POA etc.
       manager.init (argc,
                     argv
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // the command line arguments
@@ -78,13 +78,13 @@ main (int argc,
         return -1;
 
       // Merge the different IORS
-      manager.make_merged_iors (TAO_ENV_SINGLE_ARG_PARAMETER);
+      manager.make_merged_iors (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       cout << "Merged IORS" <<endl;
       // Set properties. This is the most important portion of the
       // test
-      manager.set_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+      manager.set_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       cout << "Set prop" <<endl;
 
@@ -94,7 +94,7 @@ main (int argc,
       // Client, who is going to use the merged IOR
       // Construct that with the managers ORB
       Client_i client_imp (manager.orb ());
-      client_imp.init (TAO_ENV_SINGLE_ARG_PARAMETER);
+      client_imp.init (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -118,58 +118,58 @@ Manager::Manager (void)
 void
 Manager::init (int argc,
                char *argv[]
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
                                 0
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
     this->orb_->resolve_initial_references ("RootPOA"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa_var =
-    PortableServer::POA::_narrow (obj_var.in () TAO_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager_var =
-    root_poa_var->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager_var->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
-Manager::make_merged_iors (TAO_ENV_SINGLE_ARG_DECL)
+Manager::make_merged_iors (ACE_ENV_SINGLE_ARG_DECL)
 {
   // First  server
   object_primary =
     this->orb_->string_to_object (first_ior
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   //Second server
   object_secondary =
     this->orb_->string_to_object (second_ior
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get an object reference for the ORBs IORManipultion object!
   CORBA_Object_ptr IORM =
     this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   iorm =
-    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM TAO_ENV_ARG_PARAMETER);
+    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
@@ -181,14 +181,14 @@ Manager::make_merged_iors (TAO_ENV_SINGLE_ARG_DECL)
 
   // Create a merged set 1;
   merged_set_ =
-    iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER);
+    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Manager::set_properties (TAO_ENV_SINGLE_ARG_DECL)
+Manager::set_properties (ACE_ENV_SINGLE_ARG_DECL)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
 
@@ -216,7 +216,7 @@ Manager::set_properties (TAO_ENV_SINGLE_ARG_DECL)
   // Set the property
   CORBA::Boolean retval = iorm->set_property (&iogr_prop,
                                               this->merged_set_.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Set the primary
@@ -226,7 +226,7 @@ Manager::set_properties (TAO_ENV_SINGLE_ARG_DECL)
       retval = iorm->set_primary (&iogr_prop,
                                   object_secondary.in (),
                                   this->merged_set_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -234,11 +234,11 @@ Manager::set_properties (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Manager::run (TAO_ENV_SINGLE_ARG_DECL)
+Manager::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -287,10 +287,10 @@ Client_i::Client_i (CORBA::ORB_ptr orb)
 
 void
 run_test (Simple_Server_ptr server
-          TAO_ENV_ARG_DECL);
+          ACE_ENV_ARG_DECL);
 
 void
-Client_i::init (TAO_ENV_SINGLE_ARG_DECL)
+Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Open the file for reading.
   ACE_HANDLE f_handle = ACE_OS::open (ior_output_file,
@@ -315,18 +315,18 @@ Client_i::init (TAO_ENV_SINGLE_ARG_DECL)
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
                                 0
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var object =
     this->orb_->string_to_object (data
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Combined IOR stuff
   Simple_Server_var server =
     Simple_Server::_narrow (object.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (server.in ()))
@@ -337,7 +337,7 @@ Client_i::init (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   run_test (server.in ()
-            TAO_ENV_ARG_PARAMETER);
+            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ior_buffer.alloc ()->free (data);
@@ -346,7 +346,7 @@ Client_i::init (TAO_ENV_SINGLE_ARG_DECL)
 
 
 void run_test (Simple_Server_ptr server
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   // We do this twice as we know that there are only two servers.
   for (CORBA::ULong i = 0;
@@ -360,7 +360,7 @@ void run_test (Simple_Server_ptr server
                j++)
             {
               // Make a remote call
-              server->remote_call (TAO_ENV_SINGLE_ARG_PARAMETER);
+              server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -368,7 +368,7 @@ void run_test (Simple_Server_ptr server
                       ACE_TEXT ("*********************************\n")));
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("I am going to shutdown the server\n")));
-          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_OS::sleep (2);
         }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
index a82d46c1537..6e3e2f4d6e3 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h
@@ -44,17 +44,17 @@ public:
 
   void init (int argc,
              char *argv[]
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
   // Initialize the ORB, POA etc.
 
-  int make_merged_iors (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int make_merged_iors (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Merges the different IORS
 
-  int set_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int set_properties (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Sets the properties for the profiles
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the  ORB event loop..
 
   int write_to_file (void);
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index f078943789e..22953a7b8c5 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -35,18 +35,18 @@ main (int argc, char *argv[])
 {
 
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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;
 
       // We do the command line parsing first
       if (parse_args (argc, argv) != 0)
         return 1;
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -55,22 +55,22 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       // Instantiate the LCD_Display implementation class
       Simple_Server_i display_impl (orb.in ());
 
       Simple_Server_var server =
-        display_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        display_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -88,7 +88,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
       }
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb->run ();
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index 31d1e20115b..9813825c275 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -20,7 +20,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 void
-Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -31,7 +31,7 @@ Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_
 
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
index 0c6638822df..f7944307d55 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
@@ -34,10 +34,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void remote_call (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:
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
index 06ba2540fc6..68aeef089c0 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
@@ -32,14 +32,14 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
   ACE_DEBUG ((LM_DEBUG, "Running the IOGRManipulation Tests.\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       CORBA::ORB_var orb_ = CORBA::ORB_init (argc,
                                              argv,
                                              0
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // **********************************************************************
 
@@ -47,23 +47,23 @@ main (int argc, char *argv[])
       CORBA::Object_var IORM =
         orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
                                           0
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_IOP::TAO_IOR_Manipulation_var iorm =
                TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // **********************************************************************
 
       // Create a few fictitious IORs
       CORBA::Object_var name1 =
         orb_->string_to_object ("iiop://acme.cs.wustl.edu:6060/xyz"
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Object_var name2 =
         orb_->string_to_object ("iiop://tango.cs.wustl.edu:7070/xyz"
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **********************************************************************
@@ -75,7 +75,7 @@ main (int argc, char *argv[])
       // **********************************************************************
 
       CORBA::Object_var merged =
-        iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER);
+        iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check for set and get primaries
@@ -84,7 +84,7 @@ main (int argc, char *argv[])
       TAO_FT_IOGR_Property prop (ft_tag_component);
 
       CORBA::Boolean retval =
-        iorm->set_primary (&prop, name2.in (), merged.in () TAO_ENV_ARG_PARAMETER);
+        iorm->set_primary (&prop, name2.in (), merged.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
@@ -100,7 +100,7 @@ main (int argc, char *argv[])
       // Check whether a primary has been set
       retval = iorm->is_primary_set (&prop,
                                      merged.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval)
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
       CORBA::Object_var prim =
         iorm->get_primary (&prop,
                            merged.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check whether we got back the right primary
@@ -160,7 +160,7 @@ main (int argc, char *argv[])
       // Set the property
       retval = iorm->set_property (&prop,
                                    merged.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval)
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
index 727078a3c98..0639cfcefeb 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
@@ -8,7 +8,7 @@ MCast_Server_i::MCast_Server_i (void)
 }
 
 CORBA::Boolean
-MCast_Server_i::connect_server (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+MCast_Server_i::connect_server (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
index e626d3265b6..1056dc77929 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
@@ -11,7 +11,7 @@ public:
 
   // Simple method just to see that the client contacted the
   // server. If does contact, a '0' is returned.
-  CORBA::Boolean connect_server (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Boolean connect_server (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
index e47a63655c0..7a79bec47bc 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
@@ -5,7 +5,7 @@
 int main (int argc, char *argv [])
 {
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -13,7 +13,7 @@ int main (int argc, char *argv [])
       ior_mcast_Client_i client;
 
       int init_result;
-      init_result = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
index b1110e009cb..a07113d7be3 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -16,7 +16,7 @@ ior_mcast_Client_i::~ior_mcast_Client_i (void)
 int
 ior_mcast_Client_i::init (int& argc,
                           char *argv[]
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
 
   ACE_TRY
@@ -26,11 +26,11 @@ ior_mcast_Client_i::init (int& argc,
         CORBA::ORB_init (argc,
                          argv,
                          "" /* the ORB name, it can be anything! */
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var mcast_server_object =
-        orb->resolve_initial_references ("MCASTServer" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("MCASTServer" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (mcast_server_object.in ()))
@@ -39,7 +39,7 @@ ior_mcast_Client_i::init (int& argc,
                           -1);
 
       MCast::Server_var mcast_srvr =
-        MCast::Server::_narrow (mcast_server_object.in () TAO_ENV_ARG_PARAMETER);
+        MCast::Server::_narrow (mcast_server_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (mcast_srvr.in ()))
@@ -49,7 +49,7 @@ ior_mcast_Client_i::init (int& argc,
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        mcast_srvr->connect_server (TAO_ENV_SINGLE_ARG_PARAMETER);
+        mcast_srvr->connect_server (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret_value != 0)
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
index d28da2f6c73..b001a1b6e55 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
@@ -20,10 +20,10 @@ class ior_mcast_Client_i
   ior_mcast_Client_i (void);
   ~ior_mcast_Client_i (void);
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Execute the client example code.
 
-  int init (int& argc, char *argv[] TAO_ENV_ARG_DECL);
+  int init (int& argc, char *argv[] ACE_ENV_ARG_DECL);
   // Initialize the client communication endpoint with the server.
 
  private:
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index f25de786656..829cb75d232 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -4,14 +4,14 @@
 
 int main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       Server_i svr_i;
 
       int init_result;
 
-      init_result = svr_i.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      init_result = svr_i.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (init_result != 0)
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index da83e55d580..365034c059e 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -24,7 +24,7 @@ Server_i::~Server_i (void)
 int
 Server_i::init (int &argc,
                 char **&argv
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -36,26 +36,26 @@ Server_i::init (int &argc,
         CORBA::ORB_init (this->argc_,
                          this->argv_,
                          "" /* the ORB name, it can be anything! */
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a reference to the RootPOA.
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow down to the correct reference.
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Set a POA Manager.
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA Manager.
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior;
@@ -68,11 +68,11 @@ Server_i::init (int &argc,
         server_i._this ();
 
       CORBA::Object_var table_object =
-        this->orb_->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("IORTable" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (adapter.in ()))
@@ -83,20 +83,20 @@ Server_i::init (int &argc,
         {
           ior =
             this->orb_->object_to_string (mcast_server.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          adapter->bind ("MCASTServer", ior.in () TAO_ENV_ARG_PARAMETER);
+          adapter->bind ("MCASTServer", ior.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Enable such that the server can listen for multicast requests
       // at the specified address.
       this->enable_multicast (ior.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //Destroy the POA, waiting until the destruction terminates.
@@ -115,7 +115,7 @@ Server_i::init (int &argc,
 
 int
 Server_i::enable_multicast (const char *ior
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
 {
 
   ACE_TRY
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
index 77b16b86153..17b13ffe207 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
@@ -18,13 +18,13 @@ class Server_i
   Server_i (void);
   ~Server_i (void);
 
-  int init (int &argc, char **&argv TAO_ENV_ARG_DECL_NOT_USED);
+  int init (int &argc, char **&argv ACE_ENV_ARG_DECL_NOT_USED);
   // Initialize the server multicast.
 
  private:
 
   int enable_multicast (const char *ior
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   // Sets the IOR_Multicast class to listen for multicast requests
   // for this server.
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index df08d623bd9..19332dd626c 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -9,11 +9,11 @@ int main (int argc, char *argv[])
 {
   ACE_TRY_NEW_ENV
     {
-      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;
 
       CORBA::Object_var ns_obj =
-        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ns_obj.in ()))
@@ -23,7 +23,7 @@ int main (int argc, char *argv[])
 
       CosNaming::NamingContext_var inc =
         CosNaming::NamingContext::_narrow (ns_obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (inc.in ()))
@@ -35,7 +35,7 @@ int main (int argc, char *argv[])
       name.length (1);
       name[0].id = CORBA::string_dup ("yourself");
 
-      inc->bind (name, ns_obj.in () TAO_ENV_ARG_PARAMETER);
+      inc->bind (name, ns_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Test Successful\n"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 97786e3d430..7bfff820378 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -59,11 +59,11 @@ Airplane_Client_i::get_planes (size_t count)
 {
   for (size_t i = 0; i < count; i++)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
           CORBA::String_var response =
-            this->server_->get_plane (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->server_->get_plane (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "Plane %d is %s\n", i, response.in ()));
@@ -103,14 +103,14 @@ Airplane_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     "internet"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -124,10 +124,10 @@ Airplane_Client_i::init (int argc, char **argv)
                           -1);
 
       CORBA::Object_var server_object =
-        this->orb_->string_to_object (this->server_key_ TAO_ENV_ARG_PARAMETER);
+        this->orb_->string_to_object (this->server_key_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->server_ = Paper_Airplane_Server::_narrow (server_object.in() TAO_ENV_ARG_PARAMETER);
+      this->server_ = Paper_Airplane_Server::_narrow (server_object.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server_object.in ()))
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index 2acd8e75b87..84bda34b57f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -26,7 +26,7 @@ Airplane_i::~Airplane_i (void)
 // Returns a random plane and page number
 
 char *
-Airplane_i::get_plane (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Airplane_i::get_plane (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
index 53e121ba139..10982838106 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *  This class implements a simple CORBA server which returns a random
- *  paper airplane from the book "Oddballs, Wing-Flappers, & Spinners: 
+ *  paper airplane from the book "Oddballs, Wing-Flappers, & Spinners:
  *  Great Paper Airplanes" by John Bringhurst.  ISBN: 0-07-067910-X (pbk.)
  *  An excellent book to have!  I personally recommend getting it just
  *  for the wing-flappers.
@@ -19,7 +19,7 @@
 
 
 #if !defined (AIRPLANE_I_H)
-#define	AIRPLANE_I_H
+#define AIRPLANE_I_H
 
 #include "AirplaneS.h"
 
@@ -41,14 +41,14 @@ typedef Airplane_i_ptr Airplane_i_ref;
 class Airplane_i: public POA_Paper_Airplane_Server
 {
 public:
-  /// Constructor 
+  /// Constructor
   Airplane_i ();
 
   /// Destructor
   ~Airplane_i (void);
 
   /// Returns a random plane.
-  virtual char *get_plane (TAO_ENV_SINGLE_ARG_DECL)
+  virtual char *get_plane (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index f0947997b2d..040e2062f88 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -11,17 +11,17 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "\n\tPaper Airplane Server\n\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int retval = server.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
         return -1;
       else
         {
-          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 2c7e1e9ebb1..c053d0bd0c3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -55,7 +55,7 @@ Airplane_Server_i::parse_args (void)
 }
 
 int
-Airplane_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
+Airplane_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
 {
   // Since the Implementation Repository keys off of the POA name, we need
   // to use the SERVER_NAME as the POA's name.
@@ -64,7 +64,7 @@ Airplane_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
   ACE_TRY
     {
       // Initialize the ORB
-      this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+      this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Save pointers to the command line arguments
@@ -80,7 +80,7 @@ Airplane_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references ("RootPOA"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check the POA object.
@@ -91,11 +91,11 @@ Airplane_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
 
       // Narrow the object to a POA.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_Manager.
-      this->poa_manager_ = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->poa_manager_ = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We now need to create a POA with the persistent and user_id policies,
@@ -106,31 +106,31 @@ Airplane_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
 
       policies[0] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK
 
       policies[1] =
         root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->airplane_poa_ =
         root_poa->create_POA (poa_name,
                               this->poa_manager_.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Make sure the POA manager is activated.
-      this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_NEW_RETURN (this->server_impl_,
@@ -142,18 +142,18 @@ Airplane_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
 
       this->airplane_poa_->activate_object_with_id (server_id.in (),
                                                     this->server_impl_
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var server_obj =
         this->airplane_poa_->id_to_reference (server_id.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create an IOR from the server object.
       CORBA::String_var server_str =
         this->orb_->object_to_string (server_obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (TAO_debug_level > 0)
@@ -161,11 +161,11 @@ Airplane_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
 
       CORBA::Object_var table_object =
         this->orb_->resolve_initial_references ("IORTable"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -173,7 +173,7 @@ Airplane_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
         }
       else
         {
-          adapter->bind (poa_name, server_str.in () TAO_ENV_ARG_PARAMETER);
+          adapter->bind (poa_name, server_str.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -196,11 +196,11 @@ Airplane_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
 }
 
 int
-Airplane_Server_i::run (TAO_ENV_SINGLE_ARG_DECL)
+Airplane_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -221,7 +221,7 @@ Airplane_Server_i::~Airplane_Server_i (void)
     {
     if (!CORBA::is_nil (this->airplane_poa_.in ()))
       {
-        this->airplane_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+        this->airplane_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
index 19880a002c3..62e49487264 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
@@ -40,10 +40,10 @@ public:
   ~Airplane_Server_i (void);
 
   /// Initialize the Server state - parsing arguments and waiting
-  int init (int argc, char **argv TAO_ENV_ARG_DECL);
+  int init (int argc, char **argv ACE_ENV_ARG_DECL);
 
   /// Run the orb
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index 15205c9dcc3..17181b8d393 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -87,14 +87,14 @@ Nestea_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     "internet"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -108,10 +108,10 @@ Nestea_Client_i::init (int argc, char **argv)
                           -1);
 
       CORBA::Object_var server_object =
-        this->orb_->string_to_object (this->server_key_ TAO_ENV_ARG_PARAMETER);
+        this->orb_->string_to_object (this->server_key_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->server_ = Nestea_Bookshelf::_narrow (server_object.in() TAO_ENV_ARG_PARAMETER);
+      this->server_ = Nestea_Bookshelf::_narrow (server_object.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server_object.in ()))
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 56d0454efd8..486bec31f4d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -35,7 +35,7 @@ Nestea_i::~Nestea_i (void)
 
 void
 Nestea_i::drink (CORBA::Long cans
-                 TAO_ENV_ARG_DECL_NOT_USED)
+                 ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
@@ -51,7 +51,7 @@ Nestea_i::drink (CORBA::Long cans
 
 void
 Nestea_i::crush (CORBA::Long cans
-                 TAO_ENV_ARG_DECL_NOT_USED)
+                 ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
@@ -69,7 +69,7 @@ Nestea_i::crush (CORBA::Long cans
 // Returns the number of cans in the bookshelf.
 
 CORBA::Long
-Nestea_i::bookshelf_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Nestea_i::bookshelf_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
@@ -81,7 +81,7 @@ Nestea_i::bookshelf_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Returns comments about your collection.
 
 char *
-Nestea_i::get_praise (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Nestea_i::get_praise (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
index 88c2da374b4..c4bd90127d2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
@@ -46,20 +46,20 @@ public:
 
   /// Add <cans> number of cans to the bookshelf.
   virtual void drink (CORBA::Long cans
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Removes <cans> number of cans from the bookshelf.
   virtual void crush (CORBA::Long cans
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the number of cans in the bookshelf.
-  virtual CORBA::Long bookshelf_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Long bookshelf_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns comments about your collection.
-  virtual char *get_praise (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char *get_praise (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index 48bf74ed1a7..51a8ec71ebe 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -11,17 +11,17 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Server\n\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int retval = server.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
         return -1;
       else
         {
-          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index 40ced68ec1e..d1e1b5d6aea 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -27,7 +27,7 @@ Nestea_Server_i::~Nestea_Server_i (void)
     {
       if (!CORBA::is_nil (this->nestea_poa_.in ()))
         {
-          this->nestea_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+          this->nestea_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -86,7 +86,7 @@ Nestea_Server_i::parse_args (void)
 // - Creates an IOR from the servant and outputs it to a file
 
 int
-Nestea_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
+Nestea_Server_i::init (int argc, char** argv ACE_ENV_ARG_DECL)
 {
   // Since the Implementation Repository keys off of the POA name, we need
   // to use the SERVER_NAME as the POA's name.
@@ -95,7 +95,7 @@ Nestea_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
   ACE_TRY
     {
       // Initialize the ORB
-      this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+      this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Save pointers to the command line arguments
@@ -111,7 +111,7 @@ Nestea_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references ("RootPOA"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check the POA object.
@@ -122,11 +122,11 @@ Nestea_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
 
       // Narrow the object to a POA.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_Manager.
-      this->poa_manager_ = root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->poa_manager_ = root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We now need to create a POA with the persistent and user_id policies,
@@ -137,31 +137,31 @@ Nestea_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
 
       policies[0] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK
 
       policies[1] =
         root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->nestea_poa_ =
         root_poa->create_POA (poa_name,
                               this->poa_manager_.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of the new POA is over, so destroy the Policy_ptr's.
       for (CORBA::ULong i = 0; i < policies.length (); ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Make sure the POA manager is activated.
-      this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_NEW_RETURN (this->server_impl_,
@@ -173,18 +173,18 @@ Nestea_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
 
       this->nestea_poa_->activate_object_with_id (server_id.in (),
                                                   this->server_impl_
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var server_obj =
         this->nestea_poa_->id_to_reference (server_id.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create an IOR from the server object.
       CORBA::String_var server_str =
         this->orb_->object_to_string (server_obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (TAO_debug_level > 0)
@@ -192,11 +192,11 @@ Nestea_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
 
       CORBA::Object_var table_object =
         this->orb_->resolve_initial_references ("IORTable"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (adapter.in ()))
         {
@@ -204,7 +204,7 @@ Nestea_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
         }
       else
         {
-          adapter->bind (poa_name, server_str.in () TAO_ENV_ARG_PARAMETER);
+          adapter->bind (poa_name, server_str.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -227,13 +227,13 @@ Nestea_Server_i::init (int argc, char** argv TAO_ENV_ARG_DECL)
 }
 
 int
-Nestea_Server_i::run (TAO_ENV_SINGLE_ARG_DECL)
+Nestea_Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   int status = 0;
 
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
index e4ba216abe9..790731dddff 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
@@ -40,10 +40,10 @@ public:
   ~Nestea_Server_i (void);
 
   /// Initialize the Server state - parsing arguments and waiting
-  int init (int argc, char **argv TAO_ENV_ARG_DECL);
+  int init (int argc, char **argv ACE_ENV_ARG_DECL);
 
   /// Run the orb
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// Parses the commandline arguments.
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
index b6d30158d55..d946e668daa 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
@@ -10,19 +10,19 @@ main (int argc, char *argv[])
 {
   IFR_DII_Client client;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       if (client.init (argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER)
+                       ACE_ENV_ARG_PARAMETER)
            == -1)
         {
           return 1;
         }
       else
         {
-          client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index 356cc1401ce..728b64f2a41 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -21,12 +21,12 @@ IFR_DII_Client::~IFR_DII_Client (void)
 int
 IFR_DII_Client::init (int argc,
                       char *argv[]
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
                                 0
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // In a reall application, we would get the scoped or
@@ -36,7 +36,7 @@ IFR_DII_Client::init (int argc,
   // we just use the IOR which is stored in a file by the server.
   this->target_ =
     this->orb_->string_to_object ("file://iorfile"
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->parse_args (argc, argv) == -1)
@@ -48,26 +48,26 @@ IFR_DII_Client::init (int argc,
 }
 
 int
-IFR_DII_Client::run (TAO_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->lookup_by_name_)
     {
-      this->lookup_interface_def (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->lookup_interface_def (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   else
     {
-      this->find_interface_def (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->find_interface_def (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
-  this->get_operation_def (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->get_operation_def (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->create_dii_request (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->create_dii_request (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->invoke_and_display (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->invoke_and_display (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -100,22 +100,22 @@ IFR_DII_Client::parse_args (int argc,
 }
 
 void
-IFR_DII_Client::find_interface_def (TAO_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::find_interface_def (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->target_def_ = 
-    this->target_->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->target_def_ =
+    this->target_->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-IFR_DII_Client::lookup_interface_def (TAO_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var obj =
     this->orb_->resolve_initial_references ("InterfaceRepository"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->repo_ = CORBA::Repository::_narrow (obj.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Is there a contained object of some kind at any level in the
@@ -125,7 +125,7 @@ IFR_DII_Client::lookup_interface_def (TAO_ENV_SINGLE_ARG_DECL)
                               -1,               // Unlimited level recursion.
                               CORBA::dk_all,    // Any type of contained object.
                               1                 // Exclude parents of interfaces.
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = candidates->length ();
@@ -140,7 +140,7 @@ IFR_DII_Client::lookup_interface_def (TAO_ENV_SINGLE_ARG_DECL)
     {
       candidate =
         CORBA::Container::_narrow (candidates[i].in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Is this contained item itself a container?
@@ -149,7 +149,7 @@ IFR_DII_Client::lookup_interface_def (TAO_ENV_SINGLE_ARG_DECL)
           // Does this container contain any interfaces?
           interfaces = candidate->contents (CORBA::dk_Interface,
                                             1     // Exclude parents.
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           n_interfaces = interfaces->length ();
@@ -170,27 +170,27 @@ IFR_DII_Client::lookup_interface_def (TAO_ENV_SINGLE_ARG_DECL)
   // be any length.
   for (CORBA::ULong j = 0; j < n_interfaces; ++j)
     {
-      name = interfaces[j]->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      name = interfaces[j]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!ACE_OS::strcmp (name.in (), this->interface_name.in ()))
         {
           this->target_def_ =
             CORBA::InterfaceDef::_narrow (interfaces[j].in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 }
 
 void
-IFR_DII_Client::get_operation_def (TAO_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::get_operation_def (ACE_ENV_SINGLE_ARG_DECL)
 {
   // What operation(s) does this interface contain?
   CORBA::ContainedSeq_var operations =
     this->target_def_->contents (CORBA::dk_Operation,
                                  0  // Do not exclude inherited operations.
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong n_operations = operations->length ();
@@ -200,14 +200,14 @@ IFR_DII_Client::get_operation_def (TAO_ENV_SINGLE_ARG_DECL)
   // be any length.
   for (CORBA::ULong i = 0; i < n_operations; ++i)
     {
-      operation_name = operations[i]->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      operation_name = operations[i]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!ACE_OS::strcmp (operation_name.in (), this->op_name.in ()))
         {
           this->op_ =
             CORBA::OperationDef::_narrow (operations[i].in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           break;
@@ -216,18 +216,18 @@ IFR_DII_Client::get_operation_def (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-IFR_DII_Client::create_dii_request (TAO_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::create_dii_request (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->req_ = this->target_->_request (this->op_name.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->result_ = this->op_->result (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->result_ = this->op_->result (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->req_->set_return_type (this->result_.in ());
 
-  CORBA::ParDescriptionSeq_var params = this->op_->params (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ParDescriptionSeq_var params = this->op_->params (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = params->length ();
@@ -273,7 +273,7 @@ IFR_DII_Client::create_dii_request (TAO_ENV_SINGLE_ARG_DECL)
                 this->req_->arguments ()->add_value (params[i].name.in (),
                                                      any,
                                                      CORBA::ARG_OUT
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
                 ACE_CHECK;
               }
 
@@ -284,9 +284,9 @@ IFR_DII_Client::create_dii_request (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-IFR_DII_Client::invoke_and_display (TAO_ENV_SINGLE_ARG_DECL)
+IFR_DII_Client::invoke_and_display (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->req_->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->req_->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var tc = this->req_->return_value ().type ();
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
index 0e829e77eb7..a1282935808 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h
@@ -20,10 +20,10 @@ public:
 
   int init (int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the client.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the client.
 
 private:
@@ -31,20 +31,20 @@ private:
                   char *argv[]);
   // Process the command line arguments.
 
-  void find_interface_def (TAO_ENV_SINGLE_ARG_DECL);
+  void find_interface_def (ACE_ENV_SINGLE_ARG_DECL);
   // Query the object reference to get its InterfaceDef in the IFR.
 
-  void lookup_interface_def (TAO_ENV_SINGLE_ARG_DECL);
+  void lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL);
   // Look up the InterfaceDef by name in the IFR.
 
-  void get_operation_def (TAO_ENV_SINGLE_ARG_DECL);
+  void get_operation_def (ACE_ENV_SINGLE_ARG_DECL);
   // Find the desired operation in the interface definition.
 
-  void create_dii_request (TAO_ENV_SINGLE_ARG_DECL);
+  void create_dii_request (ACE_ENV_SINGLE_ARG_DECL);
   // Query the interface definition to get the info needed
   // to construct a CORBA::Request.
 
-  void invoke_and_display (TAO_ENV_SINGLE_ARG_DECL);
+  void invoke_and_display (ACE_ENV_SINGLE_ARG_DECL);
   // Do the invocation and display the results.
 
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index fe9bac72a49..3d8196ba859 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -45,35 +45,35 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             ""
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_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 (poa_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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       inventory_i servant_impl;
 
       warehouse::inventory_var servant =
-        servant_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (servant.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int write_result = write_ior_to_file (ior.in ());
@@ -90,12 +90,12 @@ main (int argc, char *argv[])
                   "IOR is: <%s>\n",
                   ior.in ()));
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
index 3191162c35b..a8e20d8c503 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.cpp
@@ -9,7 +9,7 @@ CORBA::Boolean
 inventory_i::getCDinfo (const char * artist,
                         char *& title,
                         CORBA::Float_out price
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean in_stock = 0;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
index acd62f8d1dc..2e3a4164285 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/test_i.h
@@ -13,7 +13,7 @@ public:
   CORBA::Boolean getCDinfo (const char * artist,
                             char *& title,
                             CORBA::Float_out price
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index 959b01cc9df..89544592930 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -56,7 +56,7 @@ Admin_Client::init (int argc,
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     0
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int retval = this->parse_args (argc,
@@ -67,7 +67,7 @@ Admin_Client::init (int argc,
 
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("InterfaceRepository"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -82,7 +82,7 @@ Admin_Client::init (int argc,
 
       this->repo_ =
         CORBA::Repository::_narrow (object.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->repo_.in ()))
@@ -117,7 +117,7 @@ Admin_Client::run (void)
               // CORBA::BAD_PARAM exception the second time.
               for (CORBA::ULong j = 0; j < this->iterations_; ++j)
                 {
-                  (this->*test_array_[i])(TAO_ENV_SINGLE_ARG_PARAMETER);
+                  (this->*test_array_[i])(ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -126,7 +126,7 @@ Admin_Client::run (void)
         {
           for (CORBA::ULong j = 0; j < this->iterations_; ++j)
             {
-              (this->*test_array_[this->which_test_])(TAO_ENV_SINGLE_ARG_PARAMETER);
+              (this->*test_array_[this->which_test_])(ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -193,7 +193,7 @@ Admin_Client::parse_args (int argc,
 }
 
 void
-Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL)
+Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -201,15 +201,15 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL)
     ));
 
   CORBA::IDLType_var atype = this->repo_->create_string (7
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ArrayDef_var avar = this->repo_->create_array (5,
                                                         atype.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong bound = avar->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong bound = avar->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -219,10 +219,10 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (bound == 5);
 
-  CORBA::TypeCode_var tc = avar->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = avar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -232,9 +232,9 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_array);
 
-  tc = avar->element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  tc = avar->element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -244,9 +244,9 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_string);
 
-  CORBA::IDLType_var tdef = avar->element_type_def (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::IDLType_var tdef = avar->element_type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  CORBA::DefinitionKind dk = tdef->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind dk = tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -259,9 +259,9 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (dk == CORBA::dk_String);
 
   CORBA::StringDef_var pvar = CORBA::StringDef::_narrow (tdef.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  bound = pvar->bound (TAO_ENV_SINGLE_ARG_PARAMETER);
+  bound = pvar->bound (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -273,19 +273,19 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::PrimitiveDef_var pdef =
     this->repo_->get_primitive (CORBA::pk_short
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   avar->element_type_def (pdef.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ArrayDef::element_type_def (set)\n")));
 
-  tc = avar->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  tc = avar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -295,9 +295,9 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_array);
 
-  tdef = avar->element_type_def (TAO_ENV_SINGLE_ARG_PARAMETER);
+  tdef = avar->element_type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  dk = tdef->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  dk = tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -309,9 +309,9 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::PrimitiveDef_var zvar =
     CORBA::PrimitiveDef::_narrow (tdef.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  CORBA::PrimitiveKind pkind = zvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::PrimitiveKind pkind = zvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -321,12 +321,12 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (pkind == CORBA::pk_short);
 
-  avar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  avar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
+Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -344,10 +344,10 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
                                                       "my_enum",
                                                       "1.0",
                                                       members
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var str = evar->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var str = evar->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -357,7 +357,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0"));
 
-  str = evar->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = evar->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -367,7 +367,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_enum"));
 
-  str = evar->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = evar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -377,7 +377,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_enum"));
 
-  str = evar->version (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = evar->version (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -387,7 +387,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.0"));
 
-  CORBA::DefinitionKind dkind = evar->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind dkind = evar->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -397,7 +397,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (dkind == CORBA::dk_Enum);
 
-  CORBA::Contained::Description_var desc = evar->describe (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Contained::Description_var desc = evar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   dkind = desc->kind;
@@ -440,7 +440,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (td->version, "1.0"));
 
-  CORBA::TCKind kind = td->type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -450,7 +450,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_enum);
 
-  str = td->type->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = td->type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -460,7 +460,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0"));
 
-  str = td->type->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = td->type->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -485,7 +485,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < count; i++)
     {
-      str = td->type->member_name (i TAO_ENV_ARG_PARAMETER);
+      str = td->type->member_name (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -506,14 +506,14 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
   members[3] = CORBA::string_dup ("TRINITY");
 
   evar->members (members
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("\nEnumDef::members (set)\n\n")));
 
-  CORBA::EnumMemberSeq_var fellows = evar->members (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::EnumMemberSeq_var fellows = evar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   count = fellows->length ();
@@ -534,9 +534,9 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   evar->name ("another_enum"
-              TAO_ENV_ARG_PARAMETER);
+              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  str = evar->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = evar->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -550,7 +550,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "another_enum"));
 
-  str = evar->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = evar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -560,12 +560,12 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::another_enum"));
 
-  evar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  evar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
+Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -575,13 +575,13 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
   // This test also tests WstringDef and SequenceDef.
 
   CORBA::IDLType_var sq_elem = this->repo_->create_wstring (7
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::SequenceDef_var sq_var =
     this->repo_->create_sequence (5,
                                   sq_elem.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::AliasDef_var a_var =
@@ -589,10 +589,10 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
                                "my_alias",
                                "1.0",
                                sq_var.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var str = a_var->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var str = a_var->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -602,7 +602,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0"));
 
-  str = a_var->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = a_var->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -612,7 +612,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias"));
 
-  str = a_var->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = a_var->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -622,7 +622,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_alias"));
 
-  str = a_var->version (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = a_var->version (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -637,10 +637,10 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
                 ACE_TEXT ("AliasDef::version (set)\n")));
 
   a_var->version ("1.1"
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = a_var->version (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = a_var->version (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -650,10 +650,10 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.1"));
 
-  CORBA::TypeCode_var tc = a_var->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = a_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -663,7 +663,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias"));
 
-  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -673,10 +673,10 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_alias);
 
-  CORBA::TypeCode_var ct = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var ct = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  kind = ct->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  kind = ct->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -686,7 +686,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_sequence);
 
-  CORBA::ULong length = ct->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong length = ct->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -696,10 +696,10 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (length == 5);
 
-  CORBA::TypeCode_var ct2 = ct->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var ct2 = ct->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  kind = ct2->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  kind = ct2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -710,7 +710,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_wstring);
 
-  length = ct2->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  length = ct2->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -721,7 +721,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (length == 7);
 
-  CORBA::Contained::Description_var desc = a_var->describe (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Contained::Description_var desc = a_var->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeDescription *td;
@@ -741,7 +741,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (td->version, "1.1"));
 
-  kind = td->type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -751,7 +751,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_alias);
 
-  str = td->type->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = td->type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -761,7 +761,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0"));
 
-  str = td->type->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = td->type->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -771,15 +771,15 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias"));
 
-  CORBA::IDLType_var i_var = a_var->original_type_def (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::IDLType_var i_var = a_var->original_type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::SequenceDef_var seq_var =
     CORBA::SequenceDef::_narrow (i_var.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  length = seq_var->bound (TAO_ENV_SINGLE_ARG_PARAMETER);
+  length = seq_var->bound (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -789,12 +789,12 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (length == 5);
 
-  a_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  a_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL)
+Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -805,10 +805,10 @@ Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL)
     this->repo_->create_native ("IDL:my_native:1.0",
                                 "my_native",
                                 "1.0"
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var str = nvar->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var str = nvar->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -818,7 +818,7 @@ Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_native:1.0"));
 
-  str = nvar->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = nvar->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -828,7 +828,7 @@ Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_native"));
 
-  str = nvar->version (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = nvar->version (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -838,7 +838,7 @@ Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.0"));
 
-  str = nvar->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = nvar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -848,7 +848,7 @@ Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_native"));
 
-  CORBA::DefinitionKind kind = nvar->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind kind = nvar->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -858,12 +858,12 @@ Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::dk_Native);
 
-  nvar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  nvar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
+Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -875,13 +875,13 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
 
   members[0].name = CORBA::string_dup ("ub_string");
   members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
   members[1].name = CORBA::string_dup ("bd_string");
   members[1].type_def = this->repo_->create_string (5
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
@@ -898,7 +898,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
                               "my_enum",
                               "1.0",
                               e_members
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
   members[2].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
@@ -908,14 +908,14 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
                                 "my_struct",
                                 "1.0",
                                 members
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // This also tests the members() function.
-  CORBA::TypeCode_var tc = svar->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = svar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -930,7 +930,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = tc->member_name (i TAO_ENV_ARG_PARAMETER);
+      str = tc->member_name (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -942,7 +942,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
       ACE_ASSERT (!ACE_OS::strcmp (str.in (), members[i].name));
     }
 
-  CORBA::Contained::Description_var desc = svar->describe (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Contained::Description_var desc = svar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeDescription *td;
@@ -972,7 +972,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
   members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
@@ -980,12 +980,12 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
   members[1].type_def =
     this->repo_->create_array (5,
                                members[0].type_def.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
   svar->members (members
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1002,10 +1002,10 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
                                                     "my_enum",
                                                     "1.0",
                                                     def_members
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::StructMemberSeq_var out_members = svar->members (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::StructMemberSeq_var out_members = svar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_members->length ();
@@ -1025,10 +1025,10 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Contained_var fox = this->repo_->lookup ("::my_struct::my_enum"
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1039,10 +1039,10 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct::my_enum"));
 
   fox = svar->lookup ("my_enum"
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1052,13 +1052,13 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct::my_enum"));
 
-  CORBA::Container_var outer = fox->defined_in (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Container_var outer = fox->defined_in (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   CORBA::Contained_var schizo = CORBA::Contained::_narrow (outer.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = schizo->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = schizo->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1071,7 +1071,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all,
                                                             0
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1085,7 +1085,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
 
   contents = svar->contents (CORBA::dk_all,
                              0
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1099,7 +1099,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1124,7 +1124,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
                                        -1,
                                        CORBA::dk_all,
                                        0
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1138,7 +1138,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1157,7 +1157,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
     this->repo_->describe_contents (CORBA::dk_all,
                                     0,
                                     -1
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = cont_desc->length ();
@@ -1174,7 +1174,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
       CORBA::TypeDescription *td;
       cont_desc[i].value >>= td;
 
-      str = td->type->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = td->type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1212,7 +1212,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   svar->name ("your_struct"
-              TAO_ENV_ARG_PARAMETER);
+              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1221,7 +1221,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
 
   contents = svar->contents (CORBA::dk_all,
                              0
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1237,7 +1237,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1260,14 +1260,14 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_UNUSED_ARG (tmp);
 #endif /* ACE_NDEBUG */
 
-  e_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  e_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  svar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  svar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL)
+Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -1287,14 +1287,14 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL)
                               "disc_enum",
                               "1.0",
                               d_members
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::StructMemberSeq s_members (1);
   s_members.length (1);
   s_members[0].name = CORBA::string_dup ("string_in_struct");
   s_members[0].type_def = this->repo_->create_string (6
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   s_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
@@ -1303,7 +1303,7 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL)
                                 "struct_in_union",
                                 "1.0",
                                 s_members
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::UnionMemberSeq u_members (4);
@@ -1311,10 +1311,10 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL)
 
   u_members[0].name = CORBA::string_dup ("longval");
   u_members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   u_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
-  CORBA::TypeCode_var d_type = d_var->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var d_type = d_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   TAO_OutputCDR maker2;
   maker2.write_ulong (3);  // THREE
@@ -1326,7 +1326,7 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL)
 
   u_members[1].name = CORBA::string_dup ("longval");
   u_members[1].type_def = this->repo_->get_primitive (CORBA::pk_long
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   u_members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
   TAO_OutputCDR maker0;
@@ -1351,7 +1351,7 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL)
 
   u_members[3].name = CORBA::string_dup ("stringval");
   u_members[3].type_def = this->repo_->create_string (17
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   u_members[3].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
   u_members[3].label <<= CORBA::Any::from_octet (0);   // default case (ONE)
@@ -1362,13 +1362,13 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL)
                                "1.0",
                                d_var.in (),
                                u_members
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TypeCode_var disc_tc = u_var->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var disc_tc = u_var->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
    ACE_CHECK;
 
-  CORBA::ULong length = disc_tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong length = disc_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1380,10 +1380,10 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (length == 4);
 
-  CORBA::TypeCode_var tc = u_var->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = u_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1393,7 +1393,7 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (length == 3);
 
-  CORBA::Long slot = tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Long slot = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1409,7 +1409,7 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL)
   for (CORBA::ULong i = 0; i < length; i++)
     {
       str = tc->member_name (i
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1422,7 +1422,7 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL)
       ACE_ASSERT (!ACE_OS::strcmp (str.in (), u_members[i + 1].name));
 
       CORBA::Any_var label = tc->member_label (i
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       TAO_InputCDR cdr (label->_tao_get_cdr ());
@@ -1456,16 +1456,16 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL)
       }
     }
 
-  u_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  u_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  s_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  s_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  d_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  d_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
+Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -1477,16 +1477,16 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
 
   members[0].name = CORBA::string_dup ("ub_string");
   members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  members[0].type = members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  members[0].type = members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   members[1].name = CORBA::string_dup ("bd_string");
   members[1].type_def = this->repo_->create_string (5
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  members[1].type = members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  members[1].type = members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::EnumMemberSeq e_members (2);
@@ -1500,12 +1500,12 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
                                                        "my_enum",
                                                        "1.0",
                                                        e_members
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
 
-  members[2].type = members[2].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  members[2].type = members[2].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ExceptionDef_var exvar =
@@ -1513,13 +1513,13 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
                                    "my_exception",
                                    "1.0",
                                    members
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TypeCode_var tc = exvar->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = exvar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1534,7 +1534,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = tc->member_name (i TAO_ENV_ARG_PARAMETER);
+      str = tc->member_name (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1546,7 +1546,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
       ACE_ASSERT (!ACE_OS::strcmp (str.in (), members[i].name));
     }
 
-  CORBA::Contained::Description_var desc = exvar->describe (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Contained::Description_var desc = exvar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ExceptionDescription *ed;
@@ -1583,23 +1583,23 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
   members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  members[0].type = members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  members[0].type = members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   members[1].name = CORBA::string_dup ("array_mem");
   CORBA::ArrayDef_ptr a_ptr =
     this->repo_->create_array (5,
                                members[0].type_def.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   members[1].type_def = a_ptr;
-  members[1].type = members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  members[1].type = members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   exvar->members (members
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1616,10 +1616,10 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
                                                      "my_enum",
                                                      "1.0",
                                                      def_members
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::StructMemberSeq_var out_members = exvar->members (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::StructMemberSeq_var out_members = exvar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   length = out_members->length ();
 
@@ -1637,14 +1637,14 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
         ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, members[i].name));
     }
 
-  a_ptr->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  a_ptr->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("\nArrayDef::destroy\n\n")));
 
-  out_members = exvar->members (TAO_ENV_SINGLE_ARG_PARAMETER);
+  out_members = exvar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   length = out_members->length ();
 
@@ -1663,10 +1663,10 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Contained_var fox = this->repo_->lookup ("::my_exception::my_enum"
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1677,10 +1677,10 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_exception::my_enum"));
 
   fox = exvar->lookup ("my_enum"
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1692,7 +1692,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all,
                                                             0
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1706,7 +1706,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
 
   contents = exvar->contents (CORBA::dk_all,
                               0
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1720,7 +1720,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1739,7 +1739,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
                                        -1,
                                        CORBA::dk_all,
                                        0
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1753,7 +1753,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1771,7 +1771,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
     this->repo_->describe_contents (CORBA::dk_all,
                                     0,
                                     -1
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = cont_desc->length ();
@@ -1792,7 +1792,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
           cont_desc[i].value >>= ed;
           CORBA::TypeCode_ptr tc = ed->type.in ();
 
-          length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+          length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           if (this->debug_)
@@ -1818,7 +1818,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
           cont_desc[i].value >>= td;
           CORBA::TypeCode_ptr tc = td->type.in ();
 
-          length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+          length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           if (this->debug_)
@@ -1842,7 +1842,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   exvar->name ("your_exception"
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1851,7 +1851,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
 
   contents = exvar->contents (CORBA::dk_all,
                               0
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -1859,7 +1859,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -1878,14 +1878,14 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_UNUSED_ARG (tmp);
 #endif /* ACE_NDEBUG */
 
-  e_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  e_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  exvar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  exvar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
+Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -1893,7 +1893,7 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
     ));
 
   CORBA::IDLType_var ivar = this->repo_->get_primitive (CORBA::pk_string
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Any any;
@@ -1906,12 +1906,12 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
                                   "1.0",
                                   ivar.in (),
                                   any
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TypeCode_var tc = cvar->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = cvar->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1921,9 +1921,9 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (kind == CORBA::tk_string);
 
-  CORBA::IDLType_var tdef = cvar->type_def (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::IDLType_var tdef = cvar->type_def (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  CORBA::DefinitionKind def_kind = tdef->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::DefinitionKind def_kind = tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1934,7 +1934,7 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (def_kind == CORBA::dk_Primitive);
 
   CORBA::Any_var out_any;
-  out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+  out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *out_s;
@@ -1948,16 +1948,16 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (!ACE_OS::strcmp (out_s, s));
 
   ivar = this->repo_->get_primitive (CORBA::pk_double
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   cvar->type_def (ivar.in ()
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Double double_val = -1223.42256;
   any <<= double_val;
   cvar->value (any
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -1965,7 +1965,7 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
                 ACE_TEXT ("\nConstantDef::type_def (set)\n")
                 ACE_TEXT ("ConstantDef::value (set)\n")));
 
-  out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+  out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Double out_double_val;
@@ -1979,9 +1979,9 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (out_double_val == double_val);
 
   ivar = this->repo_->get_primitive (CORBA::pk_short
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   cvar->type_def (ivar.in ()
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
 
   if (this->debug_)
     ACE_DEBUG ((LM_DEBUG,
@@ -1992,9 +1992,9 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
   any <<= short_val;
 
   cvar->value (any
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+  out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Short out_short_val;
@@ -2008,10 +2008,10 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (out_short_val == short_val);
 
   ivar = this->repo_->get_primitive (CORBA::pk_float
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   cvar->type_def (ivar.in ()
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2023,9 +2023,9 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
   any <<= float_val;
 
   cvar->value (any
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+  out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Float out_float_val;
@@ -2039,10 +2039,10 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (out_float_val == float_val);
 
   ivar = this->repo_->get_primitive (CORBA::pk_ulonglong
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   cvar->type_def (ivar.in ()
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2054,9 +2054,9 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
   any <<= ull_val;
 
   cvar->value (any
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+  out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULongLong out_ull_val;
@@ -2077,12 +2077,12 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL)
     }
   ACE_ASSERT (out_ull_val == ull_val);
 
-  cvar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  cvar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
+Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -2099,12 +2099,12 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
                                    "gp_iface",
                                    "1.0",
                                    in_bases
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PrimitiveDef_var p_long =
     this->repo_->get_primitive (CORBA::pk_long
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::AttributeDef_var gp_attr =
@@ -2113,7 +2113,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
                                "1.0",
                                p_long.in (),
                                CORBA::ATTR_NORMAL
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   in_bases.length (1);
@@ -2124,11 +2124,11 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
                                    "p_iface",
                                    "1.0",
                                    in_bases
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::StringDef_var p_string = this->repo_->create_string (5
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::AttributeDef_var p_attr =
@@ -2137,7 +2137,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
                               "1.0",
                               p_string.in (),
                               CORBA::ATTR_READONLY
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *names[] = {"inarg", "inoutarg", "outarg"};
@@ -2159,7 +2159,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
                                    "if_exception",
                                    "1.0",
                                    members
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ExceptionDefSeq get_seq (1);
@@ -2173,7 +2173,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
     {
       par_seq[i].name = names[i];
       par_seq[i].type_def = CORBA::PrimitiveDef::_duplicate (p_long.in ());
-      par_seq[i].type = p_long->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      par_seq[i].type = p_long->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       par_seq[i].mode = modes[i];
       con_seq[i] = contexts[i];
@@ -2188,10 +2188,10 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
                               par_seq,
                               get_seq,
                               con_seq
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Contained::Description_var desc = p_op->describe (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Contained::Description_var desc = p_op->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::OperationDescription *od;
@@ -2206,7 +2206,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (!ACE_OS::strcmp (od->defined_in, "IDL:p_iface:1.0"));
 
   CORBA::TypeCode_var result = od->result;
-  CORBA::TCKind kind = result->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = result->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2253,7 +2253,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Boolean is_it = p_ivar->is_a ("IDL:p_iface:1.0"
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2264,7 +2264,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (is_it == 1);
 
   is_it = p_ivar->is_a ("IDL:gp_iface:1.0"
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2275,7 +2275,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (is_it == 1);
 
   is_it = gp_ivar->is_a ("IDL:p_iface:1.0"
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2286,10 +2286,10 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_ASSERT (is_it == 0);
 
   CORBA::InterfaceDef::FullInterfaceDescription_var fifd =
-    p_ivar->describe_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+    p_ivar->describe_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var str = fifd->type->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var str = fifd->type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2375,10 +2375,10 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
                                    "iface",
                                    "1.0",
                                    in_bases
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  desc = ivar->describe (TAO_ENV_SINGLE_ARG_PARAMETER);
+  desc = ivar->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::InterfaceDescription *ifd;
@@ -2409,7 +2409,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::InterfaceDefSeq_var out_bases =
-    ivar->base_interfaces (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ivar->base_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_bases->length ();
@@ -2423,7 +2423,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = out_bases[i]->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = out_bases[i]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -2437,7 +2437,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::ContainedSeq_var contents = ivar->contents (CORBA::dk_all,
                                                      0
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = contents->length ();
@@ -2451,7 +2451,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = contents[i]->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = contents[i]->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -2460,14 +2460,14 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
                     i,
                     str.in ()));
 
-      CORBA::Container_var cr = contents[i]->defined_in (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Container_var cr = contents[i]->defined_in (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Contained_var cd = CORBA::Contained::_narrow (cr.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      str = cd->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = cd->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -2481,18 +2481,18 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL)
                   || !ACE_OS::strcmp (str.in (), "gp_iface"));
     }
 
-  ex_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ex_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  ivar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ivar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  gp_ivar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  gp_ivar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  p_ivar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  p_ivar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
+Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -2509,7 +2509,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
                                                        "o_enum",
                                                        "1.0",
                                                        e_members
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   e_members[0] = CORBA::string_dup ("TEN");
@@ -2519,7 +2519,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
                                                         "i_enum",
                                                         "1.0",
                                                         e_members
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::StructMemberSeq s_members (2);
@@ -2529,14 +2529,14 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
 
   s_members[0].name = s_names[0];
   s_members[0].type_def = this->repo_->get_primitive (CORBA::pk_string
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  s_members[0].type = s_members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  s_members[0].type = s_members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   s_members[1].name = s_names[1];
   s_members[1].type_def = CORBA::EnumDef::_duplicate (e_var2.in ());
-  s_members[1].type = s_members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  s_members[1].type = s_members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::StructDef_var s_var =
@@ -2544,7 +2544,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
                                 "o_struct",
                                 "1.0",
                                 s_members
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::UnionMemberSeq u_members (2);
@@ -2554,7 +2554,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
 
   u_members[0].name = u_names[0];
   u_members[0].type_def = CORBA::EnumDef::_duplicate (e_var.in ());
-  u_members[0].type = e_var->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  u_members[0].type = e_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   CORBA::Long label = 0;
   CORBA::Any any;
@@ -2563,7 +2563,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
 
   u_members[1].name = u_names[1];
   u_members[1].type_def = CORBA::StructDef::_duplicate (s_var.in ());
-  u_members[1].type = s_var->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  u_members[1].type = s_var->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   label = 1;
   any <<= label;
@@ -2571,7 +2571,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::PrimitiveDef_var d_var =
     this->repo_->get_primitive (CORBA::pk_long
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::UnionDef_var u_var =
@@ -2580,10 +2580,10 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
                                "1.0",
                                d_var.in (),
                                u_members
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::UnionMemberSeq_var out_u_members = u_var->members (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::UnionMemberSeq_var out_u_members = u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = out_u_members->length ();
@@ -2613,7 +2613,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::ContainedSeq_var out_contents = u_var->contents (CORBA::dk_all,
                                                           1
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_contents->length ();
@@ -2628,14 +2628,14 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
   e_var->move (u_var.in (),
                u_names[0],
                "1.0"
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("\nEnumDef::move (into union)\n")));
 
-  out_u_members = u_var->members (TAO_ENV_SINGLE_ARG_PARAMETER);
+  out_u_members = u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_u_members->length ();
@@ -2685,7 +2685,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
 
   out_contents = u_var->contents (CORBA::dk_all,
                                   1
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_contents->length ();
@@ -2701,7 +2701,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = out_contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -2727,13 +2727,13 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
   e_var2->move (s_var.in (),
                 s_names[1],
                 "1.0"
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   s_var->move (u_var.in (),
                u_names[1],
                "1.0"
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -2743,7 +2743,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
 
   out_contents = this->repo_->contents (CORBA::dk_all,
                                         1
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_contents->length ();
@@ -2755,7 +2755,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_ASSERT (length == 1);
 
-  out_u_members = u_var->members (TAO_ENV_SINGLE_ARG_PARAMETER);
+  out_u_members = u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_u_members->length ();
@@ -2782,7 +2782,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
 
   out_contents = u_var->contents (CORBA::dk_all,
                                   1
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_contents->length ();
@@ -2799,7 +2799,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = out_contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -2814,14 +2814,14 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
       if (i == 1)
         {
           s_tmp = CORBA::StructDef::_narrow (out_contents[i]
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
 
   out_contents = s_tmp->contents (CORBA::dk_all,
                                   0
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_contents->length ();
@@ -2837,7 +2837,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = out_contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -2856,7 +2856,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
   ACE_UNUSED_ARG (base);
 #endif /* ACE_NDEBUG */
 
-  CORBA::StructMemberSeq_var out_s_members = s_tmp->members (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::StructMemberSeq_var out_s_members = s_tmp->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_s_members->length ();
@@ -2881,12 +2881,12 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL)
       ACE_ASSERT (!ACE_OS::strcmp (tmp, s_names[i]));
    }
 
-  u_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  u_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
+Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -2896,19 +2896,19 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::ModuleDef_var outer = this->repo_->create_module ("IDL:outer:1.0",
                                                            "outer",
                                                            "1.0"
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ModuleDef_var middle = outer->create_module ("IDL:middle:1.0",
                                                       "middle",
                                                       "1.0"
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ModuleDef_var inner = middle->create_module ("IDL:inner:1.0",
                                                       "inner",
                                                       "1.0"
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::InterfaceDefSeq in_bases (1);
@@ -2919,7 +2919,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
                              "p_iface",
                              "1.0",
                              in_bases
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   in_bases.length (1);
@@ -2930,16 +2930,16 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
                              "iface",
                              "1.0",
                              in_bases
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PrimitiveDef_var p_void =
     this->repo_->get_primitive (CORBA::pk_void
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   CORBA::PrimitiveDef_var p_long =
     this->repo_->get_primitive (CORBA::pk_long
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::AttributeDef_var attr =
@@ -2948,7 +2948,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
                                "1.0",
                                p_void.in (),
                                CORBA::ATTR_NORMAL
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = 3;
@@ -2967,7 +2967,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
     {
       par_seq[i].name = p_names[i];
       par_seq[i].type_def = CORBA::PrimitiveDef::_duplicate (p_long.in ());
-      par_seq[i].type = p_long->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      par_seq[i].type = p_long->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       par_seq[i].mode = ACE_static_cast (CORBA::ParameterMode, i);
 
@@ -2982,7 +2982,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
                                    "if_exception",
                                    "1.0",
                                    members
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ExceptionDefSeq get_seq (1);
@@ -2998,17 +2998,17 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
                              par_seq,
                              get_seq,
                              con_seq
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var str;
 
   CORBA::Contained_var result =
     inner->lookup ("::outer::middle::inner::iface::op"
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = result->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = result->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -3022,10 +3022,10 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
                                "::outer::middle::inner::iface::op"));
 
   result = middle->lookup ("inner::iface::op"
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  str = result->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = result->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -3042,7 +3042,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
                                                            -1,
                                                            CORBA::dk_all,
                                                            0
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = cseq->length ();
@@ -3056,7 +3056,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = cseq[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -3075,7 +3075,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
                               3,
                               CORBA::dk_Attribute,
                               0
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = cseq->length ();
@@ -3089,7 +3089,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = cseq[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -3106,7 +3106,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
   iface->move (outer.in (),
                "iface",
                "1.0"
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->debug_)
@@ -3117,7 +3117,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
                                    -1,
                                    CORBA::dk_all,
                                    0
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   length = cseq->length ();
@@ -3131,7 +3131,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; i++)
     {
-      str = cseq[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (this->debug_)
@@ -3145,6 +3145,6 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL)
       ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::outer::iface::op"));
     }
 
-  outer->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  outer->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
index f6f9e31f68c..ea4f8e67f74 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
@@ -50,24 +50,24 @@ public:
   // Execute test code.
 
 private:
-  void array_test (TAO_ENV_SINGLE_ARG_DECL);
-  void enum_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void alias_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void native_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void struct_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void union_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void exception_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void constant_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void interface_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void move_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void module_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void array_test (ACE_ENV_SINGLE_ARG_DECL);
+  void enum_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void alias_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void native_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void struct_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void union_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void exception_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void constant_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void interface_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void move_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void module_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // The various IFR tests.
 
   int parse_args (int argc,
                   char *argv[]);
   // Process the command line arguments.
 
-  void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Array of pointers to the test functions.
 
   static const char *test_names_[];
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index 8a3f9375f72..7e3454cf7b0 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -25,7 +25,7 @@ Ptest::init (int argc,
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     0
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int retval = this->parse_args (argc,
@@ -36,7 +36,7 @@ Ptest::init (int argc,
 
       CORBA::Object_var object =
         this->orb_->resolve_initial_references ("InterfaceRepository"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -51,7 +51,7 @@ Ptest::init (int argc,
 
       this->repo_ =
         CORBA::Repository::_narrow (object.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->repo_.in ()))
@@ -75,17 +75,17 @@ Ptest::init (int argc,
 int
 Ptest::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       if (this->query_ == 1)
         {
-          this->query (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->query (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
         {
-          this->populate (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->populate (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -131,7 +131,7 @@ Ptest::parse_args (int argc,
 }
 
 void
-Ptest::populate (TAO_ENV_SINGLE_ARG_DECL)
+Ptest::populate (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -142,17 +142,17 @@ Ptest::populate (TAO_ENV_SINGLE_ARG_DECL)
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
   members[0].type_def = this->repo_->get_primitive (CORBA::pk_long
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  members[0].type = members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  members[0].type = members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   members[1].name = CORBA::string_dup ("array_mem");
   members[1].type_def = this->repo_->create_array (5,
                                                    members[0].type_def.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  members[1].type = members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  members[1].type = members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 
@@ -160,7 +160,7 @@ Ptest::populate (TAO_ENV_SINGLE_ARG_DECL)
                                                           "my_struct",
                                                           "1.0",
                                                           members
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::EnumMemberSeq def_members (2);
@@ -173,12 +173,12 @@ Ptest::populate (TAO_ENV_SINGLE_ARG_DECL)
                                                     "my_enum",
                                                     "1.0",
                                                     def_members
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Ptest::query (TAO_ENV_SINGLE_ARG_DECL)
+Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((
       LM_DEBUG,
@@ -194,7 +194,7 @@ Ptest::query (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all,
                                                             0
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = contents->length ();
@@ -209,12 +209,12 @@ Ptest::query (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::ULong i = 0;
 
   CORBA::StructDef_var svar = CORBA::StructDef::_narrow (contents[i]
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (svar.in ()));
 
-  CORBA::StructMemberSeq_var out_members = svar->members (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::StructMemberSeq_var out_members = svar->members (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   length = out_members->length ();
@@ -265,6 +265,6 @@ Ptest::query (TAO_ENV_SINGLE_ARG_DECL)
   ACE_UNUSED_ARG (members);
 #endif /* ACE_NDEBUG */
 
-  svar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  svar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
index 3996b1be028..40d07a67244 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
@@ -50,8 +50,8 @@ public:
   // Execute test code.
 
 private:
-  void populate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void query (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void populate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void query (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // The two IFR tests.
 
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
index 160b2c8f6ba..a7b13988c33 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
@@ -33,7 +33,7 @@ int main (int argc, char *argv [])
       if (client.init (argc, argv) != 0)
         return 1;
 
-      result = client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index 5ef63c898b0..02ed8e5d823 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -145,7 +145,7 @@ NContextExt_Client_i::get_name ()
 }
 
 int
-NContextExt_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
+NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
 
   ACE_TRY_EX (OuterBlock)
@@ -161,7 +161,7 @@ NContextExt_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
       // Get the stringified form of the name
        CORBA::String_var str_name =
         this->naming_context_->to_string (name
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (OuterBlock);
 
       CORBA::Object_var factory_object;
@@ -171,7 +171,7 @@ NContextExt_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
           // Resolve the name using the stringified form of the name
           factory_object =
             this->naming_context_->resolve_str (str_name.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (InnerBlock);
         }
       ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
@@ -181,7 +181,7 @@ NContextExt_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
 
       // Narrow
       Web_Server::Iterator_Factory_var factory =
-        Web_Server::Iterator_Factory::_narrow (factory_object.in () TAO_ENV_ARG_PARAMETER);
+        Web_Server::Iterator_Factory::_narrow (factory_object.in () ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK_EX (OuterBlock);
 
@@ -192,14 +192,14 @@ NContextExt_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
       this->naming_context_->list (2,
                                    bindings_list.out (),
                                    iter.out ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (OuterBlock);
 
       // Convert the stringified name back as CosNaming::Name and print
       // them out.
       CosNaming::Name *nam =
         this->naming_context_->to_name (str_name.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (OuterBlock);
 
       // Declare a CosNaming::Name variable and assign length to it.
@@ -225,7 +225,7 @@ NContextExt_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
       CORBA::String_var url_string =
         this->naming_context_->to_url (address.in (),
                                        obj_name.in()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (OuterBlock);
 
       if (this->view_ == 0)
@@ -264,7 +264,7 @@ NContextExt_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 
@@ -273,7 +273,7 @@ NContextExt_Client_i::init (int argc, char **argv)
         CORBA::ORB_init (this->argc_,
                          this->argv_,
                          "" /* the ORB name, it can be anything! */
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 
       // There must be at least one argument, the file that has to be
       // retrieved
@@ -282,7 +282,7 @@ NContextExt_Client_i::init (int argc, char **argv)
 
       // Get a reference to the Naming Service
       CORBA::Object_var naming_context_object =
-        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_context_object.in ()))
@@ -293,7 +293,7 @@ NContextExt_Client_i::init (int argc, char **argv)
       // Narrow to get the correct reference
       this->naming_context_ =
         CosNaming::NamingContextExt::_narrow (naming_context_object.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->naming_context_.in ()))
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
index 6592e11fe71..11f367176f8 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
@@ -10,7 +10,7 @@
 //    ncontextext_client_i.h
 //
 // = DESCRIPTION
-//    This class implements a simple CORBA client which 
+//    This class implements a simple CORBA client which
 //    converts a Name to a string and viceversa, forms a IIOPNAME
 //    url address and can resolve a stringified name.
 //
@@ -39,14 +39,14 @@ class NContextExt_Client_i
   NContextExt_Client_i (void);
   ~NContextExt_Client_i (void);
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Execute the client example code.
 
   int init (int argc, char **argv);
   // Initialize the client communication endpoint with the server.
 
  private:
-  
+
   int parse_args (void);
   // Parses the arguments passed on the command line.
 
@@ -58,7 +58,7 @@ class NContextExt_Client_i
   // Prints the values of the original name, strigified name and
   // destringified name. Also, prints the value of the address of the
   // naming context, a name that identifies a binding in that naming
-  // context and the corresponding iioploc URL 
+  // context and the corresponding iioploc URL
   // representation.
 
   char * get_name (void);
diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp
index 7f641e692a6..e8cdc229739 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.cpp
@@ -18,7 +18,7 @@ Hash_ReplicaControl::Hash_ReplicaControl (void)
 void
 Hash_ReplicaControl::init (CORBA::ORB_ptr orb,
                            LoadBalancing::LoadBalancer_ptr balancer
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Hash_ReplicaControl::init\n"));
@@ -28,21 +28,21 @@ Hash_ReplicaControl::init (CORBA::ORB_ptr orb,
   reactor->schedule_timer (&this->adapter_, 0, interval, restart);
 
   LoadBalancing::ReplicaControl_var control =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var replica =
-    this->replica_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->replica_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->group_ =
-    balancer->group_identity (TAO_ENV_SINGLE_ARG_PARAMETER);
+    balancer->group_identity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_ =
     balancer->connect (control.in (),
                        replica.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -67,7 +67,7 @@ Hash_ReplicaControl::handle_timeout (const ACE_Time_Value &,
   ACE_TRY_NEW_ENV
     {
       this->proxy_->current_load (this->current_load_
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Current_Load = %f\n", this->current_load_));
     }
@@ -86,7 +86,7 @@ Hash_ReplicaControl::request_received (void)
 
 
 void
-Hash_ReplicaControl::request_rejected (TAO_ENV_SINGLE_ARG_DECL)
+Hash_ReplicaControl::request_rejected (ACE_ENV_SINGLE_ARG_DECL)
 {
   // @@ Ossama: notice how we reject a single request.  Maybe the
   // advisory should include how many are we supposed to shed?
@@ -97,8 +97,8 @@ Hash_ReplicaControl::request_rejected (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Hash_ReplicaControl::high_load_advisory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED
-                                         /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+Hash_ReplicaControl::high_load_advisory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+                                         /* ACE_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Notify the replica that it should reject all requests.
@@ -107,8 +107,8 @@ Hash_ReplicaControl::high_load_advisory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED
 }
 
 void
-Hash_ReplicaControl::nominal_load_advisory (TAO_ENV_SINGLE_ARG_DECL_NOT_USED
-                                            /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+Hash_ReplicaControl::nominal_load_advisory (ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+                                            /* ACE_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Notify the replica that it should once again accept requests.
diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.h b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.h
index bda5d30bf60..be94d16cbc0 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_ReplicaControl.h
@@ -35,7 +35,7 @@ public:
 
   void init (CORBA::ORB_ptr the_orb,
              LoadBalancing::LoadBalancer_ptr balancer
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
   int handle_timeout (const ACE_Time_Value &current_time,
                       const void *arg);
@@ -44,13 +44,13 @@ public:
   void request_received (void);
   // A request has been received
 
-  void request_rejected (TAO_ENV_SINGLE_ARG_DECL);
+  void request_rejected (ACE_ENV_SINGLE_ARG_DECL);
   // A request has been rejected, take appropriate action
 
-  virtual void high_load_advisory (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void high_load_advisory (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void nominal_load_advisory (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void nominal_load_advisory (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Object_ptr replica (void);
diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp
index 57a4af6f05c..e8359de2179 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp
@@ -15,12 +15,12 @@ Hash_Replica_Impl::Hash_Replica_Impl (Hash_ReplicaControl *control)
 
 CORBA::ULong
 Hash_Replica_Impl::do_hash (const char *str
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reject_requests_)
     {
-      this->control_->request_rejected (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->control_->request_rejected (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       return 0;
     }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h
index 7fec1f0db51..677ec79ad4c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h
+++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h
@@ -28,7 +28,7 @@ public:
   // Constructor
 
   virtual CORBA::ULong do_hash (const char * str
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Perform a simple hashing operation on the input string <str> and
   // return the hashed string <hash_str>.
diff --git a/TAO/orbsvcs/tests/LoadBalancing/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/client.cpp
index 5f09d83d3ff..790ec7604be 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/client.cpp
@@ -12,17 +12,17 @@
 static void run_test (int iterations,
                       int timeout,
                       Hash_Replica_ptr hasher
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize 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;
 
       const char *ior = "file://test.ior";
@@ -61,12 +61,12 @@ main (int argc, char *argv[])
           }
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Hash_Replica_var hasher =
         Hash_Replica::_unchecked_narrow (obj.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (hasher.in ()))
@@ -74,10 +74,10 @@ main (int argc, char *argv[])
                            ACE_TEXT ("Invalid replica IOR.\n")),
                           -1);
 
-      run_test (iterations, timeout, hasher.in () TAO_ENV_ARG_PARAMETER);
+      run_test (iterations, timeout, hasher.in () 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
@@ -93,7 +93,7 @@ void
 run_test (int iterations,
           int timeout,
           Hash_Replica_ptr hasher
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
 {
   ACE_Time_Value tv (0, timeout * 1000);
   ACE_Throughput_Stats stats;
@@ -103,7 +103,7 @@ run_test (int iterations,
     {
       ACE_UINT64 call_start = ACE_OS::gethrtime ();
 
-      hasher->do_hash ("This is a silly test" TAO_ENV_ARG_PARAMETER);
+      hasher->do_hash ("This is a silly test" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       ACE_UINT64 end = ACE_OS::gethrtime ();
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/server.cpp
index fcdc16cd4e7..2661b823678 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/server.cpp
@@ -9,12 +9,12 @@
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize 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;
 
       const char *balancer_ior = "file://test.ior";
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
           }
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -52,23 +52,23 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        orb->string_to_object (balancer_ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (balancer_ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       LoadBalancing::LoadBalancer_var load_balancer =
         LoadBalancing::LoadBalancer::_narrow (obj.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (load_balancer.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           -1);
 
       CORBA::Object_var group =
-        load_balancer->group_identity (TAO_ENV_SINGLE_ARG_PARAMETER);
+        load_balancer->group_identity (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        orb->object_to_string (group.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (group.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       FILE *ior = ACE_OS::fopen (ior_output, "w");
@@ -91,26 +91,26 @@ main (int argc, char *argv[])
       Hash_ReplicaControl control;
       control.init (orb.in (),
                     load_balancer.in ()
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #ifndef ACE_WIN32
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #else
       while (1)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv TAO_ENV_ARG_PARAMETER);
+          orb->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           control.handle_timeout (tv, 0);
         }
 #endif
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
index 5d8fd09eec8..0368094700a 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp
@@ -17,7 +17,7 @@ McastHello::McastHello (CORBA::ORB_ptr orb,
 }
 
 void
-McastHello::send_forty_two (CORBA::Long forty_two TAO_ENV_ARG_DECL_NOT_USED)
+McastHello::send_forty_two (CORBA::Long forty_two ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->status_ == 0 &&
@@ -30,8 +30,8 @@ McastHello::send_forty_two (CORBA::Long forty_two TAO_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-McastHello::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+McastHello::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);
 }
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
index cabb82d60a0..223465efc8f 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
+++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h
@@ -22,15 +22,15 @@ class McastHello
 {
 public:
   /// Constructor
-  McastHello (CORBA::ORB_ptr orb, 
+  McastHello (CORBA::ORB_ptr orb,
               int instance,
               CORBA::Boolean &status);
 
   // = The skeleton methods
-  virtual void send_forty_two (CORBA::Long forty_two TAO_ENV_ARG_DECL)
+  virtual void send_forty_two (CORBA::Long forty_two ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
index b0be073128c..ca9bf90fedf 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
@@ -39,14 +39,14 @@ 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 tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
        * a multicast reference (yet...).
        */
       Test::McastHello_var hello =
-        Test::McastHello::_unchecked_narrow (tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::McastHello::_unchecked_narrow (tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (hello.in ()))
@@ -65,13 +65,13 @@ main (int argc, char *argv[])
                             1);
         }
 
-      hello->send_forty_two (42 TAO_ENV_ARG_PARAMETER);
+      hello->send_forty_two (42 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      hello->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      hello->shutdown (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/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
index b36f3fa530f..9ccfe1f5259 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -47,15 +47,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -64,7 +64,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
       // Get the group IOR.
       CORBA::String_var ior = CORBA::string_dup (group_ior);
       CORBA::Object_var group1 =
-        orb->string_to_object (ior.in () TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Output the Group IOR to the <ior_output_file>
@@ -88,7 +88,7 @@ main (int argc, char *argv[])
 
       PortableServer::ObjectId_var id =
         root_poa->create_id_for_reference (group1.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create and activate an instance of our servant.
@@ -97,22 +97,22 @@ main (int argc, char *argv[])
 
       root_poa->activate_object_with_id (id.in (),
                                          &server_impl
-                                         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;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Validate that our servants got the right requests.
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp
index 646f5cbf943..8d92d468853 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.cpp
@@ -77,7 +77,7 @@ AdminProperties_Test::parse_args(int argc, char *argv[])
                      "-consumers [consumers] "
                      "-suppliers [suppliers] "
                      "-event_count [event_count]\n",
-                     argv[0], 
+                     argv[0],
                      argv[0]));
 
           arg_shifter.consume_arg ();
@@ -93,14 +93,14 @@ AdminProperties_Test::parse_args(int argc, char *argv[])
 }
 
 int
-AdminProperties_Test::init (int argc, 
-                            char *argv [] 
-                            TAO_ENV_ARG_DECL)
+AdminProperties_Test::init (int argc,
+                            char *argv []
+                            ACE_ENV_ARG_DECL)
 {
   // Initialize base class.
-  Notify_Test_Client::init (argc, 
-                            argv 
-                            TAO_ENV_ARG_PARAMETER);
+  Notify_Test_Client::init (argc,
+                            argv
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CosNotifyChannelAdmin::ChannelID id;
@@ -108,21 +108,21 @@ AdminProperties_Test::init (int argc,
   // Initialize the admin object.
   initial_admin_.length (4);
 
-  this->initial_admin_[0].name = 
+  this->initial_admin_[0].name =
     CORBA::string_dup (CosNotification::MaxQueueLength);
   this->initial_admin_[0].value <<= this->max_queue_length_;
 
 
-  this->initial_admin_[1].name = 
+  this->initial_admin_[1].name =
     CORBA::string_dup (CosNotification::MaxSuppliers);
   this->initial_admin_[1].value <<= this->max_suppliers_;
 
-  this->initial_admin_[2].name = 
+  this->initial_admin_[2].name =
     CORBA::string_dup (CosNotification::MaxConsumers);
   this->initial_admin_[2].value <<= this->max_consumers_;
 
 
-  this->initial_admin_[3].name = 
+  this->initial_admin_[3].name =
     CORBA::string_dup (CosNotification::RejectNewEvents);
   this->initial_admin_[3].value <<= CORBA::Any::from_boolean (
                                         this->reject_new_events_
@@ -131,7 +131,7 @@ AdminProperties_Test::init (int argc,
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
                                                id
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
@@ -139,16 +139,16 @@ AdminProperties_Test::init (int argc,
 
   CosNotifyChannelAdmin::AdminID adminid;
 
-  this->supplier_admin_ = ec_->new_for_suppliers (this->ifgop_, 
-                                                  adminid 
-                                                  TAO_ENV_ARG_PARAMETER);
+  this->supplier_admin_ = ec_->new_for_suppliers (this->ifgop_,
+                                                  adminid
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
-  this->consumer_admin_ = ec_->new_for_consumers (this->ifgop_, 
-                                                  adminid 
-                                                  TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_ = ec_->new_for_consumers (this->ifgop_,
+                                                  adminid
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -157,20 +157,20 @@ AdminProperties_Test::init (int argc,
 }
 
 void
-AdminProperties_Test::run_test (TAO_ENV_SINGLE_ARG_DECL)
+AdminProperties_Test::run_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->send_events (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->send_events (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-AdminProperties_Test::create_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+AdminProperties_Test::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Create the requested number of suppliers.
   // @@ CosNotifyChannelAdmin::AdminID adminid;
@@ -187,12 +187,12 @@ AdminProperties_Test::create_suppliers (TAO_ENV_SINGLE_ARG_DECL)
         {
           ACE_NEW (supplier,
                    TAO_Notify_StructuredPushSupplier ());
-          supplier->init (root_poa_.in () 
-                          TAO_ENV_ARG_PARAMETER);
+          supplier->init (root_poa_.in ()
+                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          supplier->connect (this->supplier_admin_.in () 
-                             TAO_ENV_ARG_PARAMETER);
+          supplier->connect (this->supplier_admin_.in ()
+                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -205,7 +205,7 @@ AdminProperties_Test::create_suppliers (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-AdminProperties_Test::create_consumers (TAO_ENV_SINGLE_ARG_DECL)
+AdminProperties_Test::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Create the requested number of suppliers.
   // @@ CosNotifyChannelAdmin::AdminID adminid;
@@ -222,12 +222,12 @@ AdminProperties_Test::create_consumers (TAO_ENV_SINGLE_ARG_DECL)
         {
           ACE_NEW (consumer,
                    TAO_Notify_StructuredPushConsumer ());
-          consumer->init (root_poa_.in () 
-                          TAO_ENV_ARG_PARAMETER);
+          consumer->init (root_poa_.in ()
+                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          consumer->connect (this->consumer_admin_.in () 
-                             TAO_ENV_ARG_PARAMETER);
+          consumer->connect (this->consumer_admin_.in ()
+                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -240,7 +240,7 @@ AdminProperties_Test::create_consumers (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-AdminProperties_Test::send_events (TAO_ENV_SINGLE_ARG_DECL)
+AdminProperties_Test::send_events (ACE_ENV_SINGLE_ARG_DECL)
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -279,12 +279,12 @@ AdminProperties_Test::send_events (TAO_ENV_SINGLE_ARG_DECL)
   ACE_NEW (supplier,
            TAO_Notify_StructuredPushSupplier ());
 
-  supplier->init (root_poa_.in () 
-                  TAO_ENV_ARG_PARAMETER);
+  supplier->init (root_poa_.in ()
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier->connect (this->supplier_admin_.in () 
-                     TAO_ENV_ARG_PARAMETER);
+  supplier->connect (this->supplier_admin_.in ()
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   int i = 0;
@@ -297,7 +297,7 @@ AdminProperties_Test::send_events (TAO_ENV_SINGLE_ARG_DECL)
           // Any.
           event.remainder_of_body <<= (CORBA::Long)i;
 
-          supplier->send_event (event TAO_ENV_ARG_PARAMETER);
+          supplier->send_event (event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -323,12 +323,12 @@ main (int argc, char* argv[])
 
   ACE_TRY_NEW_ENV
     {
-      test.init (argc, 
+      test.init (argc,
                  argv
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.h
index d473f18827e..007dc90c544 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.h
@@ -34,21 +34,21 @@ public:
   AdminProperties_Test (void);
   ~AdminProperties_Test (void);
 
-  int parse_args (int argc, 
+  int parse_args (int argc,
                   char *argv[]) ;
 
-  int init (int argc, 
-            char *argv [] 
-            TAO_ENV_ARG_DECL);
+  int init (int argc,
+            char *argv []
+            ACE_ENV_ARG_DECL);
   // Initialization.
 
-  void run_test (TAO_ENV_SINGLE_ARG_DECL);
+  void run_test (ACE_ENV_SINGLE_ARG_DECL);
   // Run the test.
 
 protected:
-  void create_suppliers (TAO_ENV_SINGLE_ARG_DECL);
-  void create_consumers (TAO_ENV_SINGLE_ARG_DECL);
-  void send_events (TAO_ENV_SINGLE_ARG_DECL);
+  void create_suppliers (ACE_ENV_SINGLE_ARG_DECL);
+  void create_consumers (ACE_ENV_SINGLE_ARG_DECL);
+  void send_events (ACE_ENV_SINGLE_ARG_DECL);
 
   // Data Members
   CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index 1e291651aa1..512bfd6632e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -64,40 +64,40 @@ ConnectDisconnect::on_entity_destroyed (void)
 {
   this->result_count_++;
 
-  ACE_DEBUG ((LM_DEBUG, 
-              "result_count = %d\n", 
+  ACE_DEBUG ((LM_DEBUG,
+              "result_count = %d\n",
               this->result_count_.value ()));
 }
 
 int
-ConnectDisconnect::init (int argc, 
-                         char* argv [] 
-                         TAO_ENV_ARG_DECL)
+ConnectDisconnect::init (int argc,
+                         char* argv []
+                         ACE_ENV_ARG_DECL)
 {
   // Initialize the base class.
-  Notify_Test_Client::init (argc, 
-                            argv 
-                            TAO_ENV_ARG_PARAMETER);
+  Notify_Test_Client::init (argc,
+                            argv
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);;
 
-  // Create all participents.
-  this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
+  // Create all participants.
+  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   this->supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, 
-                            adminid 
-                            TAO_ENV_ARG_PARAMETER);
+    ec_->new_for_suppliers (this->ifgop_,
+                            adminid
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);;
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   this->consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, 
-                            adminid 
-                            TAO_ENV_ARG_PARAMETER);
+    ec_->new_for_consumers (this->ifgop_,
+                            adminid
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -137,7 +137,7 @@ ConnectDisconnect::init (int argc,
 int
 ConnectDisconnect::parse_args(int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, 
+  ACE_Arg_Shifter arg_shifter (argc,
                               argv);
 
     const char *current_arg = 0;
@@ -169,7 +169,7 @@ ConnectDisconnect::parse_args(int argc, char *argv[])
                      "-count testcount \n"
                      "-consumers number_of_consumers"
                      "-suppliers number_of_suppliers",
-                     argv[0], 
+                     argv[0],
                      argv[0]));
 
           arg_shifter.consume_arg ();
@@ -186,21 +186,21 @@ ConnectDisconnect::parse_args(int argc, char *argv[])
 }
 
 void
-ConnectDisconnect::create_EC (TAO_ENV_SINGLE_ARG_DECL)
+ConnectDisconnect::create_EC (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
                                                id
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-ConnectDisconnect::run_test (TAO_ENV_SINGLE_ARG_DECL)
+ConnectDisconnect::run_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int iterations = 0; iterations < count_; ++iterations)
     {
@@ -210,88 +210,89 @@ ConnectDisconnect::run_test (TAO_ENV_SINGLE_ARG_DECL)
         {
           // Create and connect Any consumers.
           ACE_NEW (this->any_consumer_[i],
-                   CD_PushConsumer (this, 
+                   CD_PushConsumer (this,
                                     i));
-          this->any_consumer_[i]->init (root_poa_.in () 
-                                        TAO_ENV_ARG_PARAMETER);
+          this->any_consumer_[i]->init (root_poa_.in ()
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          this->any_consumer_[i]->connect (this->consumer_admin_.in () 
-                                           TAO_ENV_ARG_PARAMETER);
+          this->any_consumer_[i]->connect (this->consumer_admin_.in ()
+                                           ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Create and connect Structured consumers.
           ACE_NEW (this->structured_consumer_[i],
-                   CD_StructuredPushConsumer (this, 
+                   CD_StructuredPushConsumer (this,
                                               i));
-          this->structured_consumer_[i]->init (root_poa_.in () 
-                                               TAO_ENV_ARG_PARAMETER);
+          this->structured_consumer_[i]->init (root_poa_.in ()
+                                               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           this->structured_consumer_[i]->connect (this->consumer_admin_.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Create and connect Sequence consumers.
           ACE_NEW (this->sequence_consumer_[i],
-                   CD_SequencePushConsumer (this, 
+                   CD_SequencePushConsumer (this,
                                             i));
-          this->sequence_consumer_[i]->init (root_poa_.in () 
-                                             TAO_ENV_ARG_PARAMETER);
+          this->sequence_consumer_[i]->init (root_poa_.in ()
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           this->sequence_consumer_[i]->connect (this->consumer_admin_.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
+          sequence_consumer_[i]->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
       for (i = 0; i < this->suppliers_; ++i)
         {
           ACE_NEW (this->any_supplier_[i],
-                   CD_PushSupplier (this, 
+                   CD_PushSupplier (this,
                                     i));
-          this->any_supplier_[i]->init (root_poa_.in () 
-                                        TAO_ENV_ARG_PARAMETER);
+          this->any_supplier_[i]->init (root_poa_.in ()
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          this->any_supplier_[i]->connect (this->supplier_admin_.in () 
-                                           TAO_ENV_ARG_PARAMETER);
+          this->any_supplier_[i]->connect (this->supplier_admin_.in ()
+                                           ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Create and connect Structured suppliers.
           ACE_NEW (this->structured_supplier_[i],
-                   CD_StructuredPushSupplier (this, 
+                   CD_StructuredPushSupplier (this,
                                               i));
-          this->structured_supplier_[i]->init (root_poa_.in () 
-                                               TAO_ENV_ARG_PARAMETER);
+          this->structured_supplier_[i]->init (root_poa_.in ()
+                                               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          this->structured_supplier_[i]->connect (this->supplier_admin_.in () 
-                                                  TAO_ENV_ARG_PARAMETER);
+          this->structured_supplier_[i]->connect (this->supplier_admin_.in ()
+                                                  ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Create and connect Sequence suppliers.
           ACE_NEW (this->sequence_supplier_[i],
-                   CD_SequencePushSupplier (this, 
+                   CD_SequencePushSupplier (this,
                                             i));
-          this->sequence_supplier_[i]->init (root_poa_.in () 
-                                             TAO_ENV_ARG_PARAMETER);
+          this->sequence_supplier_[i]->init (root_poa_.in ()
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
-          this->sequence_supplier_[i]->connect (this->supplier_admin_.in () 
-                                                TAO_ENV_ARG_PARAMETER);
+          this->sequence_supplier_[i]->connect (this->supplier_admin_.in ()
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
       for (i = 0; i < this->consumers_; ++i)
         {
           // Disconnnect Any consumers.
-          this->any_consumer_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->any_consumer_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           // Disconnect Structured Consumers.
           this->structured_consumer_[i]->disconnect (
-                                             TAO_ENV_SINGLE_ARG_PARAMETER
+                                             ACE_ENV_SINGLE_ARG_PARAMETER
                                            );
           ACE_CHECK;
 
           // Disconnect Sequence Consumers.
           this->sequence_consumer_[i]->disconnect (
-                                           TAO_ENV_SINGLE_ARG_PARAMETER
+                                           ACE_ENV_SINGLE_ARG_PARAMETER
                                          );
           ACE_CHECK;
         }
@@ -299,18 +300,18 @@ ConnectDisconnect::run_test (TAO_ENV_SINGLE_ARG_DECL)
       for (i = 0; i < this->suppliers_; ++i)
         {
           // Disconnnect Any suppliers.
-          this->any_supplier_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->any_supplier_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           // Disconnect Structured Suppliers.
           this->structured_supplier_[i]->disconnect (
-                                             TAO_ENV_SINGLE_ARG_PARAMETER
+                                             ACE_ENV_SINGLE_ARG_PARAMETER
                                            );
           ACE_CHECK;
 
           // Disconnect Sequence Suppliers.
           this->sequence_supplier_[i]->disconnect (
-                                           TAO_ENV_SINGLE_ARG_PARAMETER
+                                           ACE_ENV_SINGLE_ARG_PARAMETER
                                          );
           ACE_CHECK;
         }
@@ -318,16 +319,16 @@ ConnectDisconnect::run_test (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-ConnectDisconnect::end_test (TAO_ENV_SINGLE_ARG_DECL)
+ConnectDisconnect::end_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
 ConnectDisconnect::check_results (void)
 {
-  ACE_DEBUG ((LM_DEBUG, 
-              "result_count_ = %d", 
+  ACE_DEBUG ((LM_DEBUG,
+              "result_count_ = %d",
               this->result_count_.value ()));
   ACE_DEBUG ((LM_DEBUG,
               " expected_count_ = %d\n",
@@ -335,18 +336,18 @@ ConnectDisconnect::check_results (void)
 
   if (this->result_count_ != this->expected_count_)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "ConnectDisconnect test failed\n"));
     }
   else
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "ConnectDisconnect test succeded\n"));
     }
 
   // Destroy the channel.
-  TAO_ENV_DECLARE_NEW_ENV;
-  this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_DECLARE_NEW_CORBA_ENV;
+  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -366,15 +367,15 @@ main (int argc, char* argv[])
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc, 
+      client.init (argc,
                    argv
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      client.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      client.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      client.end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      client.end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
index 0690d9a388d..4f560be9f2e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
@@ -71,25 +71,25 @@ public:
   void on_entity_destroyed (void);
   // Keeps track of how many objects were destroyed.
 
-  int parse_args (int argc, 
+  int parse_args (int argc,
                   char *argv[]);
 
-  int init (int argc, 
-            char *argv [] 
-            TAO_ENV_ARG_DECL);
+  int init (int argc,
+            char *argv []
+            ACE_ENV_ARG_DECL);
   // initialization.
 
-  void run_test (TAO_ENV_SINGLE_ARG_DECL);
+  void run_test (ACE_ENV_SINGLE_ARG_DECL);
   // Run the test.
 
-  void end_test (TAO_ENV_SINGLE_ARG_DECL);
+  void end_test (ACE_ENV_SINGLE_ARG_DECL);
   // End the test.
 
   int check_results (void);
   // Check if we got the expected results.
 
 protected:
-  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
+  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
   // Create EC.
 
   CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp
index 1ae7278caf6..0f5dbcc8f9b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.cpp
@@ -16,7 +16,7 @@ Event_StructuredPushConsumer::Event_StructuredPushConsumer (Events_Test *test_cl
 void
 Event_StructuredPushConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
@@ -24,8 +24,8 @@ Event_StructuredPushConsumer::push_structured_event (
   int event_num;
   notification.filterable_data[0].value >>= event_num;
 
-  ACE_DEBUG((LM_DEBUG, 
-             "Received event# %d\n", 
+  ACE_DEBUG((LM_DEBUG,
+             "Received event# %d\n",
              event_num));
 
   this->test_client_->on_event_received ();
@@ -55,34 +55,34 @@ Events_Test::~Events_Test (void)
 }
 
 int
-Events_Test::init (int argc, 
-                   char* argv [] 
-                   TAO_ENV_ARG_DECL)
+Events_Test::init (int argc,
+                   char* argv []
+                   ACE_ENV_ARG_DECL)
 {
   // Initialize the base class.
-  Notify_Test_Client::init (argc, 
-                            argv 
-                            TAO_ENV_ARG_PARAMETER);
+  Notify_Test_Client::init (argc,
+                            argv
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create all participents.
-  this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   this->supplier_admin_ =
-    this->ec_->new_for_suppliers (this->ifgop_, 
-                                  adminid 
-                                  TAO_ENV_ARG_PARAMETER);
+    this->ec_->new_for_suppliers (this->ifgop_,
+                                  adminid
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   this->consumer_admin_ =
-    this->ec_->new_for_consumers (this->ifgop_, 
-                                  adminid 
-                                  TAO_ENV_ARG_PARAMETER);
+    this->ec_->new_for_consumers (this->ifgop_,
+                                  adminid
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -90,33 +90,33 @@ Events_Test::init (int argc,
   ACE_NEW_RETURN (this->consumer_,
                   Event_StructuredPushConsumer (this),
                   -1);
-  this->consumer_->init (root_poa_.in () 
-                         TAO_ENV_ARG_PARAMETER);
+  this->consumer_->init (root_poa_.in ()
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  this->consumer_->connect (this->consumer_admin_.in () 
-                            TAO_ENV_ARG_PARAMETER);
+  this->consumer_->connect (this->consumer_admin_.in ()
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Event_StructuredPushConsumer* consumer2 = 0;
   ACE_NEW_RETURN (consumer2,
                   Event_StructuredPushConsumer (this),
                   -1);
-  consumer2->init (root_poa_.in () 
-                   TAO_ENV_ARG_PARAMETER);
+  consumer2->init (root_poa_.in ()
+                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  consumer2->connect (this->consumer_admin_.in () 
-                      TAO_ENV_ARG_PARAMETER);
+  consumer2->connect (this->consumer_admin_.in ()
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->supplier_,
                   Event_StructuredPushSupplier (this),
                   -1);
-  this->supplier_->init (root_poa_.in () 
-                         TAO_ENV_ARG_PARAMETER);
+  this->supplier_->init (root_poa_.in ()
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->supplier_->connect (this->supplier_admin_.in () 
-                            TAO_ENV_ARG_PARAMETER);
+  this->supplier_->connect (this->supplier_admin_.in ()
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Setup the CA to receive all type of events
@@ -128,19 +128,19 @@ Events_Test::init (int argc,
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  this->consumer_admin_->subscription_change (added, 
-                                              removed 
-                                              TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->subscription_change (added,
+                                              removed
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Events_Test::parse_args (int argc, 
+Events_Test::parse_args (int argc,
                          char *argv[])
 {
-    ACE_Arg_Shifter arg_shifter (argc, 
+    ACE_Arg_Shifter arg_shifter (argc,
                                  argv);
     const char *current_arg = 0;
 
@@ -173,14 +173,14 @@ Events_Test::parse_args (int argc,
 }
 
 void
-Events_Test::create_EC (TAO_ENV_SINGLE_ARG_DECL)
+Events_Test::create_EC (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
                                                id
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   /****************************************************************/
@@ -198,7 +198,7 @@ Events_Test::create_EC (TAO_ENV_SINGLE_ARG_DECL)
 
   admin[1].value <<= (CORBA::Long)2;
 
-  ec_->set_admin (admin TAO_ENV_ARG_PARAMETER);
+  ec_->set_admin (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;*/
 
   /****************************************************************/
@@ -210,20 +210,20 @@ Events_Test::on_event_received (void)
 {
   ++this->result_count_;
 
-  ACE_DEBUG ((LM_DEBUG, 
-              "event count = #%d\n", 
+  ACE_DEBUG ((LM_DEBUG,
+              "event count = #%d\n",
               this->result_count_.value ()));
 
   if (this->result_count_ == 2 * this->event_count_)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
-      this->end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ACE_DECLARE_NEW_CORBA_ENV;
+      this->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Events_Test::run_test (TAO_ENV_SINGLE_ARG_DECL)
+Events_Test::run_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   // operations:
   CosNotification::StructuredEvent event;
@@ -269,35 +269,35 @@ Events_Test::run_test (TAO_ENV_SINGLE_ARG_DECL)
       qos[0].name = CORBA::string_dup (CosNotification::Priority);
       qos[0].value <<= (CORBA::Short)prio++;
 
-      this->supplier_->send_event (event 
-                                   TAO_ENV_ARG_PARAMETER);
+      this->supplier_->send_event (event
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Events_Test::end_test (TAO_ENV_SINGLE_ARG_DECL)
+Events_Test::end_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
 Events_Test::check_results (void)
 {
   // Destroy the channel.
-  TAO_ENV_DECLARE_NEW_ENV;
-  this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_DECLARE_NEW_CORBA_ENV;
+  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->result_count_ == 2 * this->event_count_)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "Events test success\n"));
       return 0;
     }
   else
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "Events test failed!\n"));
       return 1;
     }
@@ -317,12 +317,12 @@ main (int argc, char* argv[])
 
   ACE_TRY_NEW_ENV
     {
-      events.init (argc, 
+      events.init (argc,
                    argv
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      events.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       events.ORB_run ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h
index 5996fc6908f..5ba90f996f7 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h
@@ -39,7 +39,7 @@ public:
   // = StructuredPushSupplier methods.
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
@@ -72,28 +72,28 @@ public:
   Events_Test (void);
   virtual ~Events_Test (void);
 
-  int parse_args (int argc, 
+  int parse_args (int argc,
                   char *argv[]) ;
 
-  int init (int argc, 
-            char *argv [] 
-            TAO_ENV_ARG_DECL);
+  int init (int argc,
+            char *argv []
+            ACE_ENV_ARG_DECL);
   // Initialization.
 
   void on_event_received (void);
   // Called when an event is received.
 
-  void run_test (TAO_ENV_SINGLE_ARG_DECL);
+  void run_test (ACE_ENV_SINGLE_ARG_DECL);
   // Run the test.
 
-  void end_test (TAO_ENV_SINGLE_ARG_DECL);
+  void end_test (ACE_ENV_SINGLE_ARG_DECL);
   // End the test.
 
   int check_results (void);
   // check if we got the expected results.
 
 protected:
-  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
+  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
   // Create EC
 
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 9538e868cd0..7ce64a50f62 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -21,7 +21,7 @@ IdAssignment::~IdAssignment (void)
 }
 
 int
-IdAssignment::parse_args (int argc, 
+IdAssignment::parse_args (int argc,
                           char *argv[])
 {
     ACE_Arg_Shifter arg_shifter (argc, argv);
@@ -59,7 +59,7 @@ IdAssignment::parse_args (int argc,
                      "-ec_count <count>",
                      "-ca_count <count>",
                      "-sa_count <count>\n",
-                     argv[0], 
+                     argv[0],
                      argv[0]));
 
           arg_shifter.consume_arg ();
@@ -76,19 +76,19 @@ IdAssignment::parse_args (int argc,
 }
 
 void
-IdAssignment::init (int argc, 
-                    char *argv[] 
-                    TAO_ENV_ARG_DECL)
+IdAssignment::init (int argc,
+                    char *argv[]
+                    ACE_ENV_ARG_DECL)
 {
-  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_CHECK;
 
-  CORBA::Object_var rootObj = 
+  CORBA::Object_var rootObj =
     orb->resolve_initial_references ("NameService"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (rootObj.in ()))
@@ -99,16 +99,16 @@ IdAssignment::init (int argc,
 
     }
   CosNaming::NamingContext_var rootNC =
-    CosNaming::NamingContext::_narrow (rootObj.in () 
-                                       TAO_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (rootObj.in ()
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
 
-  CORBA::Object_var obj = rootNC->resolve (name 
-                                           TAO_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = rootNC->resolve (name
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (obj.in ()))
@@ -118,17 +118,17 @@ IdAssignment::init (int argc,
       return;
     }
 
-  this->notify_factory_ = 
+  this->notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
         obj.in()
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 
 }
 
 CosNotifyChannelAdmin::ChannelID
-IdAssignment::create_ec (TAO_ENV_SINGLE_ARG_DECL)
+IdAssignment::create_ec (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
   CosNotification::QoSProperties initial_qos;
@@ -137,7 +137,7 @@ IdAssignment::create_ec (TAO_ENV_SINGLE_ARG_DECL)
     this->notify_factory_->create_channel (initial_qos,
                                            initial_admin,
                                            id
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return id;
@@ -146,11 +146,11 @@ IdAssignment::create_ec (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (id 
-                                              TAO_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (id
+                                              ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 
@@ -161,21 +161,21 @@ IdAssignment::destroy_ec(CosNotifyChannelAdmin::ChannelID id
       return;
     }
 
-   ec->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+   ec->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
    ACE_CHECK;
 }
 
 CosNotifyChannelAdmin::AdminID
 IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
     CosNotifyChannelAdmin::OR_OP;
 
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (channel_id 
-                                              TAO_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (channel_id
+                                              ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -187,16 +187,16 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
     }
 
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->new_for_suppliers (ifgop, 
-                           adminid 
-                           TAO_ENV_ARG_PARAMETER);
+    ec->new_for_suppliers (ifgop,
+                           adminid
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (CORBA::is_nil (supplier_admin.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
                        " (%P|%t) Unable to create supplier admin\n"),0);
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "created supplier admin\n"));
 
   return adminid;
@@ -204,15 +204,15 @@ IdAssignment::create_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id
 
 CosNotifyChannelAdmin::AdminID
 IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
     CosNotifyChannelAdmin::OR_OP;
 
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (channel_id 
-                                              TAO_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (channel_id
+                                              ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -224,16 +224,16 @@ IdAssignment::create_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id
     }
 
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->new_for_consumers (ifgop, 
-                           adminid 
-                           TAO_ENV_ARG_PARAMETER);
+    ec->new_for_consumers (ifgop,
+                           adminid
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (CORBA::is_nil (consumer_admin.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
                        " (%P|%t) Unable to create consumer admin\n"),0);
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "created consumer admin\n"));
 
   return adminid;
@@ -244,12 +244,12 @@ void
 IdAssignment::destroy_consumer_admin (
     CosNotifyChannelAdmin::ChannelID channel_id,
     CosNotifyChannelAdmin::AdminID admin_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (channel_id 
-                                              TAO_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (channel_id
+                                              ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 
@@ -261,8 +261,8 @@ IdAssignment::destroy_consumer_admin (
     }
 
   CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
-    ec->get_consumeradmin (admin_id 
-                           TAO_ENV_ARG_PARAMETER);
+    ec->get_consumeradmin (admin_id
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (consumer_admin.in()))
@@ -271,10 +271,10 @@ IdAssignment::destroy_consumer_admin (
                   " (%P|%t) Unable to get consumer admin\n"));
     }
 
-  consumer_admin->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  consumer_admin->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "destroyed consumer admin\n"));
 }
 
@@ -283,12 +283,12 @@ void
 IdAssignment::destroy_supplier_admin (
     CosNotifyChannelAdmin::ChannelID channel_id,
     CosNotifyChannelAdmin::AdminID admin_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   CosNotifyChannelAdmin::EventChannel_var ec =
-    this->notify_factory_->get_event_channel (channel_id 
-                                              TAO_ENV_ARG_PARAMETER);
+    this->notify_factory_->get_event_channel (channel_id
+                                              ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 
@@ -299,23 +299,23 @@ IdAssignment::destroy_supplier_admin (
     }
 
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin =
-    ec->get_supplieradmin (admin_id 
-                           TAO_ENV_ARG_PARAMETER);
+    ec->get_supplieradmin (admin_id
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (supplier_admin.in ()))
     ACE_ERROR ((LM_ERROR,
                 " (%P|%t) Unable to get supplier admin\n"));
 
-  supplier_admin->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  supplier_admin->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "destroyed supplier admin\n"));
 }
 
 void
-IdAssignment::run_test(TAO_ENV_SINGLE_ARG_DECL)
+IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID* ec_id = 0;
   ACE_NEW (ec_id,
@@ -339,30 +339,30 @@ IdAssignment::run_test(TAO_ENV_SINGLE_ARG_DECL)
 
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          ec_id[ec_count] = this->create_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ec_id[ec_count] = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
-          // Connect <consumer_admin_count_> number of consumers 
+          // Connect <consumer_admin_count_> number of consumers
           // to the current ec.
-          for (int cons_count = 0; 
-               cons_count < this->consumer_admin_count_; 
+          for (int cons_count = 0;
+               cons_count < this->consumer_admin_count_;
                ++cons_count)
             {
-              consumer_admin_id [cons_count] = 
+              consumer_admin_id [cons_count] =
                 this->create_consumer_admin (ec_id [ec_count]
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
 
-          // Connect <supplier_admin_count_> number of suppliers 
+          // Connect <supplier_admin_count_> number of suppliers
           // to the current ec.
-          for (int supp_count = 0; 
-               supp_count < this->supplier_admin_count_; 
+          for (int supp_count = 0;
+               supp_count < this->supplier_admin_count_;
                ++supp_count)
             {
-              supplier_admin_id [supp_count] = 
+              supplier_admin_id [supp_count] =
                 this->create_supplier_admin (ec_id [ec_count]
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -370,8 +370,8 @@ IdAssignment::run_test(TAO_ENV_SINGLE_ARG_DECL)
       // Destroy the ec, the admins should destroy too.
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          this->destroy_ec (ec_id[ec_count] 
-                            TAO_ENV_ARG_PARAMETER);
+          this->destroy_ec (ec_id[ec_count]
+                            ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -386,63 +386,63 @@ IdAssignment::run_test(TAO_ENV_SINGLE_ARG_DECL)
 
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          ec_id[ec_count] = this->create_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ec_id[ec_count] = this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           int cons_count, supp_count;
-          // Connect <consumer_admin_count_> number of consumers 
+          // Connect <consumer_admin_count_> number of consumers
           // to the current ec.
-          for (cons_count = 0; 
-               cons_count < this->consumer_admin_count_; 
+          for (cons_count = 0;
+               cons_count < this->consumer_admin_count_;
                ++cons_count)
             {
-              consumer_admin_id[cons_count] = 
+              consumer_admin_id[cons_count] =
                 this->create_consumer_admin (ec_id[ec_count]
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
 
-          // Connect <supplier_admin_count_> number of suppliers 
+          // Connect <supplier_admin_count_> number of suppliers
           // to the current ec.
           for (supp_count = 0; supp_count < this->supplier_admin_count_; ++supp_count)
             {
-              supplier_admin_id[supp_count] = 
+              supplier_admin_id[supp_count] =
                 this->create_supplier_admin (ec_id[ec_count]
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
 
           // Destroy the admins.
 
           // Destroy consumer admins.
-          for (cons_count = 0; 
-               cons_count < this->consumer_admin_count_; 
+          for (cons_count = 0;
+               cons_count < this->consumer_admin_count_;
                ++cons_count)
             {
               this->destroy_consumer_admin (ec_id[ec_count],
                                             consumer_admin_id[cons_count]
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
 
           // Destroy supplier admins
-          for (supp_count = 0; 
-               supp_count < this->supplier_admin_count_; 
+          for (supp_count = 0;
+               supp_count < this->supplier_admin_count_;
                ++supp_count)
             {
-              this->destroy_supplier_admin (ec_id[ec_count], 
+              this->destroy_supplier_admin (ec_id[ec_count],
                                             supplier_admin_id[supp_count]
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
 
-        } 
+        }
 
       // Destroy the ec,
       for (ec_count = 0; ec_count < this->ec_count_; ++ec_count)
         {
-          this->destroy_ec (ec_id[ec_count] 
-                            TAO_ENV_ARG_PARAMETER);
+          this->destroy_ec (ec_id[ec_count]
+                            ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -453,20 +453,20 @@ IdAssignment::run_test(TAO_ENV_SINGLE_ARG_DECL)
 
 int main (int argc, char* argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       IdAssignment test;
 
-      test.parse_args (argc, 
+      test.parse_args (argc,
                        argv);
 
-      test.init (argc, 
-                 argv 
-                 TAO_ENV_ARG_PARAMETER);
+      test.init (argc,
+                 argv
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -477,7 +477,7 @@ int main (int argc, char* argv[])
     }
   ACE_ENDTRY;
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "IdAssignment test suceeded\n"));
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
index 4aa7d836ffd..6902d2e8dc3 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -24,33 +24,33 @@ public:
   IdAssignment (void);
   ~IdAssignment (void);
 
-  int parse_args (int argc, 
+  int parse_args (int argc,
                   char *argv[]);
-  void init (int argc, 
-             char *argv[] 
-             TAO_ENV_ARG_DECL);
-  void run_test (TAO_ENV_SINGLE_ARG_DECL);
+  void init (int argc,
+             char *argv[]
+             ACE_ENV_ARG_DECL);
+  void run_test (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
-  CosNotifyChannelAdmin::ChannelID create_ec (TAO_ENV_SINGLE_ARG_DECL);
+  CosNotifyChannelAdmin::ChannelID create_ec (ACE_ENV_SINGLE_ARG_DECL);
   void destroy_ec (CosNotifyChannelAdmin::ChannelID id
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 
   CosNotifyChannelAdmin::AdminID create_supplier_admin (
-      CosNotifyChannelAdmin::ChannelID channel_id 
-      TAO_ENV_ARG_DECL
+      CosNotifyChannelAdmin::ChannelID channel_id
+      ACE_ENV_ARG_DECL
     );
   CosNotifyChannelAdmin::AdminID create_consumer_admin (
-      CosNotifyChannelAdmin::ChannelID channel_id 
-      TAO_ENV_ARG_DECL
+      CosNotifyChannelAdmin::ChannelID channel_id
+      ACE_ENV_ARG_DECL
     );
 
-  void destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id, 
-                               CosNotifyChannelAdmin::AdminID admin_id 
-                               TAO_ENV_ARG_DECL);
-  void destroy_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id, 
-                               CosNotifyChannelAdmin::AdminID admin_id 
-                               TAO_ENV_ARG_DECL);
+  void destroy_consumer_admin (CosNotifyChannelAdmin::ChannelID channel_id,
+                               CosNotifyChannelAdmin::AdminID admin_id
+                               ACE_ENV_ARG_DECL);
+  void destroy_supplier_admin (CosNotifyChannelAdmin::ChannelID channel_id,
+                               CosNotifyChannelAdmin::AdminID admin_id
+                               ACE_ENV_ARG_DECL);
 
   // = Data members.
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.cpp
index a25ee864693..0e03502384b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.cpp
@@ -11,7 +11,7 @@
 ACE_RCSID (Notify_Tests, LifeCycleTest, "$Id$")
 
 LifeCycleTest::LifeCycleTest (void)
-  : count_ (10) 
+  : count_ (10)
 {
 }
 
@@ -20,10 +20,10 @@ LifeCycleTest::~LifeCycleTest (void)
 }
 
 int
-LifeCycleTest::parse_args (int argc, 
+LifeCycleTest::parse_args (int argc,
                            char *argv[])
 {
-    ACE_Arg_Shifter arg_shifter (argc, 
+    ACE_Arg_Shifter arg_shifter (argc,
                                  argv);
 
     const char *current_arg = 0;
@@ -41,7 +41,7 @@ LifeCycleTest::parse_args (int argc,
           ACE_DEBUG ((LM_DEBUG,
                       "usage: %s "
                       "-count testcount \n",
-                      argv[0], 
+                      argv[0],
                       argv[0]));
 
           arg_shifter.consume_arg ();
@@ -58,19 +58,19 @@ LifeCycleTest::parse_args (int argc,
 }
 
 void
-LifeCycleTest::init (int argc, 
-                     char* argv[] 
-                     TAO_ENV_ARG_DECL)
+LifeCycleTest::init (int argc,
+                     char* argv[]
+                     ACE_ENV_ARG_DECL)
 {
-  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_CHECK;
 
-  CORBA::Object_var rootObj = 
+  CORBA::Object_var rootObj =
     orb->resolve_initial_references ("NameService"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (rootObj.in ()))
@@ -82,21 +82,21 @@ LifeCycleTest::init (int argc,
 
   CosNaming::NamingContext_var rootNC =
     CosNaming::NamingContext::_narrow (rootObj.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNaming::Name name (1);
   name.length (1);
   name[0].id = CORBA::string_dup ("NotifyEventChannelFactory");
 
-  CORBA::Object_var obj = rootNC->resolve (name 
-                                           TAO_ENV_ARG_PARAMETER);
+  CORBA::Object_var obj = rootNC->resolve (name
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
         obj.in()
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 
@@ -110,32 +110,32 @@ LifeCycleTest::init (int argc,
 }
 
 void
-LifeCycleTest::run_test(TAO_ENV_SINGLE_ARG_DECL)
+LifeCycleTest::run_test(ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int i = 0; i < this->count_; ++i)
     {
-     this->create_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
+     this->create_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
      ACE_CHECK;
 
-     this->create_supplier_admin (TAO_ENV_SINGLE_ARG_PARAMETER);
+     this->create_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
      ACE_CHECK;
 
-     this->create_consumer_admin (TAO_ENV_SINGLE_ARG_PARAMETER);
+     this->create_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
      ACE_CHECK;
 
-     this->destroy_consumer_admin (TAO_ENV_SINGLE_ARG_PARAMETER);
+     this->destroy_consumer_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
      ACE_CHECK;
 
-     this->destroy_supplier_admin (TAO_ENV_SINGLE_ARG_PARAMETER);
+     this->destroy_supplier_admin (ACE_ENV_SINGLE_ARG_PARAMETER);
      ACE_CHECK;
 
-     this->destroy_ec (TAO_ENV_SINGLE_ARG_PARAMETER);
+     this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER);
      ACE_CHECK;
   }
 }
 
 void
-LifeCycleTest::create_ec (TAO_ENV_SINGLE_ARG_DECL)
+LifeCycleTest::create_ec (ACE_ENV_SINGLE_ARG_DECL)
 {
     CosNotifyChannelAdmin::ChannelID id;
     CosNotification::QoSProperties initial_qos;
@@ -144,7 +144,7 @@ LifeCycleTest::create_ec (TAO_ENV_SINGLE_ARG_DECL)
     this->ec_ = notify_factory_->create_channel (initial_qos,
                                                  initial_admin,
                                                  id
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (CORBA::is_nil (ec_.in ())) {
@@ -153,80 +153,80 @@ LifeCycleTest::create_ec (TAO_ENV_SINGLE_ARG_DECL)
       return;
     }
 
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
                 "created event channel\n"));
 }
 
 void
-LifeCycleTest::create_supplier_admin (TAO_ENV_SINGLE_ARG_DECL)
+LifeCycleTest::create_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
           CosNotifyChannelAdmin::OR_OP;
 
-  supplier_admin_ = this->ec_->new_for_suppliers (ifgop, 
-                                                  adminid 
-                                                  TAO_ENV_ARG_PARAMETER);
+  supplier_admin_ = this->ec_->new_for_suppliers (ifgop,
+                                                  adminid
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  if (CORBA::is_nil (supplier_admin_.in ())) 
+  if (CORBA::is_nil (supplier_admin_.in ()))
     {
       ACE_ERROR ((LM_ERROR,
                   " (%P|%t) Unable to create supplier admin\n"));
       return;
     }
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "created supplier admin\n"));
 }
 
 void
-LifeCycleTest::create_consumer_admin (TAO_ENV_SINGLE_ARG_DECL)
+LifeCycleTest::create_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
   CosNotifyChannelAdmin::InterFilterGroupOperator ifgop =
     CosNotifyChannelAdmin::OR_OP;
 
-  consumer_admin_ = ec_->new_for_consumers (ifgop, adminid TAO_ENV_ARG_PARAMETER);
+  consumer_admin_ = ec_->new_for_consumers (ifgop, adminid ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  if (CORBA::is_nil (consumer_admin_.in())) 
+  if (CORBA::is_nil (consumer_admin_.in()))
     {
       ACE_ERROR ((LM_ERROR,
                          " (%P|%t) Unable to find supplier admin\n"));
       return;
     }
 
-   ACE_DEBUG ((LM_DEBUG, 
+   ACE_DEBUG ((LM_DEBUG,
                "created consumer admin\n"));
 }
 
 void
-LifeCycleTest::destroy_supplier_admin (TAO_ENV_SINGLE_ARG_DECL)
+LifeCycleTest::destroy_supplier_admin (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->supplier_admin_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->supplier_admin_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "destroyed supplier admin\n"));
 }
 
 void
-LifeCycleTest::destroy_consumer_admin (TAO_ENV_SINGLE_ARG_DECL)
+LifeCycleTest::destroy_consumer_admin (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->consumer_admin_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->consumer_admin_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "destroyed consumer admin\n"));
 }
 
 void
-LifeCycleTest::destroy_ec (TAO_ENV_SINGLE_ARG_DECL)
+LifeCycleTest::destroy_ec (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "destroyed event channel\n"));
 }
 
@@ -234,20 +234,20 @@ LifeCycleTest::destroy_ec (TAO_ENV_SINGLE_ARG_DECL)
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       LifeCycleTest test;
 
-      test.parse_args (argc, 
+      test.parse_args (argc,
                        argv);
 
-      test.init (argc, 
-                 argv 
-                 TAO_ENV_ARG_PARAMETER);
+      test.init (argc,
+                 argv
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH(CosNotification::UnsupportedAdmin, ex)
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.h b/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.h
index 1f07e5ab8f3..b00a9008184 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.h
@@ -22,20 +22,20 @@ public:
   LifeCycleTest (void);
   ~LifeCycleTest (void);
 
-  void init (int argc, 
-             char *argv[] 
-             TAO_ENV_ARG_DECL);
-  void run_test (TAO_ENV_SINGLE_ARG_DECL);
-  int parse_args (int argc, 
+  void init (int argc,
+             char *argv[]
+             ACE_ENV_ARG_DECL);
+  void run_test (ACE_ENV_SINGLE_ARG_DECL);
+  int parse_args (int argc,
                   char *argv[]);
 
 private:
-   void create_ec (TAO_ENV_SINGLE_ARG_DECL);
-   void create_supplier_admin (TAO_ENV_SINGLE_ARG_DECL);
-   void create_consumer_admin (TAO_ENV_SINGLE_ARG_DECL);
-   void destroy_ec (TAO_ENV_SINGLE_ARG_DECL);
-   void destroy_supplier_admin (TAO_ENV_SINGLE_ARG_DECL);
-   void destroy_consumer_admin (TAO_ENV_SINGLE_ARG_DECL);
+   void create_ec (ACE_ENV_SINGLE_ARG_DECL);
+   void create_supplier_admin (ACE_ENV_SINGLE_ARG_DECL);
+   void create_consumer_admin (ACE_ENV_SINGLE_ARG_DECL);
+   void destroy_ec (ACE_ENV_SINGLE_ARG_DECL);
+   void destroy_supplier_admin (ACE_ENV_SINGLE_ARG_DECL);
+   void destroy_consumer_admin (ACE_ENV_SINGLE_ARG_DECL);
 
    CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_;
    CosNotifyChannelAdmin::EventChannel_var ec_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index f1be504404e..af047f47db1 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -15,15 +15,15 @@ Event_AnyPushConsumer::Event_AnyPushConsumer (Simple_Test *test_client)
 
 void
 Event_AnyPushConsumer::push (const CORBA::Any & data
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
   int event_num;
   data >>= event_num;
 
-  ACE_DEBUG ((LM_DEBUG, 
-              "Received event# %d\n", 
+  ACE_DEBUG ((LM_DEBUG,
+              "Received event# %d\n",
               event_num));
 
   this->test_client_->on_event_received ();
@@ -52,34 +52,34 @@ Simple_Test::~Simple_Test (void)
 }
 
 int
-Simple_Test::init (int argc, 
-                   char* argv [] 
-                   TAO_ENV_ARG_DECL)
+Simple_Test::init (int argc,
+                   char* argv []
+                   ACE_ENV_ARG_DECL)
 {
   // Initialized the base class.
-  Notify_Test_Client::init (argc, 
-                            argv 
-                            TAO_ENV_ARG_PARAMETER);
+  Notify_Test_Client::init (argc,
+                            argv
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create all participents.
-  this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    this->ec_->new_for_suppliers (this->ifgop_, 
-                                  adminid 
-                                  TAO_ENV_ARG_PARAMETER);
+    this->ec_->new_for_suppliers (this->ifgop_,
+                                  adminid
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
-    this->ec_->new_for_consumers (this->ifgop_, 
-                                  adminid 
-                                  TAO_ENV_ARG_PARAMETER);
+    this->ec_->new_for_consumers (this->ifgop_,
+                                  adminid
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -87,33 +87,33 @@ Simple_Test::init (int argc,
   ACE_NEW_RETURN (this->consumer_,
                   Event_AnyPushConsumer (this),
                   -1);
-  this->consumer_->init (root_poa_.in () 
-                         TAO_ENV_ARG_PARAMETER);
+  this->consumer_->init (root_poa_.in ()
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  this->consumer_->connect (this->consumer_admin_.in () 
-                            TAO_ENV_ARG_PARAMETER);
+  this->consumer_->connect (this->consumer_admin_.in ()
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Event_AnyPushConsumer* consumer2;
   ACE_NEW_RETURN (consumer2,
                   Event_AnyPushConsumer (this),
                   -1);
-  consumer2->init (root_poa_.in () 
-                   TAO_ENV_ARG_PARAMETER);
+  consumer2->init (root_poa_.in ()
+                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  consumer2->connect (this->consumer_admin_.in () 
-                      TAO_ENV_ARG_PARAMETER);
+  consumer2->connect (this->consumer_admin_.in ()
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (this->supplier_,
                   Event_AnyPushSupplier (this),
                   -1);
-  this->supplier_->init (root_poa_.in () 
-                         TAO_ENV_ARG_PARAMETER);
+  this->supplier_->init (root_poa_.in ()
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->supplier_->connect (this->supplier_admin_.in () 
-                            TAO_ENV_ARG_PARAMETER);
+  this->supplier_->connect (this->supplier_admin_.in ()
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Setup the CA to receive all type of events
@@ -125,19 +125,19 @@ Simple_Test::init (int argc,
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  this->consumer_admin_->subscription_change (added, 
-                                              removed 
-                                              TAO_ENV_ARG_PARAMETER);
+  this->consumer_admin_->subscription_change (added,
+                                              removed
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Simple_Test::parse_args (int argc, 
+Simple_Test::parse_args (int argc,
                          char *argv[])
 {
-    ACE_Arg_Shifter arg_shifter (argc, 
+    ACE_Arg_Shifter arg_shifter (argc,
                                  argv);
 
     const char *current_arg = 0;
@@ -155,7 +155,7 @@ Simple_Test::parse_args (int argc,
           ACE_DEBUG ((LM_DEBUG,
                       "usage: %s "
                       "-events event_count \n",
-                      argv[0], 
+                      argv[0],
                       argv[0]));
 
           arg_shifter.consume_arg ();
@@ -171,14 +171,14 @@ Simple_Test::parse_args (int argc,
 }
 
 void
-Simple_Test::create_EC (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Test::create_EC (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
                                                id
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
@@ -189,20 +189,20 @@ Simple_Test::on_event_received (void)
 {
   ++this->result_count_;
 
-  ACE_DEBUG ((LM_DEBUG, 
-              "event count = #%d\n", 
+  ACE_DEBUG ((LM_DEBUG,
+              "event count = #%d\n",
               this->result_count_.value ()));
 
   if (this->result_count_ == 2 * this->event_count_)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
-      this->end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ACE_DECLARE_NEW_CORBA_ENV;
+      this->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Simple_Test::run_test (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Test::run_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Any data;
 
@@ -210,35 +210,35 @@ Simple_Test::run_test (TAO_ENV_SINGLE_ARG_DECL)
     {
       data <<= (CORBA::Long)i;
 
-      this->supplier_->send_event (data 
-                                   TAO_ENV_ARG_PARAMETER);
+      this->supplier_->send_event (data
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Simple_Test::end_test (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Test::end_test (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int
 Simple_Test::check_results (void)
 {
   // Destroy the channel
-  TAO_ENV_DECLARE_NEW_ENV;
-  this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_DECLARE_NEW_CORBA_ENV;
+  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->result_count_ == 2 * this->event_count_)
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "Events test success\n"));
       return 0;
     }
   else
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "Events test failed!\n"));
       return 1;
     }
@@ -258,12 +258,12 @@ main (int argc, char* argv[])
 
   ACE_TRY_NEW_ENV
     {
-      events.init (argc, 
+      events.init (argc,
                    argv
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      events.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       events.ORB_run ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index 7247dae4f88..b584e342035 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -40,7 +40,7 @@ public:
   // = PushSupplier methods
   virtual void push (
       const CORBA::Any & data
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
@@ -73,28 +73,28 @@ public:
   Simple_Test (void);
   virtual ~Simple_Test (void);
 
-  int parse_args (int argc, 
+  int parse_args (int argc,
                   char *argv[]) ;
 
-  int init (int argc, 
-            char *argv [] 
-            TAO_ENV_ARG_DECL);
+  int init (int argc,
+            char *argv []
+            ACE_ENV_ARG_DECL);
   // initialization.
 
   void on_event_received (void);
   // Called when an event is received.
 
-  void run_test (TAO_ENV_SINGLE_ARG_DECL);
+  void run_test (ACE_ENV_SINGLE_ARG_DECL);
   // Run the test.
 
-  void end_test (TAO_ENV_SINGLE_ARG_DECL);
+  void end_test (ACE_ENV_SINGLE_ARG_DECL);
   // End the test.
 
   int check_results (void);
   // check if we got the expected results.
 
 protected:
-  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
+  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
   // Create EC
 
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index c103b0be690..d200b31c9ad 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -17,7 +17,7 @@ void
 Update_StructuredPushConsumer::offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
   ACE_THROW_SPEC ((
                    CORBA::SystemException,
@@ -27,14 +27,14 @@ Update_StructuredPushConsumer::offer_change (
   if (added.length () > 0)
     {
       test_client_->offers_added_ = added.length ();
-      this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->test_client_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   if (removed.length () > 0)
     {
       test_client_->offers_removed_ = removed.length ();
-      this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->test_client_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -56,7 +56,7 @@ void
 Update_StructuredPushSupplier::subscription_change (
     const CosNotification::EventTypeSeq & added,
     const CosNotification::EventTypeSeq & removed
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
@@ -64,14 +64,14 @@ Update_StructuredPushSupplier::subscription_change (
   if (added.length () > 0)
     {
       test_client_->subscriptions_added_ = added.length ();
-      this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->test_client_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   if (removed.length () > 0)
     {
       test_client_->subscriptions_removed_ = removed.length ();
-      this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->test_client_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -89,34 +89,34 @@ Updates::~Updates ()
 }
 
 int
-Updates::init (int argc, 
-               char* argv [] 
-               TAO_ENV_ARG_DECL)
+Updates::init (int argc,
+               char* argv []
+               ACE_ENV_ARG_DECL)
 {
   // Initialize base class.
-  Notify_Test_Client::init (argc, 
-                            argv 
-                            TAO_ENV_ARG_PARAMETER);
+  Notify_Test_Client::init (argc,
+                            argv
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create all participents.
-  this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, 
-                            adminid 
-                            TAO_ENV_ARG_PARAMETER);
+    ec_->new_for_suppliers (this->ifgop_,
+                            adminid
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, 
-                            adminid 
-                            TAO_ENV_ARG_PARAMETER);
+    ec_->new_for_consumers (this->ifgop_,
+                            adminid
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -124,33 +124,33 @@ Updates::init (int argc,
   ACE_NEW_RETURN (consumer_,
                   Update_StructuredPushConsumer (this),
                   -1);
-  consumer_->init (root_poa_.in () 
-                   TAO_ENV_ARG_PARAMETER);
+  consumer_->init (root_poa_.in ()
+                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  consumer_->connect (this->consumer_admin_.in () 
-                      TAO_ENV_ARG_PARAMETER);
+  consumer_->connect (this->consumer_admin_.in ()
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_NEW_RETURN (supplier_,
                  Update_StructuredPushSupplier (this),
                  -1);
-  supplier_->init (root_poa_.in () 
-                   TAO_ENV_ARG_PARAMETER);
+  supplier_->init (root_poa_.in ()
+                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  supplier_->connect (this->supplier_admin_.in () 
-                      TAO_ENV_ARG_PARAMETER);
+  supplier_->connect (this->supplier_admin_.in ()
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-Updates::parse_args (int argc, 
+Updates::parse_args (int argc,
                      char *argv[])
 {
-    ACE_Arg_Shifter arg_shifter (argc, 
+    ACE_Arg_Shifter arg_shifter (argc,
                                  argv);
 
     const char *current_arg = 0;
@@ -168,7 +168,7 @@ Updates::parse_args (int argc,
           ACE_DEBUG ((LM_DEBUG,
                       "usage: %s "
                       "-updates update_count \n",
-                      argv[0], 
+                      argv[0],
                       argv[0]));
 
           arg_shifter.consume_arg ();
@@ -185,21 +185,21 @@ Updates::parse_args (int argc,
 }
 
 void
-Updates::create_EC (TAO_ENV_SINGLE_ARG_DECL)
+Updates::create_EC (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   ec_ = notify_factory_->create_channel (initial_qos_,
                                          initial_admin_,
                                          id
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-Updates::run_test (TAO_ENV_SINGLE_ARG_DECL)
+Updates::run_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotification::EventTypeSeq added (update_count_), removed (update_count_);
   added.length (update_count_);
@@ -220,16 +220,16 @@ Updates::run_test (TAO_ENV_SINGLE_ARG_DECL)
 
   // Test added.
   this->supplier_->get_proxy_consumer ()->offer_change (
-                                              added, 
-                                              removed 
-                                              TAO_ENV_ARG_PARAMETER
+                                              added,
+                                              removed
+                                              ACE_ENV_ARG_PARAMETER
                                             );
   ACE_CHECK;
 
   this->consumer_->get_proxy_supplier ()->subscription_change (
-                                              added, 
+                                              added,
                                               removed
-                                              TAO_ENV_ARG_PARAMETER
+                                              ACE_ENV_ARG_PARAMETER
                                             );
   ACE_CHECK;
 
@@ -240,40 +240,40 @@ Updates::run_test (TAO_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < update_count_; ++i)
     {
-      ACE_OS::sprintf (update_test_buf, 
-                       "%s_%d", 
-                       this->domain_name_, 
+      ACE_OS::sprintf (update_test_buf,
+                       "%s_%d",
+                       this->domain_name_,
                        i);
       removed[i].domain_name =  CORBA::string_dup (update_test_buf);
 
-      ACE_OS::sprintf (update_test_buf, 
-                       "%s_%d", 
-                       this->type_name_, 
+      ACE_OS::sprintf (update_test_buf,
+                       "%s_%d",
+                       this->type_name_,
                        i);
       removed[i].type_name = CORBA::string_dup (update_test_buf);
     }
 
   this->supplier_->get_proxy_consumer ()->offer_change (
-                                              added, 
-                                              removed 
-                                              TAO_ENV_ARG_PARAMETER
+                                              added,
+                                              removed
+                                              ACE_ENV_ARG_PARAMETER
                                             );
   ACE_CHECK;
 
   this->consumer_->get_proxy_supplier ()->subscription_change (
-                                              added, 
+                                              added,
                                               removed
-                                              TAO_ENV_ARG_PARAMETER
+                                              ACE_ENV_ARG_PARAMETER
                                             );
   ACE_CHECK;
 }
 
 void
-Updates::end_test (TAO_ENV_SINGLE_ARG_DECL)
+Updates::end_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (++this->result_count_ == 4)
     {
-      this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -282,16 +282,16 @@ int
 Updates::check_results (void)
 {
   // Destroy the channel.
-  TAO_ENV_DECLARE_NEW_ENV;
-  this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_DECLARE_NEW_CORBA_ENV;
+  this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "offers_added_ = %d, offers_removed_ = %d, "
               "subscriptions_added_= %d, subscriptions_removed_ = %d\n",
-              offers_added_, 
-              offers_removed_, 
-              subscriptions_added_, 
+              offers_added_,
+              offers_removed_,
+              subscriptions_added_,
               subscriptions_removed_));
 
   if (offers_added_ == update_count_ &&
@@ -303,7 +303,7 @@ Updates::check_results (void)
     }
   else
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "Updates test failed!\n"));
       return 1;
     }
@@ -323,12 +323,12 @@ main (int argc, char* argv[])
 
   ACE_TRY_NEW_ENV
     {
-      updates.init (argc, 
+      updates.init (argc,
                     argv
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      updates.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      updates.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       updates.ORB_run ();
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index 97f1959099b..0cae692be4d 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -38,7 +38,7 @@ public:
 
   virtual void offer_change (const CosNotification::EventTypeSeq & added,
                              const CosNotification::EventTypeSeq & removed
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType));
   // Offer change is conveyed here.
@@ -61,7 +61,7 @@ public:
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyComm::InvalidEventType));
@@ -82,20 +82,20 @@ public:
 
   int parse_args(int argc, char *argv[]) ;
 
-  int init (int argc, char *argv [] TAO_ENV_ARG_DECL);
+  int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
   // initialization.
 
-  void run_test (TAO_ENV_SINGLE_ARG_DECL);
+  void run_test (ACE_ENV_SINGLE_ARG_DECL);
   // Run the test.
 
-  void end_test (TAO_ENV_SINGLE_ARG_DECL);
+  void end_test (ACE_ENV_SINGLE_ARG_DECL);
   // End the test.
 
   int check_results (void);
   // check if we got the expected results.
 
 protected:
-  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
+  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
   // Create EC
 
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
index 29388cf458d..66b51ff55a7 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
@@ -21,23 +21,23 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 void
 Notify_Structured_Push_Consumer::connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
       proxy_supplier_id_
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-      proxysupplier.in () TAO_ENV_ARG_PARAMETER);
+      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotification::QoSProperties properties (2);
@@ -49,7 +49,7 @@ Notify_Structured_Push_Consumer::connect (
 
   this->proxy_supplier_->set_qos (properties);
   this->proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -60,7 +60,7 @@ Notify_Structured_Push_Consumer::connect (
 void
 Notify_Structured_Push_Consumer::push_structured_event (
                           const CosNotification::StructuredEvent& event
-                          TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Received event:\n"));
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
index 0ec434d244a..6978902cbe9 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
@@ -31,12 +31,12 @@ public:
                         CORBA::Boolean& done);
 
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
   void push_structured_event (const CosNotification::StructuredEvent&
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
index 30641922a15..bf91207e4b8 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
@@ -71,13 +71,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
 create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -90,7 +90,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+  admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -100,7 +100,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                   Notify_Test_Client* client
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // startup the consumer
   Notify_Structured_Push_Consumer* consumer_1;
@@ -111,10 +111,10 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                           expected,
                                           client->done ()),
                     CORBA::NO_MEMORY ());
-  consumer_1->init (client->root_poa () TAO_ENV_ARG_PARAMETER);
+  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  consumer_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  consumer_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -129,21 +129,21 @@ int main (int argc, char* argv[])
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           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;
 
-          sig_var sig = sig::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (sig.in ()))
@@ -155,16 +155,16 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers (admin.in (), &client TAO_ENV_ARG_PARAMETER);
+              create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Tell the supplier to go
-              sig->go (TAO_ENV_SINGLE_ARG_PARAMETER);
+              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::Boolean wait_more = 1;
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index ffaa5e5957d..bfa95d3e7d4 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -34,13 +34,13 @@ static const char* ior_output_file = "supplier.ior";
 class sig_i : public POA_sig
 {
 public:
-  void go (TAO_ENV_SINGLE_ARG_DECL)
+  void go (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 
 void
-sig_i::go (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+sig_i::go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   start = 1;
@@ -87,13 +87,13 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
 create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -147,7 +147,7 @@ SendEvent (void)
 
       ACE_TRY_NEW_ENV
         {
-          supplier_1->send_event (event TAO_ENV_ARG_PARAMETER);
+          supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CORBA::Exception, e)
@@ -162,17 +162,17 @@ SendEvent (void)
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                   PortableServer::POA_ptr poa
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // startup the supplier
   ACE_NEW_THROW_EX (supplier_1,
                     TAO_Notify_StructuredPushSupplier (),
                     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa TAO_ENV_ARG_PARAMETER);
+  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -187,23 +187,23 @@ int main (int argc, char* argv[])
   ACE_TRY_NEW_ENV
     {
       Supplier_Client client;
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 0 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Activate the signaler with the POA
           sig_i sig_impl;
-          sig_var sig = sig_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          sig_var sig = sig_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::String_var ior =
-            orb->object_to_string (sig.in () TAO_ENV_ARG_PARAMETER);
+            orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // If the ior_output_file exists, output the ior to it
@@ -221,10 +221,10 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::SupplierAdmin_var admin =
-            create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_suppliers (admin.in (), client.root_poa () TAO_ENV_ARG_PARAMETER);
+              create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               while (!done)
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
index db7e722407c..7253a498a20 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
@@ -23,23 +23,23 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
 void
 Notify_Sequence_Push_Consumer::connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::SEQUENCE_EVENT,
       proxy_supplier_id_
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-      proxysupplier.in () TAO_ENV_ARG_PARAMETER);
+      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotification::QoSProperties properties (4);
@@ -55,7 +55,7 @@ Notify_Sequence_Push_Consumer::connect (
 
   this->proxy_supplier_->set_qos (properties);
   this->proxy_supplier_->connect_sequence_push_consumer (objref.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -66,7 +66,7 @@ Notify_Sequence_Push_Consumer::connect (
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
                           const CosNotification::EventBatch& events
-                          TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong length = events.length ();
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
index 1a89e095ef7..ce4e713071b 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.h
@@ -31,12 +31,12 @@ public:
                                  CORBA::Boolean& done);
 
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
   void push_structured_events (const CosNotification::EventBatch&
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
index a464b90505e..e1de3435996 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
@@ -20,23 +20,23 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 void
 Notify_Structured_Push_Consumer::connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
       proxy_supplier_id_
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-      proxysupplier.in () TAO_ENV_ARG_PARAMETER);
+      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotification::QoSProperties properties (2);
@@ -48,7 +48,7 @@ Notify_Structured_Push_Consumer::connect (
 
   this->proxy_supplier_->set_qos (properties);
   this->proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -59,7 +59,7 @@ Notify_Structured_Push_Consumer::connect (
 void
 Notify_Structured_Push_Consumer::push_structured_event (
                           const CosNotification::StructuredEvent& event
-                          TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Received event:\n"));
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
index 32c0fa54ed3..4e950fe3174 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.h
@@ -31,12 +31,12 @@ public:
                         CORBA::Boolean& done);
 
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
   void push_structured_event (const CosNotification::StructuredEvent&
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index ab0d4657b69..b60132b79c4 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -107,13 +107,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
 create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -126,7 +126,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+  admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -136,7 +136,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                   Notify_Test_Client* client
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // startup the consumer
   Notify_Sequence_Push_Consumer* consumer_1;
@@ -148,10 +148,10 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                                    client->done ()),
                     CORBA::NO_MEMORY ());
 
-  consumer_1->init (client->root_poa () TAO_ENV_ARG_PARAMETER);
+  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  consumer_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  consumer_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -166,21 +166,21 @@ int main (int argc, char* argv[])
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           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;
 
-          sig_var sig = sig::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (sig.in ()))
@@ -192,16 +192,16 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers (admin.in (), &client TAO_ENV_ARG_PARAMETER);
+              create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Tell the supplier to go
-              sig->go (TAO_ENV_SINGLE_ARG_PARAMETER);
+              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               unsigned int try_count = 0;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index f7480644a8b..e01e1bf312e 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -35,13 +35,13 @@ static const char* ior_output_file = "supplier.ior";
 class sig_i : public POA_sig
 {
 public:
-  void go (TAO_ENV_SINGLE_ARG_DECL)
+  void go (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 
 void
-sig_i::go (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+sig_i::go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   start = 1;
@@ -99,13 +99,13 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
 create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -192,7 +192,7 @@ SendEvents (void)
 
       ACE_TRY_NEW_ENV
         {
-          supplier_1->send_events (events TAO_ENV_ARG_PARAMETER);
+          supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CORBA::Exception, e)
@@ -207,17 +207,17 @@ SendEvents (void)
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                   PortableServer::POA_ptr poa
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // start up the supplier
   ACE_NEW_THROW_EX (supplier_1,
                     TAO_Notify_SequencePushSupplier (),
                     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa TAO_ENV_ARG_PARAMETER);
+  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -232,13 +232,13 @@ int main (int argc, char* argv[])
   ACE_TRY_NEW_ENV
     {
       Supplier_Client client;
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 0 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (use_deadline_ordering)
@@ -251,12 +251,12 @@ int main (int argc, char* argv[])
             }
 
           sig_i sig_impl;
-          sig_var sig = sig_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          sig_var sig = sig_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::String_var ior =
-            orb->object_to_string (sig.in () TAO_ENV_ARG_PARAMETER);
+            orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // If the ior_output_file exists, output the ior to it
@@ -274,10 +274,10 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::SupplierAdmin_var admin =
-            create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_suppliers (admin.in (), client.root_poa () TAO_ENV_ARG_PARAMETER);
+              create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               while (!done)
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index e61aed1bff1..09c2552777f 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -68,7 +68,7 @@ Consumer_Client::parse_args (int argc, char *argv[])
           {
             discard_policy = CosNotification::DeadlineOrder;
 #if !defined (ACE_HAS_TIMED_MESSAGE_BLOCKS)
-            ACE_ERROR_RETURN ((LM_ERROR,   
+            ACE_ERROR_RETURN ((LM_ERROR,
                                "This order policy requires timed message "
                                "blocks.\nPlease #define "
                                "ACE_HAS_TIMED_MESSAGE_BLOCKS in your "
@@ -101,13 +101,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
 create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -120,7 +120,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+  admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -130,7 +130,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                   Notify_Test_Client* client
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // startup the consumer
   Notify_Structured_Push_Consumer* consumer_1;
@@ -141,10 +141,10 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                           expected,
                                           client->done ()),
                     CORBA::NO_MEMORY ());
-  consumer_1->init (client->root_poa () TAO_ENV_ARG_PARAMETER);
+  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  consumer_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  consumer_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -159,21 +159,21 @@ int main (int argc, char* argv[])
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           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;
 
-          sig_var sig = sig::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (sig.in ()))
@@ -185,16 +185,16 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers (admin.in (), &client TAO_ENV_ARG_PARAMETER);
+              create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Tell the supplier to go
-              sig->go (TAO_ENV_SINGLE_ARG_PARAMETER);
+              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::Boolean wait_more = 1;
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 6c6ca1d10f6..30d8f852e7b 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -35,13 +35,13 @@ static const char* ior_output_file = "supplier.ior";
 class sig_i : public POA_sig
 {
 public:
-  void go (TAO_ENV_SINGLE_ARG_DECL)
+  void go (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 
 void
-sig_i::go (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+sig_i::go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   start = 1;
@@ -99,13 +99,13 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
 create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -159,7 +159,7 @@ SendEvent (void)
 
       ACE_TRY_NEW_ENV
         {
-          supplier_1->send_event (event TAO_ENV_ARG_PARAMETER);
+          supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CORBA::Exception, e)
@@ -174,17 +174,17 @@ SendEvent (void)
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                   PortableServer::POA_ptr poa
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // startup the supplier
   ACE_NEW_THROW_EX (supplier_1,
                     TAO_Notify_StructuredPushSupplier (),
                     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa TAO_ENV_ARG_PARAMETER);
+  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -199,13 +199,13 @@ int main (int argc, char* argv[])
   ACE_TRY_NEW_ENV
     {
       Supplier_Client client;
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 0 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (use_deadline_ordering)
@@ -218,12 +218,12 @@ int main (int argc, char* argv[])
             }
 
           sig_i sig_impl;
-          sig_var sig = sig_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          sig_var sig = sig_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::String_var ior =
-            orb->object_to_string (sig.in () TAO_ENV_ARG_PARAMETER);
+            orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // If the ior_output_file exists, output the ior to it
@@ -241,10 +241,10 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::SupplierAdmin_var admin =
-            create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_suppliers (admin.in (), client.root_poa () TAO_ENV_ARG_PARAMETER);
+              create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               while (!done)
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
index bbc0ae2140b..2e19889b3a7 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.cpp
@@ -17,7 +17,7 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 void
 Notify_Structured_Push_Consumer::push_structured_event (
                           const CosNotification::StructuredEvent& /*event*/
-                          TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (++this->count_ == this->expected_)
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
index d0c536b0fb7..e28c7e319f1 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Notify_Structured_Push_Consumer.h
@@ -30,7 +30,7 @@ public:
                         CORBA::Boolean& done);
 protected:
   void push_structured_event (const CosNotification::StructuredEvent&
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index 41497c866e4..53bc7a10872 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -79,13 +79,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
 create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -93,12 +93,12 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
     {
       // Filter Section
       CosNotifyFilter::FilterFactory_var ffact =
-          ec->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // One Filter
       CosNotifyFilter::Filter_var filter =
-          ffact->create_filter (GRAMMAR TAO_ENV_ARG_PARAMETER);
+          ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CosNotifyFilter::ConstraintExpSeq constraint_list (1);
@@ -108,10 +108,10 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
       constraint_list[0].constraint_expr =
                                  CORBA::string_dup ("count < 6");
 
-      filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
+      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      admin->add_filter (filter.in () TAO_ENV_ARG_PARAMETER);
+      admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       // End One Filter
     }
@@ -125,7 +125,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+  admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -135,7 +135,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                   Notify_Test_Client* client
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   for (unsigned int i = 0; i < consumers; i++)
     {
@@ -151,10 +151,10 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                                   client->done () : dummy)),
                         CORBA::NO_MEMORY ());
 
-      consumer->init (client->root_poa () TAO_ENV_ARG_PARAMETER);
+      consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      consumer->connect (admin TAO_ENV_ARG_PARAMETER);
+      consumer->connect (admin ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -170,7 +170,7 @@ int main (int argc, char* argv[])
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
@@ -183,14 +183,14 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Object_var object =
-                               client.orb ()->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+                               client.orb ()->string_to_object (ior ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          sig_var sig = sig::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (sig.in ()))
@@ -202,16 +202,16 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers (admin.in (), &client TAO_ENV_ARG_PARAMETER);
+              create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Tell the supplier to go
-              sig->go (TAO_ENV_SINGLE_ARG_PARAMETER);
+              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_Time_Value now = ACE_OS::gettimeofday ();
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index 5f8a30ebd29..9b0f664aa67 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -38,13 +38,13 @@ static const char* ior_output_file = "supplier.ior";
 class sig_i : public POA_sig
 {
 public:
-  void go (TAO_ENV_SINGLE_ARG_DECL)
+  void go (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 
 void
-sig_i::go (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+sig_i::go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   start = 1;
@@ -103,13 +103,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
 create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -117,11 +117,11 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   if (filter)
     {
       CosNotifyFilter::FilterFactory_var ffact =
-        ec->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CosNotifyFilter::Filter_var filter =
-        ffact->create_filter (GRAMMAR TAO_ENV_ARG_PARAMETER);
+        ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CosNotifyFilter::ConstraintExpSeq constraint_list (1);
@@ -130,10 +130,10 @@ create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup ("type == 'odd'");
 
-      filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
+      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      admin->add_filter (filter.in () TAO_ENV_ARG_PARAMETER);
+      admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
@@ -175,7 +175,7 @@ SendEvent (void)
         {
           for (unsigned int i = 0; i < supplier_count; i++)
             {
-              suppliers[i]->send_event (event TAO_ENV_ARG_PARAMETER);
+              suppliers[i]->send_event (event ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -191,7 +191,7 @@ SendEvent (void)
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                   PortableServer::POA_ptr poa
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   for (unsigned int i = 0; i < supplier_count; i++)
     {
@@ -199,10 +199,10 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
       ACE_NEW_THROW_EX (suppliers[i],
                         TAO_Notify_StructuredPushSupplier (),
                         CORBA::NO_MEMORY ());
-      suppliers[i]->init (poa TAO_ENV_ARG_PARAMETER);
+      suppliers[i]->init (poa ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      suppliers[i]->connect (admin TAO_ENV_ARG_PARAMETER);
+      suppliers[i]->connect (admin ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -218,22 +218,22 @@ int main (int argc, char* argv[])
   ACE_TRY_NEW_ENV
     {
       Consumer_Client client;
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 0 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           sig_i sig_impl;
-          sig_var sig = sig_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          sig_var sig = sig_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::String_var ior =
-                   orb->object_to_string (sig.in () TAO_ENV_ARG_PARAMETER);
+                   orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // If the ior_output_file exists, output the ior to it
@@ -251,10 +251,10 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::SupplierAdmin_var admin =
-                            create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+                            create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_suppliers (admin.in (), client.root_poa () TAO_ENV_ARG_PARAMETER);
+              create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               while (!done)
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
index dac3fe97703..4be9ad43668 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
@@ -23,23 +23,23 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
 void
 Notify_Sequence_Push_Consumer::connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::SEQUENCE_EVENT,
       proxy_supplier_id_
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-      proxysupplier.in () TAO_ENV_ARG_PARAMETER);
+      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotification::QoSProperties properties (3);
@@ -53,7 +53,7 @@ Notify_Sequence_Push_Consumer::connect (
 
   this->proxy_supplier_->set_qos (properties);
   this->proxy_supplier_->connect_sequence_push_consumer (objref.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -64,7 +64,7 @@ Notify_Sequence_Push_Consumer::connect (
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
                           const CosNotification::EventBatch& events
-                          TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static long previous = 0;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
index 5aa672fd73f..0cf74e4e896 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.h
@@ -31,12 +31,12 @@ public:
                                  CORBA::Boolean& done);
 
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
   void push_structured_events (const CosNotification::EventBatch&
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
index 363b8add5c6..f074e7de3ec 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
@@ -21,23 +21,23 @@ Notify_Structured_Push_Consumer::Notify_Structured_Push_Consumer (
 void
 Notify_Structured_Push_Consumer::connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
       proxy_supplier_id_
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-      proxysupplier.in () TAO_ENV_ARG_PARAMETER);
+      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotification::QoSProperties properties (1);
@@ -47,7 +47,7 @@ Notify_Structured_Push_Consumer::connect (
 
   this->proxy_supplier_->set_qos (properties);
   this->proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -58,7 +58,7 @@ Notify_Structured_Push_Consumer::connect (
 void
 Notify_Structured_Push_Consumer::push_structured_event (
                           const CosNotification::StructuredEvent& event
-                          TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   static long previous = 0;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
index 53683eb2ff0..ea1f0685096 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.h
@@ -31,12 +31,12 @@ public:
                         CORBA::Boolean& done);
 
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
   void push_structured_event (const CosNotification::StructuredEvent&
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index d699af2910a..261ff0d7728 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -107,13 +107,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
 create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -126,7 +126,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+  admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -136,7 +136,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                   Notify_Test_Client* client
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // startup the consumer
   Notify_Sequence_Push_Consumer* consumer_1;
@@ -148,10 +148,10 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                                    client->done ()),
                     CORBA::NO_MEMORY ());
 
-  consumer_1->init (client->root_poa () TAO_ENV_ARG_PARAMETER);
+  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  consumer_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  consumer_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -166,21 +166,21 @@ int main (int argc, char* argv[])
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           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;
 
-          sig_var sig = sig::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (sig.in ()))
@@ -192,16 +192,16 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers (admin.in (), &client TAO_ENV_ARG_PARAMETER);
+              create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Tell the supplier to go
-              sig->go (TAO_ENV_SINGLE_ARG_PARAMETER);
+              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Wait until the supplier is done
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index 46581029a0b..31cd6f19d47 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -35,13 +35,13 @@ static const char* ior_output_file = "supplier.ior";
 class sig_i : public POA_sig
 {
 public:
-  void go (TAO_ENV_SINGLE_ARG_DECL)
+  void go (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 
 void
-sig_i::go (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+sig_i::go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   start = 1;
@@ -120,13 +120,13 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
 create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -217,7 +217,7 @@ SendEvents (void)
 
       ACE_TRY_NEW_ENV
         {
-          supplier_1->send_events (events TAO_ENV_ARG_PARAMETER);
+          supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CORBA::Exception, e)
@@ -232,17 +232,17 @@ SendEvents (void)
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                   PortableServer::POA_ptr poa
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // start up the supplier
   ACE_NEW_THROW_EX (supplier_1,
                     TAO_Notify_SequencePushSupplier (),
                     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa TAO_ENV_ARG_PARAMETER);
+  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -257,29 +257,29 @@ int main (int argc, char* argv[])
   ACE_TRY_NEW_ENV
     {
       Supplier_Client client;
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 0 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CosNotification::QoSProperties qos (1);
           qos.length (1);
           qos[0].name = CORBA::string_dup (CosNotification::OrderPolicy);
           qos[0].value <<= order_policy;
-          ec->set_qos (qos TAO_ENV_ARG_PARAMETER);
+          ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           sig_i sig_impl;
-          sig_var sig = sig_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          sig_var sig = sig_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::String_var ior =
-            orb->object_to_string (sig.in () TAO_ENV_ARG_PARAMETER);
+            orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // If the ior_output_file exists, output the ior to it
@@ -297,10 +297,10 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::SupplierAdmin_var admin =
-            create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_suppliers (admin.in (), client.root_poa () TAO_ENV_ARG_PARAMETER);
+              create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               while (!done)
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index d10a2f548c8..9f3631545a0 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -101,13 +101,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
 create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -120,7 +120,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+  admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -130,7 +130,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                   Notify_Test_Client* client
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // startup the first consumer
   Notify_Structured_Push_Consumer* consumer_1;
@@ -140,10 +140,10 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                           expected,
                                           client->done ()),
                     CORBA::NO_MEMORY ());
-  consumer_1->init (client->root_poa () TAO_ENV_ARG_PARAMETER);
+  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  consumer_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  consumer_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -158,21 +158,21 @@ int main (int argc, char* argv[])
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           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;
 
-          sig_var sig = sig::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (sig.in ()))
@@ -184,16 +184,16 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers (admin.in (), &client TAO_ENV_ARG_PARAMETER);
+              create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Tell the supplier to go
-              sig->go (TAO_ENV_SINGLE_ARG_PARAMETER);
+              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Wait until the supplier is done
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index f7aa9e3b3a8..f4fcb1b5c93 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -35,13 +35,13 @@ static const char* ior_output_file = "supplier.ior";
 class sig_i : public POA_sig
 {
 public:
-  void go (TAO_ENV_SINGLE_ARG_DECL)
+  void go (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 
 void
-sig_i::go (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+sig_i::go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   start = 1;
@@ -121,13 +121,13 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
 create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -181,7 +181,7 @@ SendEvent (void)
 
       ACE_TRY_NEW_ENV
         {
-          supplier_1->send_event (event TAO_ENV_ARG_PARAMETER);
+          supplier_1->send_event (event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CORBA::Exception, e)
@@ -196,17 +196,17 @@ SendEvent (void)
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                   PortableServer::POA_ptr poa
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // startup the supplier
   ACE_NEW_THROW_EX (supplier_1,
                     TAO_Notify_StructuredPushSupplier (),
                     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa TAO_ENV_ARG_PARAMETER);
+  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -221,29 +221,29 @@ int main (int argc, char* argv[])
   ACE_TRY_NEW_ENV
     {
       Supplier_Client client;
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 0 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CosNotification::QoSProperties qos (1);
           qos.length (1);
           qos[0].name = CORBA::string_dup (CosNotification::OrderPolicy);
           qos[0].value <<= order_policy;
-          ec->set_qos (qos TAO_ENV_ARG_PARAMETER);
+          ec->set_qos (qos ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           sig_i sig_impl;
-          sig_var sig = sig_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          sig_var sig = sig_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::String_var ior =
-            orb->object_to_string (sig.in () TAO_ENV_ARG_PARAMETER);
+            orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // If the ior_output_file exists, output the ior to it
@@ -261,10 +261,10 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::SupplierAdmin_var admin =
-            create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_suppliers (admin.in (), client.root_poa () TAO_ENV_ARG_PARAMETER);
+              create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               while (!done)
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
index 4e26ecd5320..fa125dbecda 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -21,23 +21,23 @@ Notify_Sequence_Push_Consumer::Notify_Sequence_Push_Consumer (
 void
 Notify_Sequence_Push_Consumer::connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::SEQUENCE_EVENT,
       proxy_supplier_id_
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-      proxysupplier.in () TAO_ENV_ARG_PARAMETER);
+      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotification::QoSProperties properties (4);
@@ -51,7 +51,7 @@ Notify_Sequence_Push_Consumer::connect (
 
   this->proxy_supplier_->set_qos (properties);
   this->proxy_supplier_->connect_sequence_push_consumer (objref.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -62,7 +62,7 @@ Notify_Sequence_Push_Consumer::connect (
 void
 Notify_Sequence_Push_Consumer::push_structured_events (
                           const CosNotification::EventBatch& events
-                          TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong length = events.length ();
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
index e68bd790977..457e9bd6ed2 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.h
@@ -30,12 +30,12 @@ public:
                                  CORBA::Boolean& done);
 
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
   void push_structured_events (const CosNotification::EventBatch&
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index 9265fb03cc8..dcf19f85491 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -70,13 +70,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
 create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -89,15 +89,15 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+  admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CosNotifyFilter::FilterFactory_var ffact =
-    ec->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CosNotifyFilter::Filter_var filter =
-    ffact->create_filter ("ETCL" TAO_ENV_ARG_PARAMETER);
+    ffact->create_filter ("ETCL" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if(CORBA::is_nil(filter.in()))
@@ -114,7 +114,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   constraint_list[0].constraint_expr = CORBA::string_dup (
    "$.enum < 0");
 
-  filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
+  filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // apply filter
@@ -127,7 +127,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                   Notify_Test_Client* client
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // startup the consumer
   Notify_Sequence_Push_Consumer* consumer_1;
@@ -138,10 +138,10 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                                    client->done ()),
                     CORBA::NO_MEMORY ());
 
-  consumer_1->init (client->root_poa () TAO_ENV_ARG_PARAMETER);
+  consumer_1->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  consumer_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  consumer_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -156,21 +156,21 @@ int main (int argc, char* argv[])
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 1 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           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;
 
-          sig_var sig = sig::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (sig.in ()))
@@ -182,16 +182,16 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers (admin.in (), &client TAO_ENV_ARG_PARAMETER);
+              create_consumers (admin.in (), &client ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Tell the supplier to go
-              sig->go (TAO_ENV_SINGLE_ARG_PARAMETER);
+              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               unsigned int try_count = 0;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index 968765c7dc8..d9fae8364a4 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -34,13 +34,13 @@ static const char* ior_output_file = "supplier.ior";
 class sig_i : public POA_sig
 {
 public:
-  void go (TAO_ENV_SINGLE_ARG_DECL)
+  void go (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 
 void
-sig_i::go (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+sig_i::go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   start = 1;
@@ -87,13 +87,13 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
 create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -183,7 +183,7 @@ SendEvents (void)
 
       ACE_TRY_NEW_ENV
         {
-          supplier_1->send_events (events TAO_ENV_ARG_PARAMETER);
+          supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CORBA::Exception, e)
@@ -198,17 +198,17 @@ SendEvents (void)
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                   PortableServer::POA_ptr poa
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // start up the supplier
   ACE_NEW_THROW_EX (supplier_1,
                     TAO_Notify_SequencePushSupplier (),
                     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa TAO_ENV_ARG_PARAMETER);
+  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -223,22 +223,22 @@ int main (int argc, char* argv[])
   ACE_TRY_NEW_ENV
     {
       Supplier_Client client;
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
-            client.create_event_channel ("MyEventChannel", 0 TAO_ENV_ARG_PARAMETER);
+            client.create_event_channel ("MyEventChannel", 0 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           sig_i sig_impl;
-          sig_var sig = sig_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          sig_var sig = sig_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::String_var ior =
-            orb->object_to_string (sig.in () TAO_ENV_ARG_PARAMETER);
+            orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // If the ior_output_file exists, output the ior to it
@@ -256,10 +256,10 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::SupplierAdmin_var admin =
-            create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_suppliers (admin.in (), client.root_poa () TAO_ENV_ARG_PARAMETER);
+              create_suppliers (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               while (!done)
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
index b7819f79a3c..f14fc3fc2a5 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -28,23 +28,23 @@ Notify_Sequence_Push_Consumer::~Notify_Sequence_Push_Consumer ()
 void
 Notify_Sequence_Push_Consumer::connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::SEQUENCE_EVENT,
       proxy_supplier_id_
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-      proxysupplier.in () TAO_ENV_ARG_PARAMETER);
+      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotification::QoSProperties properties(3);
@@ -58,7 +58,7 @@ Notify_Sequence_Push_Consumer::connect (
 
   proxy_supplier_->set_qos(properties);
   proxy_supplier_->connect_sequence_push_consumer (objref.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -69,7 +69,7 @@ Notify_Sequence_Push_Consumer::connect (
 void
 Notify_Sequence_Push_Consumer::push_structured_events(
                           const CosNotification::EventBatch& events
-                          TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong length = events.length();
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
index 0afd678b8d3..bf6f6d1c565 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.h
@@ -33,12 +33,12 @@ public:
   ~Notify_Sequence_Push_Consumer ();
 
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   void push_structured_events(const CosNotification::EventBatch&
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index 8d8936bef87..14a94f3ecbb 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -102,13 +102,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
 create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -121,7 +121,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+  admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -131,7 +131,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                   Notify_Test_Client* client
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // startup the first consumer
   Notify_Sequence_Push_Consumer* consumer_1;
@@ -142,10 +142,10 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                                    high,
                                                    done),
                     CORBA::NO_MEMORY ());
-  consumer_1->init(client->root_poa () TAO_ENV_ARG_PARAMETER);
+  consumer_1->init(client->root_poa () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  consumer_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  consumer_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -160,22 +160,22 @@ int main (int argc, char* argv[])
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
             client.create_event_channel ("MyEventChannel", 1
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           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;
 
-          sig_var sig = sig::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (sig.in ()))
@@ -187,18 +187,18 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
           if (filter)
             {
               CosNotifyFilter::FilterFactory_var ffact =
-                ec->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+                ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CosNotifyFilter::Filter_var filter =
-                ffact->create_filter ("TCL" TAO_ENV_ARG_PARAMETER);
+                ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if(CORBA::is_nil(filter.in()))
@@ -214,7 +214,7 @@ int main (int argc, char* argv[])
               constraint_list[0].event_types.length (0);
               constraint_list[0].constraint_expr = CORBA::string_dup(constraintString);
 
-              filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
+              filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               admin->add_filter(filter.in());
@@ -230,16 +230,16 @@ int main (int argc, char* argv[])
           added[0].domain_name = CORBA::string_dup("*");
           added[0].type_name = CORBA::string_dup ("*");
 
-          admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+          admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers(admin.in (), &client TAO_ENV_ARG_PARAMETER);
+              create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Tell the supplier to go
-              sig->go (TAO_ENV_SINGLE_ARG_PARAMETER);
+              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               unsigned int try_count = 0;
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index 162ca828bfe..2780ffe4567 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -33,13 +33,13 @@ static const char* ior_output_file = "supplier.ior";
 class sig_i : public POA_sig
 {
 public:
-  void go (TAO_ENV_SINGLE_ARG_DECL)
+  void go (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 
 void
-sig_i::go (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+sig_i::go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   start = 1;
@@ -84,13 +84,13 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
 create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -180,7 +180,7 @@ SendEvents (void)
       ACE_TRY_NEW_ENV
         {
 cout << "Sending events" << endl;
-          supplier_1->send_events(events TAO_ENV_ARG_PARAMETER);
+          supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CORBA::Exception, e)
@@ -195,17 +195,17 @@ cout << "Sending events" << endl;
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                   PortableServer::POA_ptr poa
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
                     TAO_Notify_SequencePushSupplier (),
                     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa TAO_ENV_ARG_PARAMETER);
+  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -221,23 +221,23 @@ int main (int argc, char* argv[])
     {
       Supplier_Client client;
 
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
             client.create_event_channel ("MyEventChannel", 0
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           sig_i sig_impl;
-          sig_var sig = sig_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          sig_var sig = sig_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::String_var ior =
-            orb->object_to_string (sig.in () TAO_ENV_ARG_PARAMETER);
+            orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // If the ior_output_file exists, output the ior to it
@@ -255,10 +255,10 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::SupplierAdmin_var admin =
-            create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_suppliers(admin.in (), client.root_poa () TAO_ENV_ARG_PARAMETER);
+              create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               while (!done)
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
index bfea3820bb2..02b10b6ff19 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.cpp
@@ -74,7 +74,7 @@ Any_String (const CORBA::Any& any)
 void
 Notify_Push_Consumer::push_structured_event (
     const CosNotification::StructuredEvent& event
-    TAO_ENV_ARG_NOT_USED
+    ACE_ENV_ARG_NOT_USED
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
index ea8fa3de5e6..470ddef7221 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Notify_Push_Consumer.h
@@ -30,7 +30,7 @@ public:
 
 private:
   void push_structured_event (const CosNotification::StructuredEvent&
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   static CORBA::Short event_count;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
index e41b203b635..e0a144a46f0 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
@@ -71,17 +71,17 @@ Consumer_Client::parse_args (int argc, char *argv[])
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                   Notify_Test_Client* client
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   Notify_Push_Consumer* consumer = 0;
   ACE_NEW_THROW_EX (consumer,
                     Notify_Push_Consumer ("Consumer"),
                     CORBA::NO_MEMORY ());
 
-  consumer->init (client->root_poa () TAO_ENV_ARG_PARAMETER);
+  consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  consumer->connect (admin TAO_ENV_ARG_PARAMETER);
+  consumer->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -97,7 +97,7 @@ int main (int argc, char * argv[])
   {
     Consumer_Client client;
 
-    status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (status == 0)
@@ -105,14 +105,14 @@ int main (int argc, char * argv[])
         CosNotifyChannelAdmin::EventChannel_var ec =
           client.create_event_channel ("NotifyEventChannelFactory",
                                        1
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 
 
         CosNotifyChannelAdmin::AdminID adminid = 0;
         CosNotifyChannelAdmin::ConsumerAdmin_var consumer_admin =
           ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
                                  adminid
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 
         ACE_TRY_CHECK;
 
@@ -121,11 +121,11 @@ int main (int argc, char * argv[])
         if (filter)
           {
             CosNotifyFilter::FilterFactory_var ffact =
-              ec->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+              ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             CosNotifyFilter::Filter_var filter =
-              ffact->create_filter (GRAMMAR TAO_ENV_ARG_PARAMETER);
+              ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             if (CORBA::is_nil (filter.in ()))
@@ -141,7 +141,7 @@ int main (int argc, char * argv[])
             constraint_list[0].event_types.length (0);
             constraint_list[0].constraint_expr = CORBA::string_dup ("Number == 100");
 
-            filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
+            filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             // apply filter
@@ -158,7 +158,7 @@ int main (int argc, char * argv[])
         added[0].domain_name = CORBA::string_dup ("*");
         added[0].type_name = CORBA::string_dup ("*");
 
-        consumer_admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+        consumer_admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // End Filter Section
@@ -170,7 +170,7 @@ int main (int argc, char * argv[])
 
         CosNaming::NamingContext_ptr naming_context = client.naming_context ();
         CORBA::Object_var ctrl_obj = naming_context->resolve (ctrl_name
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (CORBA::is_nil (ctrl_obj.in ()))
@@ -186,7 +186,7 @@ int main (int argc, char * argv[])
         if (!CORBA::is_nil (consumer_admin.in ()))
           {
             for ( int ctr = 0; ctr < num_consumers; ctr ++)
-              create_consumers (consumer_admin.in (), &client TAO_ENV_ARG_PARAMETER);
+              create_consumers (consumer_admin.in (), &client ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
             // Start Supplier
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 90c355b6eaa..37c9955427f 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -30,7 +30,7 @@ class supplier_ctrl_i : public POA_supplier_ctrl
 public:
   void ctrl (CORBA::Boolean flag,
              CORBA::Short num_events
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -38,7 +38,7 @@ public:
 void
 supplier_ctrl_i::ctrl (CORBA::Boolean flag,
                        CORBA::Short num_events
-                       TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                       ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   go = flag;
@@ -48,13 +48,13 @@ supplier_ctrl_i::ctrl (CORBA::Boolean flag,
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
 create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
@@ -111,7 +111,7 @@ setup_event ()
   ACE_TRY_NEW_ENV
     {
       ACE_DEBUG ((LM_DEBUG, "%d sent \n", count));
-      supplier->send_event (event TAO_ENV_ARG_PARAMETER);
+      supplier->send_event (event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, e)
@@ -125,16 +125,16 @@ setup_event ()
 
 static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                              PortableServer::POA_ptr poa
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (supplier,
                     TAO_Notify_StructuredPushSupplier (),
                     CORBA::NO_MEMORY ());
 
-  supplier->init (poa TAO_ENV_ARG_PARAMETER);
+  supplier->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier->connect (admin TAO_ENV_ARG_PARAMETER);
+  supplier->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -149,7 +149,7 @@ int main (int argc, char * argv[])
   ACE_TRY_NEW_ENV;
     {
       Notify_Test_Client client;
-      client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_ptr poa = client.root_poa ();
@@ -157,7 +157,7 @@ int main (int argc, char * argv[])
       CosNotifyChannelAdmin::EventChannel_var ec =
                client.create_event_channel ("NotifyEventChannelFactory",
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // register control with naming service
@@ -179,11 +179,11 @@ int main (int argc, char * argv[])
       int done = 0;
 
       CosNotifyChannelAdmin::SupplierAdmin_var admin =
-        create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+        create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
 
       if (!CORBA::is_nil (admin.in ()))
         {
-          create_supplier (admin.in (), client.root_poa () TAO_ENV_ARG_PARAMETER);
+          create_supplier (admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
 
           // Ready. So Write ior to file
           CORBA::ORB_ptr orb = client.orb ();
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
index d4e7eb16932..7317de90147 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.cpp
@@ -13,29 +13,29 @@ Notify_Push_Consumer::connect (
        CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
        CosNotifyChannelAdmin::EventChannel_ptr notify_channel,
        CORBA::Boolean isFilter
-       TAO_ENV_ARG_DECL)
+       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
       proxy_supplier_id_
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   //add filter
   if (isFilter)
     {
       CosNotifyFilter::FilterFactory_var ffact =
-        notify_channel->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+        notify_channel->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CosNotifyFilter::Filter_var filter =
-        ffact->create_filter ("TCL" TAO_ENV_ARG_PARAMETER);
+        ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (CORBA::is_nil (filter.in ()))
@@ -51,7 +51,7 @@ Notify_Push_Consumer::connect (
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup ("Number != 100");
 
-      filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
+      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // apply filter
@@ -61,11 +61,11 @@ Notify_Push_Consumer::connect (
 
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-      proxysupplier.in () TAO_ENV_ARG_PARAMETER);
+      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -140,7 +140,7 @@ Any_String (const CORBA::Any& any)
 void
 Notify_Push_Consumer::push_structured_event (
                           const CosNotification::StructuredEvent& event
-                          TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
index 60a9bec4ead..8d3aef6e2ea 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Consumer.h
@@ -29,14 +29,14 @@ public:
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin,
                 CosNotifyChannelAdmin::EventChannel_ptr ec,
                 CORBA::Boolean isFilter
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   static CORBA::Short get_count ();
 
 private:
   void push_structured_event (const CosNotification::StructuredEvent&
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   static CORBA::Short event_count;
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
index 346936f701b..c425e6fd586 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.cpp
@@ -6,29 +6,29 @@ Notify_Push_Supplier::connect (
                 CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin,
                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel,
                 CORBA::Boolean isFilter
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     supplier_admin->obtain_notification_push_consumer (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
       proxy_consumer_id_
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   //add filters
   if (isFilter)
     {
       CosNotifyFilter::FilterFactory_var ffact =
-        notify_channel->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+        notify_channel->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CosNotifyFilter::Filter_var filter =
-        ffact->create_filter ("TCL" TAO_ENV_ARG_PARAMETER);
+        ffact->create_filter ("TCL" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (CORBA::is_nil (filter.in ()))
@@ -44,7 +44,7 @@ Notify_Push_Supplier::connect (
       constraint_list[0].event_types.length (0);
       constraint_list[0].constraint_expr = CORBA::string_dup ("String != 'One Hundred'");
 
-      filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
+      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // apply filter
@@ -53,11 +53,11 @@ Notify_Push_Supplier::connect (
 
   this->proxy_consumer_ =
     CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (
-      proxyconsumer.in () TAO_ENV_ARG_PARAMETER);
+      proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
index dc566caa66e..1032edab777 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Notify_Push_Supplier.h
@@ -11,7 +11,7 @@ public:
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin,
                 CosNotifyChannelAdmin::EventChannel_ptr notify_channel,
                 CORBA::Boolean isFilter
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
index e5af9ddc13c..3ec8bfb2ba9 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
@@ -83,17 +83,17 @@ static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                   CosNotifyChannelAdmin::EventChannel_ptr ec,
                   Notify_Test_Client* client
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   Notify_Push_Consumer* consumer = 0;
   ACE_NEW_THROW_EX (consumer,
                     Notify_Push_Consumer ("Consumer"),
                     CORBA::NO_MEMORY ());
 
-  consumer->init (client->root_poa () TAO_ENV_ARG_PARAMETER);
+  consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  consumer->connect (admin, ec, isFilter TAO_ENV_ARG_PARAMETER);
+  consumer->connect (admin, ec, isFilter ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -109,7 +109,7 @@ int main (int argc, char * argv[])
   {
     Consumer_Client client;
 
-    status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+    status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (status == 0)
@@ -117,7 +117,7 @@ int main (int argc, char * argv[])
         CosNotifyChannelAdmin::EventChannel_var ec =
           client.create_event_channel ("NotifyEventChannelFactory",
                                        1
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 
 
         CosNotifyChannelAdmin::AdminID adminid = 0;
@@ -125,7 +125,7 @@ int main (int argc, char * argv[])
           ec->new_for_consumers ((op ? CosNotifyChannelAdmin::OR_OP :
                                        CosNotifyChannelAdmin::AND_OP),
                                  adminid
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 
         ACE_TRY_CHECK;
 
@@ -134,11 +134,11 @@ int main (int argc, char * argv[])
         if (isFilter)
           {
             CosNotifyFilter::FilterFactory_var ffact =
-              ec->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+              ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             CosNotifyFilter::Filter_var filter =
-              ffact->create_filter (GRAMMAR TAO_ENV_ARG_PARAMETER);
+              ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             if (CORBA::is_nil (filter.in ()))
@@ -154,7 +154,7 @@ int main (int argc, char * argv[])
             constraint_list[0].event_types.length (0);
             constraint_list[0].constraint_expr = CORBA::string_dup ("Number == 50");
 
-            filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
+            filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             // apply filter
@@ -171,7 +171,7 @@ int main (int argc, char * argv[])
         added[0].domain_name = CORBA::string_dup ("*");
         added[0].type_name = CORBA::string_dup ("*");
 
-        consumer_admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+        consumer_admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         // End Filter Section
@@ -183,7 +183,7 @@ int main (int argc, char * argv[])
 
         CosNaming::NamingContext_ptr naming_context = client.naming_context ();
         CORBA::Object_var ctrl_obj = naming_context->resolve (ctrl_name
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (CORBA::is_nil (ctrl_obj.in ()))
@@ -202,7 +202,7 @@ int main (int argc, char * argv[])
               create_consumers (consumer_admin.in (),
                                 ec.in (),
                                 &client
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
             // Start Supplier
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
index 70ca9001b9e..6b9c4691c4e 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -35,7 +35,7 @@ class supplier_ctrl_i : public POA_supplier_ctrl
 public:
   void ctrl (CORBA::Boolean flag,
              CORBA::Short num_events
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -43,7 +43,7 @@ public:
 void
 supplier_ctrl_i::ctrl (CORBA::Boolean flag,
                        CORBA::Short num_events
-                       TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                       ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   go = flag;
@@ -92,14 +92,14 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
 create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers ((op ? CosNotifyChannelAdmin::OR_OP :
                                  CosNotifyChannelAdmin::AND_OP),
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::SupplierAdmin::_duplicate (admin.in ());
@@ -189,7 +189,7 @@ setup_event ()
   ACE_TRY_NEW_ENV
     {
       ACE_DEBUG ((LM_DEBUG, "%d sent \n", count));
-      supplier->send_event (event TAO_ENV_ARG_PARAMETER);
+      supplier->send_event (event ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, e)
@@ -204,30 +204,30 @@ setup_event ()
 static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                              CosNotifyChannelAdmin::EventChannel_ptr ec,
                              PortableServer::POA_ptr poa
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (supplier,
                     Notify_Push_Supplier (),
                     CORBA::NO_MEMORY ());
 
-  supplier->init (poa TAO_ENV_ARG_PARAMETER);
+  supplier->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier->connect (admin, ec, isFilter TAO_ENV_ARG_PARAMETER);
+  supplier->connect (admin, ec, isFilter ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void add_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                  CosNotifyChannelAdmin::EventChannel_ptr notify_channel
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
     // add supplier side filtering
   CosNotifyFilter::FilterFactory_var ffact =
-    notify_channel->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+    notify_channel->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyFilter::Filter_var filter =
-    ffact->create_filter (GRAMMAR TAO_ENV_ARG_PARAMETER);
+    ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (filter.in ()))
@@ -243,11 +243,11 @@ void add_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
   constraint_list[0].event_types.length (0);
   constraint_list[0].constraint_expr = CORBA::string_dup ("String == 'Fifty'");
 
-  filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
+  filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // apply filter
-  admin->add_filter (filter.in () TAO_ENV_ARG_PARAMETER);
+  admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -262,7 +262,7 @@ int main (int argc, char * argv[])
   ACE_TRY_NEW_ENV;
     {
       Supplier_Client client;
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
@@ -272,7 +272,7 @@ int main (int argc, char * argv[])
           CosNotifyChannelAdmin::EventChannel_var ec =
                    client.create_event_channel ("NotifyEventChannelFactory",
                                                 0
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // register control with naming service
@@ -294,11 +294,11 @@ int main (int argc, char * argv[])
           int done = 0;
 
           CosNotifyChannelAdmin::SupplierAdmin_var admin =
-            create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
 
           if (isFilter)
             {
-              add_filter (admin.in (), ec.in () TAO_ENV_ARG_PARAMETER);
+              add_filter (admin.in (), ec.in () ACE_ENV_ARG_PARAMETER);
             }
 
           if (!CORBA::is_nil (admin.in ()))
@@ -306,7 +306,7 @@ int main (int argc, char * argv[])
               create_supplier (admin.in (),
                                ec.in (),
                                 client.root_poa ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 
               // Ready. So Write ior to file
               CORBA::ORB_ptr orb = client.orb ();
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp
index 545fe112d50..f2a925799c5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.cpp
@@ -18,35 +18,35 @@ TAO_Notify_PushConsumer::~TAO_Notify_PushConsumer ()
     CosNotifyChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
-void TAO_Notify_PushConsumer::init (PortableServer::POA_ptr poa 
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+void TAO_Notify_PushConsumer::init (PortableServer::POA_ptr poa
+                                    ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
 
 
 PortableServer::POA_ptr
-TAO_Notify_PushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_PushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
 TAO_Notify_PushConsumer::connect (
-    CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin 
-    TAO_ENV_ARG_DECL
+    CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
+    ACE_ENV_ARG_DECL
   )
 {
   // Activate the consumer with the default_POA_
-  CosNotifyComm::PushConsumer_var objref = 
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CosNotifyComm::PushConsumer_var objref =
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
-                        CosNotifyChannelAdmin::ANY_EVENT, 
-                        this->proxy_id_ 
-                        TAO_ENV_ARG_PARAMETER
+                        CosNotifyChannelAdmin::ANY_EVENT,
+                        this->proxy_id_
+                        ACE_ENV_ARG_PARAMETER
                       );
   ACE_CHECK;
 
@@ -55,12 +55,12 @@ TAO_Notify_PushConsumer::connect (
   // Narrow.
   this->supplier_proxy_ =
     CosNotifyChannelAdmin::ProxyPushSupplier::_narrow (proxysupplier.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ACE_ASSERT (!CORBA::is_nil (supplier_proxy_.in ()));
 
   this->supplier_proxy_->connect_any_push_consumer (objref.in ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Give ownership to POA.
@@ -68,37 +68,37 @@ TAO_Notify_PushConsumer::connect (
 }
 
 void
-TAO_Notify_PushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_PushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa =
         this->_default_POA ();
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_PushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_PushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->supplier_proxy_->disconnect_push_supplier (
-                             TAO_ENV_SINGLE_ARG_PARAMETER
+                             ACE_ENV_SINGLE_ARG_PARAMETER
                            );
   ACE_CHECK;
 
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_PushConsumer::offer_change
    (const CosNotification::EventTypeSeq &/*added*/,
     const CosNotification::EventTypeSeq &/*removed*/
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
 {
@@ -108,7 +108,7 @@ TAO_Notify_PushConsumer::offer_change
 void
 TAO_Notify_PushConsumer::push
    (const CORBA::Any & /*data*/
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
@@ -116,8 +116,8 @@ TAO_Notify_PushConsumer::push
 }
 
 void
-TAO_Notify_PushConsumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_PushConsumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
index a936d5e2d27..e1bed8335f0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushConsumer.h
@@ -51,21 +51,21 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_PushConsumer : public POA_CosNotifyComm:
   TAO_Notify_PushConsumer (void);
   // Constructor.
 
-  void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
   // Init
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
   // Activates this object with the <default_POA_>
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Deactivate the object from the POA.
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 protected:
   virtual ~TAO_Notify_PushConsumer ();
@@ -75,7 +75,7 @@ protected:
    void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -84,7 +84,7 @@ protected:
 
     void push (
         const CORBA::Any & data
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -93,7 +93,7 @@ protected:
   // The default operation is no op.
 
     void disconnect_push_consumer (
-        TAO_ENV_SINGLE_ARG_DECL
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp
index d23a91a4905..440a34d0ffc 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.cpp
@@ -19,27 +19,27 @@ TAO_Notify_PushSupplier::~TAO_Notify_PushSupplier ()
 }
 
 void TAO_Notify_PushSupplier::init
-   (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL_NOT_USED)
+   (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
 
 void
 TAO_Notify_PushSupplier::connect (
-    CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin 
-    TAO_ENV_ARG_DECL
+    CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
+    ACE_ENV_ARG_DECL
   )
 {
   // Activate the consumer with the default_POA_.
-  CosNotifyComm::PushSupplier_var objref = 
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CosNotifyComm::PushSupplier_var objref =
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     supplier_admin->obtain_notification_push_consumer (
-                        CosNotifyChannelAdmin::ANY_EVENT, 
-                        this->my_id_ 
-                        TAO_ENV_ARG_PARAMETER
+                        CosNotifyChannelAdmin::ANY_EVENT,
+                        this->my_id_
+                        ACE_ENV_ARG_PARAMETER
                       );
   ACE_CHECK;
 
@@ -48,12 +48,12 @@ TAO_Notify_PushSupplier::connect (
   // Narrow.
   this->consumer_proxy_ =
     CosNotifyChannelAdmin::ProxyPushConsumer::_narrow (proxyconsumer.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   ACE_ASSERT (!CORBA::is_nil (consumer_proxy_.in ()));
 
   this->consumer_proxy_->connect_any_push_supplier (objref.in ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Give ownership to POA.
@@ -61,39 +61,39 @@ TAO_Notify_PushSupplier::connect (
 }
 
 void
-TAO_Notify_PushSupplier::send_event (const CORBA::Any & data TAO_ENV_ARG_DECL)
+TAO_Notify_PushSupplier::send_event (const CORBA::Any & data ACE_ENV_ARG_DECL)
 {
-  this->consumer_proxy_->push (data TAO_ENV_ARG_PARAMETER);
+  this->consumer_proxy_->push (data ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Notify_PushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_PushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa =
     this->_default_POA ();
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_PushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_PushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->consumer_proxy_->disconnect_push_consumer (
-                             TAO_ENV_SINGLE_ARG_PARAMETER
+                             ACE_ENV_SINGLE_ARG_PARAMETER
                            );
   ACE_CHECK;
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_Notify_PushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_PushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
@@ -102,7 +102,7 @@ void
 TAO_Notify_PushSupplier::subscription_change
    (const CosNotification::EventTypeSeq &/*added*/,
     const CosNotification::EventTypeSeq &/*removed*/
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNotifyComm::InvalidEventType))
 {
@@ -110,8 +110,8 @@ TAO_Notify_PushSupplier::subscription_change
 }
 
 void
-TAO_Notify_PushSupplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_PushSupplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
index b91dbbbf799..855cd9f8f54 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_PushSupplier.h
@@ -21,24 +21,24 @@ public:
   TAO_Notify_PushSupplier (void);
   // Constructor.
 
-  void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
   // Init
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL);
   // Activates this object with the <default_POA_>
   // Creates a new proxy consumer and connects to it.
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the consumer proxy.
 
-  void send_event (const CORBA::Any & data TAO_ENV_ARG_DECL);
+  void send_event (const CORBA::Any & data ACE_ENV_ARG_DECL);
   // Send the event to the channel.
 
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Deactivate the object.
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CosNotifyChannelAdmin::ProxyID my_id_;
   // This supplier's id.
@@ -51,7 +51,7 @@ public:
     void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -59,7 +59,7 @@ public:
       ));
 
     void disconnect_push_supplier (
-        TAO_ENV_SINGLE_ARG_DECL
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp
index d84d4f70955..c2ee361cc98 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.cpp
@@ -19,14 +19,14 @@ TAO_Notify_SequencePushConsumer::~TAO_Notify_SequencePushConsumer (void)
 }
 
 void TAO_Notify_SequencePushConsumer::init
-   (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL_NOT_USED)
+   (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
 
 PortableServer::POA_ptr
 TAO_Notify_SequencePushConsumer::_default_POA (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
@@ -41,73 +41,73 @@ TAO_Notify_SequencePushConsumer::get_proxy_supplier (void)
 
 void
 TAO_Notify_SequencePushConsumer::connect (
-    CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin 
-    TAO_ENV_ARG_DECL
+    CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
+    ACE_ENV_ARG_DECL
   )
 {
   // Activate the consumer with the default_POA_.
   CosNotifyComm::SequencePushConsumer_var consumer_ref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
-                        CosNotifyChannelAdmin::SEQUENCE_EVENT, 
-                        proxy_supplier_id_ 
-                        TAO_ENV_ARG_PARAMETER
+                        CosNotifyChannelAdmin::SEQUENCE_EVENT,
+                        proxy_supplier_id_
+                        ACE_ENV_ARG_PARAMETER
                       );
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // Narrow.
-  this->proxy_supplier_ = 
+  this->proxy_supplier_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-        proxysupplier.in () 
-        TAO_ENV_ARG_PARAMETER
+        proxysupplier.in ()
+        ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
   proxy_supplier_->connect_sequence_push_consumer (consumer_ref.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   // Give ownership to POA.
   this->_remove_ref ();
 }
 
 void
-TAO_Notify_SequencePushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequencePushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa =
         this->_default_POA ();
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_SequencePushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequencePushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_supplier_->disconnect_sequence_push_supplier (
-                             TAO_ENV_SINGLE_ARG_PARAMETER
+                             ACE_ENV_SINGLE_ARG_PARAMETER
                            );
   ACE_CHECK;
 
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_SequencePushConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNotifyComm::InvalidEventType))
 {
@@ -116,17 +116,17 @@ TAO_Notify_SequencePushConsumer::offer_change
 
 void
 TAO_Notify_SequencePushConsumer::disconnect_sequence_push_consumer (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC (( CORBA::SystemException))
 {
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_SequencePushConsumer::push_structured_events
    (const CosNotification::EventBatch &/*notifications*/
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
index c8a7effdd71..a569229de0b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushConsumer.h
@@ -44,25 +44,25 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_SequencePushConsumer : public POA_CosNot
   TAO_Notify_SequencePushConsumer (void);
   // Constructor.
 
-  void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
   // Saves the POA ref.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
   // Activates this servant with the POA supplied in init.
   // Creates a new proxy supplier via the <consumer_admin> supplied and connects
   // to it.
 
-  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
   // Deactivate the object from the default POA.
 
   CosNotifyChannelAdmin::SequenceProxyPushSupplier_ptr get_proxy_supplier (void);
   // Accessor for <proxy_supplier_>.
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 protected:
   // = Data Members
   CosNotifyChannelAdmin::SequenceProxyPushSupplier_var proxy_supplier_;
@@ -81,7 +81,7 @@ protected:
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -91,7 +91,7 @@ protected:
   // = SequencePushConsumer methods
   virtual void push_structured_events (
         const CosNotification::EventBatch & notifications
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -100,7 +100,7 @@ protected:
   // Default does nothing.
 
   virtual void disconnect_sequence_push_consumer (
-        TAO_ENV_SINGLE_ARG_DECL
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp
index 07b8d7f0c2f..161d348c501 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.cpp
@@ -20,7 +20,7 @@ TAO_Notify_SequencePushSupplier::~TAO_Notify_SequencePushSupplier ()
 
 void
 TAO_Notify_SequencePushSupplier::init
-   (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL_NOT_USED)
+   (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
@@ -33,19 +33,19 @@ TAO_Notify_SequencePushSupplier::get_proxy_consumer (void)
 
 void
 TAO_Notify_SequencePushSupplier::connect (
-    CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin 
-    TAO_ENV_ARG_DECL
+    CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
+    ACE_ENV_ARG_DECL
   )
 {
   CosNotifyComm::SequencePushSupplier_var supplier_ref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     supplier_admin->obtain_notification_push_consumer (
-                        CosNotifyChannelAdmin::SEQUENCE_EVENT, 
-                        proxy_consumer_id_ 
-                        TAO_ENV_ARG_PARAMETER
+                        CosNotifyChannelAdmin::SEQUENCE_EVENT,
+                        proxy_consumer_id_
+                        ACE_ENV_ARG_PARAMETER
                       );
   ACE_CHECK;
 
@@ -54,15 +54,15 @@ TAO_Notify_SequencePushSupplier::connect (
   // Narrow.
   this->proxy_consumer_ =
     CosNotifyChannelAdmin::SequenceProxyPushConsumer::_narrow (
-        proxyconsumer.in () 
-        TAO_ENV_ARG_PARAMETER
+        proxyconsumer.in ()
+        ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
   proxy_consumer_->connect_sequence_push_supplier (supplier_ref.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Give ownership to POA.
@@ -70,23 +70,23 @@ TAO_Notify_SequencePushSupplier::connect (
 }
 
 void
-TAO_Notify_SequencePushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequencePushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
   this->proxy_consumer_->disconnect_sequence_push_consumer (
-                             TAO_ENV_SINGLE_ARG_PARAMETER
+                             ACE_ENV_SINGLE_ARG_PARAMETER
                            );
   ACE_CHECK;
 
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_SequencePushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNotifyComm::InvalidEventType))
 {
@@ -95,54 +95,54 @@ TAO_Notify_SequencePushSupplier::subscription_change
 
 PortableServer::POA_ptr
 TAO_Notify_SequencePushSupplier::_default_POA (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_Notify_SequencePushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_SequencePushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa =
         this->_default_POA ();
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_Notify_SequencePushSupplier::disconnect_sequence_push_supplier (
-        TAO_ENV_SINGLE_ARG_DECL
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ))
 {
   this->proxy_consumer_->disconnect_sequence_push_consumer (
-                             TAO_ENV_SINGLE_ARG_PARAMETER
+                             ACE_ENV_SINGLE_ARG_PARAMETER
                            );
   ACE_CHECK;
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_SequencePushSupplier::send_events (
-    const CosNotification::EventBatch & notifications 
-    TAO_ENV_ARG_DECL
+    const CosNotification::EventBatch & notifications
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
   this->proxy_consumer_->push_structured_events (
-                             notifications 
-                             TAO_ENV_ARG_PARAMETER
+                             notifications
+                             ACE_ENV_ARG_PARAMETER
                            );
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
index 6f652397267..dc93aad29df 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_SequencePushSupplier.h
@@ -44,28 +44,28 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_SequencePushSupplier:public POA_CosNotif
   TAO_Notify_SequencePushSupplier (void);
   // Constructor.
 
-  void init (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL);
   // Init
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL);
   // Activates this servant with the POA supplied in init.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
   virtual void send_events (const CosNotification::EventBatch & notifications
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
   // Send one event.
 
   CosNotifyChannelAdmin::SequenceProxyPushConsumer_ptr get_proxy_consumer (void);
   // Accessor for <proxy_consumer_>.
 
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
   // Deactivate the object.
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 protected:
   // = Data Members
@@ -85,7 +85,7 @@ protected:
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -94,7 +94,7 @@ protected:
 
     // = SequencePushSupplier method
     virtual void disconnect_sequence_push_supplier (
-        TAO_ENV_SINGLE_ARG_DECL
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp
index ccd0893e55f..a1445ba6a16 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.cpp
@@ -25,14 +25,14 @@ TAO_Notify_StructuredPushConsumer::~TAO_Notify_StructuredPushConsumer (void)
 //            poa. This is the contract for clients of this class.
 //
 void TAO_Notify_StructuredPushConsumer::init
-   (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL_NOT_USED)
+   (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
 
 PortableServer::POA_ptr
 TAO_Notify_StructuredPushConsumer::_default_POA (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
@@ -47,72 +47,72 @@ TAO_Notify_StructuredPushConsumer::get_proxy_supplier (void)
 
 void
 TAO_Notify_StructuredPushConsumer::connect (
-    CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin 
-    TAO_ENV_ARG_DECL
+    CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
+    ACE_ENV_ARG_DECL
   )
 {
   // Activate the consumer with the default_POA_.
   CosNotifyComm::StructuredPushConsumer_var consumer_ref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
-                        CosNotifyChannelAdmin::STRUCTURED_EVENT, 
-                        proxy_supplier_id_ 
-                        TAO_ENV_ARG_PARAMETER
+                        CosNotifyChannelAdmin::STRUCTURED_EVENT,
+                        proxy_supplier_id_
+                        ACE_ENV_ARG_PARAMETER
                       );
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
 
   // narrow
-  this->proxy_supplier_ = 
+  this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-        proxysupplier.in () 
-        TAO_ENV_ARG_PARAMETER
+        proxysupplier.in ()
+        ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
   proxy_supplier_->connect_structured_push_consumer (consumer_ref.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   // Give ownership to POA.
   this->_remove_ref ();
 }
 
 void
-TAO_Notify_StructuredPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_Notify_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_supplier_->disconnect_structured_push_supplier(
-                             TAO_ENV_SINGLE_ARG_PARAMETER
+                             ACE_ENV_SINGLE_ARG_PARAMETER
                            );
   ACE_CHECK;
 
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_StructuredPushConsumer::offer_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNotifyComm::InvalidEventType))
 {
@@ -121,16 +121,16 @@ TAO_Notify_StructuredPushConsumer::offer_change
 
 void
 TAO_Notify_StructuredPushConsumer::disconnect_structured_push_consumer
-   (TAO_ENV_SINGLE_ARG_DECL)
+   (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_StructuredPushConsumer::push_structured_event
    (const CosNotification::StructuredEvent &/*notification*/
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
index 9a8705f82d0..46e8b942139 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushConsumer.h
@@ -44,25 +44,25 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_StructuredPushConsumer : public POA_CosN
   TAO_Notify_StructuredPushConsumer (void);
   // Constructor.
 
-  void init (PortableServer::POA_ptr poa TAO_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL);
   // Saves the POA ref.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin TAO_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin ACE_ENV_ARG_DECL);
   // Activates this servant with the POA supplied in init.
   // Creates a new proxy supplier via the <consumer_admin> supplied and connects
   // to it.
 
-  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
   // Deactivate the object from the default POA.
 
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void);
   // Accessor for <proxy_supplier_>.
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 protected:
   // = Data Members
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_var proxy_supplier_;
@@ -81,7 +81,7 @@ protected:
     virtual void offer_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -91,7 +91,7 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -100,7 +100,7 @@ protected:
   // Default does nothing.
 
   virtual void disconnect_structured_push_consumer (
-        TAO_ENV_SINGLE_ARG_DECL
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp
index 5dd96dbd149..166168c36cf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.cpp
@@ -20,7 +20,7 @@ TAO_Notify_StructuredPushSupplier::~TAO_Notify_StructuredPushSupplier ()
 
 void
 TAO_Notify_StructuredPushSupplier::init
-   (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL_NOT_USED)
+   (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
@@ -33,19 +33,19 @@ TAO_Notify_StructuredPushSupplier::get_proxy_consumer (void)
 
 void
 TAO_Notify_StructuredPushSupplier::connect (
-    CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin 
-    TAO_ENV_ARG_DECL
+    CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
+    ACE_ENV_ARG_DECL
   )
 {
   CosNotifyComm::StructuredPushSupplier_var supplier_ref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     supplier_admin->obtain_notification_push_consumer (
-                        CosNotifyChannelAdmin::STRUCTURED_EVENT, 
-                        proxy_consumer_id_ 
-                        TAO_ENV_ARG_PARAMETER
+                        CosNotifyChannelAdmin::STRUCTURED_EVENT,
+                        proxy_consumer_id_
+                        ACE_ENV_ARG_PARAMETER
                       );
   ACE_CHECK;
 
@@ -54,15 +54,15 @@ TAO_Notify_StructuredPushSupplier::connect (
   // Narrow.
   this->proxy_consumer_ =
     CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (
-        proxyconsumer.in () 
-        TAO_ENV_ARG_PARAMETER
+        proxyconsumer.in ()
+        ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
   proxy_consumer_->connect_structured_push_supplier (supplier_ref.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Give ownership to POA.
@@ -70,23 +70,23 @@ TAO_Notify_StructuredPushSupplier::connect (
 }
 
 void
-TAO_Notify_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
   this->proxy_consumer_->disconnect_structured_push_consumer (
-                             TAO_ENV_SINGLE_ARG_PARAMETER
+                             ACE_ENV_SINGLE_ARG_PARAMETER
                            );
   ACE_CHECK;
 
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_StructuredPushSupplier::subscription_change
    (const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosNotifyComm::InvalidEventType))
 {
@@ -95,48 +95,48 @@ TAO_Notify_StructuredPushSupplier::subscription_change
 
 PortableServer::POA_ptr
 TAO_Notify_StructuredPushSupplier::_default_POA (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
 
 void
-TAO_Notify_StructuredPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POA_var poa = this->_default_POA ();
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_Notify_StructuredPushSupplier::disconnect_structured_push_supplier (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->proxy_consumer_->disconnect_structured_push_consumer (
-                             TAO_ENV_SINGLE_ARG_PARAMETER
+                             ACE_ENV_SINGLE_ARG_PARAMETER
                            );
   ACE_CHECK;
-  this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_Notify_StructuredPushSupplier::send_event (
-    const CosNotification::StructuredEvent& event 
-    TAO_ENV_ARG_DECL
+    const CosNotification::StructuredEvent& event
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
-  this->proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER);
+  this->proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
index df8f50407c5..f24bfbb6c89 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_StructuredPushSupplier.h
@@ -44,28 +44,28 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_StructuredPushSupplier:public POA_CosNot
   TAO_Notify_StructuredPushSupplier (void);
   // Constructor.
 
-  void init (PortableServer::POA_ptr poa  TAO_ENV_ARG_DECL);
+  void init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL);
   // Init
 
-  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin TAO_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin ACE_ENV_ARG_DECL);
   // Activates this servant with the POA supplied in init.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
   virtual void send_event (const CosNotification::StructuredEvent& event
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
   // Send one event.
 
   CosNotifyChannelAdmin::StructuredProxyPushConsumer_ptr get_proxy_consumer (void);
   // Accessor for <proxy_consumer_>.
 
-  void deactivate (TAO_ENV_SINGLE_ARG_DECL);
+  void deactivate (ACE_ENV_SINGLE_ARG_DECL);
   // Deactivate the object.
 
   // = ServantBase operations
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 protected:
   // = Data Members
@@ -85,7 +85,7 @@ protected:
     virtual void subscription_change (
         const CosNotification::EventTypeSeq & added,
         const CosNotification::EventTypeSeq & removed
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -94,7 +94,7 @@ protected:
 
     // = StructuredPushSupplier method
     virtual void disconnect_structured_push_supplier (
-        TAO_ENV_SINGLE_ARG_DECL
+        ACE_ENV_SINGLE_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
index a1563712f58..765e538acf2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
@@ -19,15 +19,15 @@ Notify_Test_Client::~Notify_Test_Client ()
 }
 
 int
-Notify_Test_Client::init (int argc, char *argv [] TAO_ENV_ARG_DECL)
+Notify_Test_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
 {
-  int status = this->init_ORB (argc, argv TAO_ENV_ARG_PARAMETER);
+  int status = this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (status == 0)
     {
-      this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
-      this->resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   return status;
@@ -43,12 +43,12 @@ Notify_Test_Client::parse_args (int /*argc*/, char** /*argv*/)
 int
 Notify_Test_Client::init_ORB (int argc,
                               char *argv []
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
                                 ""
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (this->parse_args (argc, argv) != 0)
@@ -58,7 +58,7 @@ Notify_Test_Client::init_ORB (int argc,
 
   CORBA::Object_ptr poa_object  =
     this->orb_->resolve_initial_references("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (poa_object))
@@ -68,25 +68,25 @@ Notify_Test_Client::init_ORB (int argc,
       return -1;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object TAO_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-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_CHECK_RETURN (-1);
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 void
-Notify_Test_Client::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+Notify_Test_Client::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -94,13 +94,13 @@ Notify_Test_Client::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW (CORBA::UNKNOWN ());
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () 
-                                       TAO_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ()
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Notify_Test_Client::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL)
+Notify_Test_Client::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -108,13 +108,13 @@ Notify_Test_Client::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     this->naming_context_->resolve (name
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
                                                     obj.in ()
-                                                    TAO_ENV_ARG_PARAMETER
+                                                    ACE_ENV_ARG_PARAMETER
                                                   );
   ACE_CHECK;
 }
@@ -130,7 +130,7 @@ Notify_Test_Client::ORB_run (void)
 }
 
 void
-Notify_Test_Client::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Notify_Test_Client::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->done_ = 1;
 }
@@ -155,7 +155,7 @@ Notify_Test_Client::naming_context (void)
   return this->naming_context_.in ();
 }
 
-  
+
 CosNotifyChannelAdmin::EventChannelFactory_ptr
 Notify_Test_Client::notify_factory (void)
 {
@@ -166,7 +166,7 @@ Notify_Test_Client::notify_factory (void)
 CosNotifyChannelAdmin::EventChannel_ptr
 Notify_Test_Client::create_event_channel (const char* cname,
                                           int resolve
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannel_var ec;
   CosNaming::Name name (1);
@@ -192,7 +192,7 @@ Notify_Test_Client::create_event_channel (const char* cname,
       ec = notify_factory_->create_channel (initial_qos,
                                             initial_admin,
                                             id
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 8c1f456076f..60a1e436d08 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -33,7 +33,7 @@ public:
   Notify_Test_Client (void);
   virtual ~Notify_Test_Client ();
 
-  virtual int init (int argc, char *argv [] TAO_ENV_ARG_DECL);
+  virtual int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
   // starts the orb and resolves the notify factory via a naming service.
 
   virtual int parse_args (int argc, char* argv[]);
@@ -42,7 +42,7 @@ public:
   int ORB_run (void);
   // Call ORB::run to accept requests.
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
   // Shutdown the ORB
 
   CORBA::Boolean& done (void);
@@ -63,20 +63,20 @@ public:
   CosNotifyChannelAdmin::EventChannel_ptr create_event_channel (
                                               const char* name,
                                               int resolve
-                                              TAO_ENV_ARG_DECL
+                                              ACE_ENV_ARG_DECL
                                             );
   // Create an Event Channel.  Ownership is passed to the caller.
 
 protected:
   int init_ORB (int argc,
                 char *argv []
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
-  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Try to get hold of a running naming service.
 
-  void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL);
   // Try to resolve the Notify factory from the Naming service.
 
   // = Data Members
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
index acaa8502375..aff85c3942f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.cpp
@@ -23,23 +23,23 @@ Notify_Sequence_Push_Consumer::~Notify_Sequence_Push_Consumer ()
 void
 Notify_Sequence_Push_Consumer::connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::SequencePushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::SEQUENCE_EVENT,
       proxy_supplier_id_
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::SequenceProxyPushSupplier::_narrow (
-      proxysupplier.in () TAO_ENV_ARG_PARAMETER);
+      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotification::QoSProperties properties(1);
@@ -49,7 +49,7 @@ Notify_Sequence_Push_Consumer::connect (
 
   proxy_supplier_->set_qos(properties);
   proxy_supplier_->connect_sequence_push_consumer (objref.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // give ownership to POA
@@ -60,7 +60,7 @@ Notify_Sequence_Push_Consumer::connect (
 void
 Notify_Sequence_Push_Consumer::push_structured_events(
                           const CosNotification::EventBatch& /*events*/
-                          TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (++this->count_ == this->expected_)
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
index 438f9e1df91..862a537a7a2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Sequence_Push_Consumer.h
@@ -30,12 +30,12 @@ public:
   ~Notify_Sequence_Push_Consumer ();
 
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   void push_structured_events(const CosNotification::EventBatch&
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
index 8fa44e4ab4f..8d8fbdac947 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.cpp
@@ -23,27 +23,27 @@ Notify_Structured_Push_Consumer::~Notify_Structured_Push_Consumer ()
 void
 Notify_Structured_Push_Consumer::connect (
                 CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
       CosNotifyChannelAdmin::STRUCTURED_EVENT,
       proxy_supplier_id_
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-      proxysupplier.in () TAO_ENV_ARG_PARAMETER);
+      proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->_remove_ref ();
@@ -53,7 +53,7 @@ Notify_Structured_Push_Consumer::connect (
 void
 Notify_Structured_Push_Consumer::push_structured_event(
                           const CosNotification::StructuredEvent& /*event*/
-                          TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (++this->count_ == this->expected_)
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
index 8dad50c075d..5de466136cc 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Notify_Structured_Push_Consumer.h
@@ -31,12 +31,12 @@ public:
   ~Notify_Structured_Push_Consumer ();
 
   void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   void push_structured_event(const CosNotification::StructuredEvent&
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ACE_CString name_;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
index 0d70d2d31c0..24f12bf3d23 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
@@ -81,13 +81,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
 create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -95,12 +95,12 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
     {
       // Filter Section
       CosNotifyFilter::FilterFactory_var ffact =
-          ec->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // One Filter
       CosNotifyFilter::Filter_var filter =
-          ffact->create_filter (GRAMMAR TAO_ENV_ARG_PARAMETER);
+          ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CosNotifyFilter::ConstraintExpSeq constraint_list (1);
@@ -110,10 +110,10 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
       constraint_list[0].constraint_expr =
                                  CORBA::string_dup ("type == 'even'");
 
-      filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
+      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      admin->add_filter (filter.in () TAO_ENV_ARG_PARAMETER);
+      admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       // End One Filter
     }
@@ -127,7 +127,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+  admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -137,7 +137,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                   Notify_Test_Client* client
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   for(unsigned int i = 0; i < consumers; i++)
     {
@@ -152,10 +152,10 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                          (i + 1 == consumers ? done : dummy)),
                         CORBA::NO_MEMORY ());
 
-      consumer->init (client->root_poa () TAO_ENV_ARG_PARAMETER);
+      consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      consumer->connect (admin TAO_ENV_ARG_PARAMETER);
+      consumer->connect (admin ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -171,7 +171,7 @@ int main (int argc, char* argv[])
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
@@ -185,15 +185,15 @@ int main (int argc, char* argv[])
 
           CosNotifyChannelAdmin::EventChannel_var ec =
             client.create_event_channel ("MyEventChannel", 1
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           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;
 
-          sig_var sig = sig::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (sig.in ()))
@@ -205,16 +205,16 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers(admin.in (), &client TAO_ENV_ARG_PARAMETER);
+              create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Tell the supplier to go
-              sig->go (TAO_ENV_SINGLE_ARG_PARAMETER);
+              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_Time_Value now = ACE_OS::gettimeofday ();
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index 2add86b7f13..2b1f2bfd13a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -33,13 +33,13 @@ static const char* ior_output_file = "supplier.ior";
 class sig_i : public POA_sig
 {
 public:
-  void go (TAO_ENV_SINGLE_ARG_DECL)
+  void go (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 
 void
-sig_i::go (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+sig_i::go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   start = 1;
@@ -86,13 +86,13 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
 create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -134,7 +134,7 @@ SendEvents (void)
 
       ACE_TRY_NEW_ENV
         {
-          supplier_1->send_events(events TAO_ENV_ARG_PARAMETER);
+          supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CORBA::Exception, e)
@@ -149,17 +149,17 @@ SendEvents (void)
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                   PortableServer::POA_ptr poa
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
                     TAO_Notify_SequencePushSupplier (),
                     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa TAO_ENV_ARG_PARAMETER);
+  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -175,23 +175,23 @@ int main (int argc, char* argv[])
     {
       Supplier_Client client;
 
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
             client.create_event_channel ("MyEventChannel", 0
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           sig_i sig_impl;
-          sig_var sig = sig_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          sig_var sig = sig_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::String_var ior =
-            orb->object_to_string (sig.in () TAO_ENV_ARG_PARAMETER);
+            orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // If the ior_output_file exists, output the ior to it
@@ -209,10 +209,10 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::SupplierAdmin_var admin =
-            create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_suppliers(admin.in (), client.root_poa () TAO_ENV_ARG_PARAMETER);
+              create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               while (!done)
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index 89b183d9b2e..974f3d40b54 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -80,13 +80,13 @@ Consumer_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::ConsumerAdmin_ptr
 create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
     ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -94,12 +94,12 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
     {
       // Filter Section
       CosNotifyFilter::FilterFactory_var ffact =
-          ec->default_filter_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ec->default_filter_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // One Filter
       CosNotifyFilter::Filter_var filter =
-          ffact->create_filter (GRAMMAR TAO_ENV_ARG_PARAMETER);
+          ffact->create_filter (GRAMMAR ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CosNotifyFilter::ConstraintExpSeq constraint_list (1);
@@ -109,10 +109,10 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
       constraint_list[0].constraint_expr =
                                  CORBA::string_dup ("type == 'even'");
 
-      filter->add_constraints (constraint_list TAO_ENV_ARG_PARAMETER);
+      filter->add_constraints (constraint_list ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      admin->add_filter (filter.in () TAO_ENV_ARG_PARAMETER);
+      admin->add_filter (filter.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       // End One Filter
     }
@@ -126,7 +126,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
   added[0].domain_name =  CORBA::string_dup ("*");
   added[0].type_name = CORBA::string_dup ("*");
 
-  admin->subscription_change (added, removed TAO_ENV_ARG_PARAMETER);
+  admin->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CosNotifyChannelAdmin::ConsumerAdmin::_duplicate (admin.in ());
@@ -136,7 +136,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 static void
 create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                   Notify_Test_Client* client
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   for(unsigned int i = 0; i < consumers; i++)
     {
@@ -151,10 +151,10 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
                                          (i + 1 == consumers ? done : dummy)),
                         CORBA::NO_MEMORY ());
 
-      consumer->init (client->root_poa () TAO_ENV_ARG_PARAMETER);
+      consumer->init (client->root_poa () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      consumer->connect (admin TAO_ENV_ARG_PARAMETER);
+      consumer->connect (admin ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -170,7 +170,7 @@ int main (int argc, char* argv[])
     {
       Consumer_Client client;
 
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
@@ -184,15 +184,15 @@ int main (int argc, char* argv[])
 
           CosNotifyChannelAdmin::EventChannel_var ec =
           client.create_event_channel ("MyEventChannel", 1
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           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;
 
-          sig_var sig = sig::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+          sig_var sig = sig::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (sig.in ()))
@@ -204,16 +204,16 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-            create_consumeradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_consumers(admin.in (), &client TAO_ENV_ARG_PARAMETER);
+              create_consumers(admin.in (), &client ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Tell the supplier to go
-              sig->go (TAO_ENV_SINGLE_ARG_PARAMETER);
+              sig->go (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_Time_Value now = ACE_OS::gettimeofday ();
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index 401c0079dec..9d1ba070680 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -33,13 +33,13 @@ static const char* ior_output_file = "supplier.ior";
 class sig_i : public POA_sig
 {
 public:
-  void go (TAO_ENV_SINGLE_ARG_DECL)
+  void go (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 
 void
-sig_i::go (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+sig_i::go (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   start = 1;
@@ -86,13 +86,13 @@ Supplier_Client::parse_args (int argc, char *argv[])
 
 static CosNotifyChannelAdmin::SupplierAdmin_ptr
 create_supplieradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::SupplierAdmin_var admin =
     ec->new_for_suppliers (CosNotifyChannelAdmin::AND_OP,
                            adminid
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -130,7 +130,7 @@ SendEvent (void)
 
       ACE_TRY_NEW_ENV
         {
-          supplier_1->send_event(event TAO_ENV_ARG_PARAMETER);
+          supplier_1->send_event(event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CORBA::Exception, e)
@@ -145,17 +145,17 @@ SendEvent (void)
 static void
 create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
                   PortableServer::POA_ptr poa
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   // startup the first supplier
   ACE_NEW_THROW_EX (supplier_1,
                     TAO_Notify_StructuredPushSupplier (),
                     CORBA::NO_MEMORY ());
 
-  supplier_1->init (poa TAO_ENV_ARG_PARAMETER);
+  supplier_1->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  supplier_1->connect (admin TAO_ENV_ARG_PARAMETER);
+  supplier_1->connect (admin ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -170,23 +170,23 @@ int main (int argc, char* argv[])
   ACE_TRY_NEW_ENV
     {
       Supplier_Client client;
-      status = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == 0)
         {
           CosNotifyChannelAdmin::EventChannel_var ec =
             client.create_event_channel ("MyEventChannel", 0
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           sig_i sig_impl;
-          sig_var sig = sig_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          sig_var sig = sig_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ORB_ptr orb = client.orb ();
           CORBA::String_var ior =
-            orb->object_to_string (sig.in () TAO_ENV_ARG_PARAMETER);
+            orb->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // If the ior_output_file exists, output the ior to it
@@ -204,10 +204,10 @@ int main (int argc, char* argv[])
             }
 
           CosNotifyChannelAdmin::SupplierAdmin_var admin =
-            create_supplieradmin (ec.in () TAO_ENV_ARG_PARAMETER);
+            create_supplieradmin (ec.in () ACE_ENV_ARG_PARAMETER);
           if (!CORBA::is_nil (admin.in ()))
             {
-              create_suppliers(admin.in (), client.root_poa () TAO_ENV_ARG_PARAMETER);
+              create_suppliers(admin.in (), client.root_poa () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               while (!done)
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index f1c2f119a18..b82defc7350 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -1,4 +1,4 @@
-/* -*- C++ -*- $Id$*/
+/* -*- C++ -*- $Id$
 
 #include "RedGreen_Test.h"
 #include "ace/Arg_Shifter.h"
@@ -22,7 +22,7 @@ ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_result_count = 0;
 ACE_hrtime_t g_throughput_start_;
 
 int
-RedGreen_Test::parse_args (int argc, 
+RedGreen_Test::parse_args (int argc,
                            char *argv[])
 {
   ACE_Arg_Shifter arg_shifter (argc, argv);
@@ -34,8 +34,8 @@ RedGreen_Test::parse_args (int argc,
       if ((current_arg = arg_shifter.get_the_parameter ("-burst_size")))
         {
           this->burst_size_ = ACE_OS::atoi (current_arg);
-          ACE_DEBUG ((LM_DEBUG, 
-                      "Burst size = %d\n", 
+          ACE_DEBUG ((LM_DEBUG,
+                      "Burst size = %d\n",
                       burst_size_));
           // The number of events to send/receive.
           arg_shifter.consume_arg ();
@@ -45,7 +45,7 @@ RedGreen_Test::parse_args (int argc,
           ACE_DEBUG((LM_DEBUG,
                      "usage: %s "
                      "-burst_size [count]\n",
-                     argv[0], 
+                     argv[0],
                      argv[0]));
 
           arg_shifter.consume_arg ();
@@ -78,34 +78,34 @@ RedGreen_Test::~RedGreen_Test ()
 }
 
 void
-RedGreen_Test::init (int argc, 
-                     char *argv [] 
-                     TAO_ENV_ARG_DECL)
+RedGreen_Test::init (int argc,
+                     char *argv []
+                     ACE_ENV_ARG_DECL)
 {
-  this->init_ORB (argc, 
-                  argv 
-                  TAO_ENV_ARG_PARAMETER);
+  this->init_ORB (argc,
+                  argv
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->create_supplieradmin (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->create_supplieradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->create_consumeradmin (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->create_consumeradmin (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->create_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->create_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->create_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->create_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test::run (TAO_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->send_events (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->send_events (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   worker_.thr_mgr ()->wait ();
@@ -121,17 +121,17 @@ RedGreen_Test::done (void)
 void
 RedGreen_Test::init_ORB (int argc,
                          char *argv []
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
                                 ""
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_ptr poa_object  =
     this->orb_->resolve_initial_references("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (poa_object))
@@ -141,15 +141,15 @@ RedGreen_Test::init_ORB (int argc,
       return;
     }
   this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object 
-                                  TAO_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (poa_object
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_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_CHECK;
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   worker_.orb (this->orb_.in ());
@@ -163,11 +163,11 @@ RedGreen_Test::init_ORB (int argc,
 }
 
 void
-RedGreen_Test::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var naming_obj =
     this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Need to check return value for errors.
@@ -177,13 +177,13 @@ RedGreen_Test::resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in () 
-                                       TAO_ENV_ARG_PARAMETER);
+    CosNaming::NamingContext::_narrow (naming_obj.in ()
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNaming::Name name (1);
   name.length (1);
@@ -191,89 +191,89 @@ RedGreen_Test::resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::Object_var obj =
     this->naming_context_->resolve (name
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->notify_factory_ =
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
         obj.in ()
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 void
-RedGreen_Test::create_EC (TAO_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_EC (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::ChannelID id;
 
   this->ec_ = notify_factory_->create_channel (this->initial_qos_,
                                                this->initial_admin_,
                                                id
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
 }
 
 void
-RedGreen_Test::create_supplieradmin (TAO_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_supplieradmin (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, 
-                            adminid 
-                            TAO_ENV_ARG_PARAMETER);
+    ec_->new_for_suppliers (this->ifgop_,
+                            adminid
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 }
 
 void
-RedGreen_Test:: create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL)
+RedGreen_Test:: create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::AdminID adminid;
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, 
-                            adminid 
-                            TAO_ENV_ARG_PARAMETER);
+    ec_->new_for_consumers (this->ifgop_,
+                            adminid
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
 }
 
 void
-RedGreen_Test::create_consumers (TAO_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW (this->normal_consumer_,
            RedGreen_Test_StructuredPushConsumer (this));
   this->normal_consumer_->connect (this->consumer_admin_.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_NEW (this->slow_consumer_,
            SlowConsumer (this));
   this->slow_consumer_->connect (this->consumer_admin_.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test::create_suppliers (TAO_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW (this->supplier_,
            RedGreen_Test_StructuredPushSupplier ());
   this->supplier_->connect (this->supplier_admin_.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test::send_events (TAO_ENV_SINGLE_ARG_DECL)
+RedGreen_Test::send_events (ACE_ENV_SINGLE_ARG_DECL)
 {
-  // Setup the Consumer 1 to receive 
+  // Setup the Consumer 1 to receive
   //event_type : "DOMAIN_GREEN", "DOMAIN_GREEN".
   CosNotification::EventTypeSeq added_1(1);
   CosNotification::EventTypeSeq removed_1 (0);
@@ -284,9 +284,9 @@ RedGreen_Test::send_events (TAO_ENV_SINGLE_ARG_DECL)
   removed_1.length (0);
 
   this->normal_consumer_->get_proxy_supplier ()->subscription_change (
-                                                     added_1, 
+                                                     added_1,
                                                      removed_1
-                                                     TAO_ENV_ARG_PARAMETER
+                                                     ACE_ENV_ARG_PARAMETER
                                                    );
   ACE_CHECK;
 
@@ -300,9 +300,9 @@ RedGreen_Test::send_events (TAO_ENV_SINGLE_ARG_DECL)
   removed_2.length (0);
 
   this->slow_consumer_->get_proxy_supplier ()->subscription_change (
-                                                   added_2, 
+                                                   added_2,
                                                    removed_2
-                                                   TAO_ENV_ARG_PARAMETER
+                                                   ACE_ENV_ARG_PARAMETER
                                                  );
   ACE_CHECK;
 
@@ -335,12 +335,12 @@ RedGreen_Test::send_events (TAO_ENV_SINGLE_ARG_DECL)
   // let supplier 1 send all these events
   for (int i = 0; i < this->burst_size_; ++i)
     {
-      this->supplier_->send_event (red_event 
-                                   TAO_ENV_ARG_PARAMETER);
+      this->supplier_->send_event (red_event
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->supplier_->send_event (green_event 
-                                   TAO_ENV_ARG_PARAMETER);
+      this->supplier_->send_event (green_event
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -353,42 +353,38 @@ RedGreen_Test::dump_results (void)
   ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
   char buf[BUFSIZ];
 
-  ACE_OS::sprintf (buf, 
-                   "Normal Consumer [%02d]", 
+  ACE_OS::sprintf (buf,
+                   "Normal Consumer [%02d]",
                    1);
-  normal_consumer_->dump_stats (buf, 
+  normal_consumer_->dump_stats (buf,
                                 gsf);
   normal_consumer_->accumulate_into (throughput);
 
-  ACE_OS::sprintf (buf, 
-                   "Slow Consumer [%02d]", 
+  ACE_OS::sprintf (buf,
+                   "Slow Consumer [%02d]",
                    2);
-  slow_consumer_->dump_stats (buf, 
+  slow_consumer_->dump_stats (buf,
                               gsf);
   slow_consumer_->accumulate_into (throughput);
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "\n"));
 
   ACE_Throughput_Stats suppliers;
 
-  ACE_OS::sprintf (buf, 
-                   "Supplier [%02d]", 
+  ACE_OS::sprintf (buf,
+                   "Supplier [%02d]",
                    1);
 
-  this->supplier_->dump_stats (buf, 
+  this->supplier_->dump_stats (buf,
                                gsf);
   this->supplier_->accumulate_into (suppliers);
 
-  ACE_DEBUG ((LM_DEBUG, 
-              "\nTotals:\n"));
-  throughput.dump_results ("Notify_Consumer/totals", 
-                           gsf);
+  ACE_DEBUG ((LM_DEBUG, "\nTotals:\n"));
+  throughput.dump_results ("Notify_Consumer/totals", gsf);
 
-  ACE_DEBUG ((LM_DEBUG, 
-              "\n"));
-  suppliers.dump_results ("Notify_Supplier/totals", 
-                          gsf);
+  ACE_DEBUG ((LM_DEBUG, "\n"));
+  suppliers.dump_results ("Notify_Supplier/totals", gsf);
 }
 
 // *****************************************************************
@@ -416,29 +412,29 @@ RedGreen_Test_StructuredPushConsumer::accumulate_into (
 }
 
 void
-RedGreen_Test_StructuredPushConsumer::dump_stats (const char* msg, 
+RedGreen_Test_StructuredPushConsumer::dump_stats (const char* msg,
                                                   ACE_UINT32 gsf)
 {
-  this->throughput_.dump_results (msg, 
+  this->throughput_.dump_results (msg,
                                   gsf);
 }
 
 void
 RedGreen_Test_StructuredPushConsumer::connect (
-    CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin 
-    TAO_ENV_ARG_DECL
+    CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
+    ACE_ENV_ARG_DECL
   )
 {
   // Activate the consumer with the default_POA_.
   CosNotifyComm::StructuredPushConsumer_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
     consumer_admin->obtain_notification_push_supplier (
-        CosNotifyChannelAdmin::STRUCTURED_EVENT, 
-        proxy_supplier_id_ 
-        TAO_ENV_ARG_PARAMETER
+        CosNotifyChannelAdmin::STRUCTURED_EVENT,
+        proxy_supplier_id_
+        ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 
@@ -447,23 +443,23 @@ RedGreen_Test_StructuredPushConsumer::connect (
   // narrow
   this->proxy_supplier_ =
     CosNotifyChannelAdmin::StructuredProxyPushSupplier::_narrow (
-        proxysupplier.in () 
-        TAO_ENV_ARG_PARAMETER
+        proxysupplier.in ()
+        ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
 
   proxy_supplier_->connect_structured_push_consumer (objref.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test_StructuredPushConsumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+RedGreen_Test_StructuredPushConsumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->proxy_supplier_->
-    disconnect_structured_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
+    disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -471,7 +467,7 @@ void
 RedGreen_Test_StructuredPushConsumer::offer_change (
     const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed*/
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
@@ -482,13 +478,13 @@ RedGreen_Test_StructuredPushConsumer::offer_change (
 void
 RedGreen_Test_StructuredPushConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
 {
-  ACE_GUARD (TAO_SYNCH_MUTEX, 
-             ace_mon, 
+  ACE_GUARD (TAO_SYNCH_MUTEX,
+             ace_mon,
              this->lock_);
   const char* domain_name =
     notification.header.fixed_header.event_type.domain_name;
@@ -496,10 +492,10 @@ RedGreen_Test_StructuredPushConsumer::push_structured_event (
   const char* type_name =
     notification.header.fixed_header.event_type.type_name;
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "Consumer %d event, domain = %s, type =  %s\n",
-              this->proxy_supplier_id_, 
-              domain_name, 
+              this->proxy_supplier_id_,
+              domain_name,
               type_name));
 
   TimeBase::TimeT latency_base_recorded;
@@ -528,7 +524,7 @@ RedGreen_Test_StructuredPushConsumer::push_structured_event (
 
 void
 RedGreen_Test_StructuredPushConsumer::disconnect_structured_push_consumer (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -551,7 +547,7 @@ SlowConsumer::SlowConsumer (RedGreen_Test* RedGreen_Test)
 void
 SlowConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
@@ -560,8 +556,8 @@ SlowConsumer::push_structured_event (
   ACE_OS::sleep (1);
 
   RedGreen_Test_StructuredPushConsumer::push_structured_event (
-      notification 
-      TAO_ENV_ARG_PARAMETER
+      notification
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -588,28 +584,28 @@ RedGreen_Test_StructuredPushSupplier::accumulate_into (
 }
 
 void
-RedGreen_Test_StructuredPushSupplier::dump_stats (const char* msg, 
+RedGreen_Test_StructuredPushSupplier::dump_stats (const char* msg,
                                                   ACE_UINT32 gsf)
 {
-  this->throughput_.dump_results (msg, 
+  this->throughput_.dump_results (msg,
                                   gsf);
 }
 
 void
 RedGreen_Test_StructuredPushSupplier::connect (
-    CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin 
-    TAO_ENV_ARG_DECL
+    CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
+    ACE_ENV_ARG_DECL
   )
 {
   CosNotifyComm::StructuredPushSupplier_var objref =
-    this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
     supplier_admin->obtain_notification_push_consumer (
-        CosNotifyChannelAdmin::STRUCTURED_EVENT, 
-        proxy_consumer_id_ 
-        TAO_ENV_ARG_PARAMETER
+        CosNotifyChannelAdmin::STRUCTURED_EVENT,
+        proxy_consumer_id_
+        ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 
@@ -618,25 +614,25 @@ RedGreen_Test_StructuredPushSupplier::connect (
   // narrow
   this->proxy_consumer_ =
     CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (
-        proxyconsumer.in () 
-        TAO_ENV_ARG_PARAMETER
+        proxyconsumer.in ()
+        ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 
   ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
 
   proxy_consumer_->connect_structured_push_supplier (objref.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-RedGreen_Test_StructuredPushSupplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
+RedGreen_Test_StructuredPushSupplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
 
   this->proxy_consumer_->disconnect_structured_push_consumer (
-                             TAO_ENV_SINGLE_ARG_PARAMETER
+                             ACE_ENV_SINGLE_ARG_PARAMETER
                            );
 }
 
@@ -644,7 +640,7 @@ void
 RedGreen_Test_StructuredPushSupplier::subscription_change (
     const CosNotification::EventTypeSeq & /*added*/,
     const CosNotification::EventTypeSeq & /*removed */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosNotifyComm::InvalidEventType))
@@ -654,8 +650,8 @@ RedGreen_Test_StructuredPushSupplier::subscription_change (
 
 void
 RedGreen_Test_StructuredPushSupplier::send_event (
-    CosNotification::StructuredEvent& event 
-    TAO_ENV_ARG_DECL
+    CosNotification::StructuredEvent& event
+    ACE_ENV_ARG_DECL
   )
 {
   event.filterable_data.length (1);
@@ -669,7 +665,7 @@ RedGreen_Test_StructuredPushSupplier::send_event (
                                  start);
   // any
   event.filterable_data[0].value <<= latency_base;
-  proxy_consumer_->push_structured_event (event TAO_ENV_ARG_PARAMETER);
+  proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -681,7 +677,7 @@ RedGreen_Test_StructuredPushSupplier::send_event (
 
 void
 RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 8b7be133292..c73333c8fd5 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -75,17 +75,17 @@ class RedGreen_Test
   RedGreen_Test (void);
   ~RedGreen_Test (void);
 
-  int parse_args (int argc, 
+  int parse_args (int argc,
                   char *argv[]);
 
   void dump_results (void);
 
-  void init (int argc, 
-             char *argv [] 
-             TAO_ENV_ARG_DECL);
+  void init (int argc,
+             char *argv []
+             ACE_ENV_ARG_DECL);
   // Initialize the Client.
 
-  void run (TAO_ENV_SINGLE_ARG_DECL);
+  void run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the demo.
 
   void done (void);
@@ -96,33 +96,33 @@ class RedGreen_Test
   int nthreads_;
 
  protected:
-  void init_ORB (int argc, 
-                 char *argv [] 
-                 TAO_ENV_ARG_DECL);
+  void init_ORB (int argc,
+                 char *argv []
+                 ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
-  void resolve_naming_service (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
   // Try to get hold of a running naming service.
 
-  void resolve_Notify_factory (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_Notify_factory (ACE_ENV_SINGLE_ARG_DECL);
   // Try to resolve the Notify factory from the Naming service.
 
-  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
+  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
   // Create an EC.
 
-  void create_supplieradmin(TAO_ENV_SINGLE_ARG_DECL);
+  void create_supplieradmin(ACE_ENV_SINGLE_ARG_DECL);
   // Create the Supplier Admin.
 
-  void create_consumeradmin (TAO_ENV_SINGLE_ARG_DECL);
+  void create_consumeradmin (ACE_ENV_SINGLE_ARG_DECL);
   // Create the Consumer Admin.
 
-  void create_consumers (TAO_ENV_SINGLE_ARG_DECL);
+  void create_consumers (ACE_ENV_SINGLE_ARG_DECL);
   // Create and initialize the consumers.
 
-  void create_suppliers (TAO_ENV_SINGLE_ARG_DECL);
+  void create_suppliers (ACE_ENV_SINGLE_ARG_DECL);
   // create and initialize the suppliers.
 
-  void send_events (TAO_ENV_SINGLE_ARG_DECL);
+  void send_events (ACE_ENV_SINGLE_ARG_DECL);
   // send the events.
 
   // = Data Members.
@@ -177,12 +177,12 @@ class RedGreen_Test_StructuredPushConsumer : public POA_CosNotifyComm::Structure
   RedGreen_Test_StructuredPushConsumer (RedGreen_Test* RedGreen_Test);
   // Constructor.
 
-  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin 
-                TAO_ENV_ARG_DECL);
+  void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
+                ACE_ENV_ARG_DECL);
   // Connect the Consumer to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  virtual void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
   CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (
@@ -223,7 +223,7 @@ protected:
   virtual void offer_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyComm::InvalidEventType));
@@ -231,13 +231,13 @@ protected:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
 
   virtual void disconnect_structured_push_consumer (
-      TAO_ENV_SINGLE_ARG_DECL
+      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
@@ -251,7 +251,7 @@ public:
 
   virtual void push_structured_event (
       const CosNotification::StructuredEvent & notification
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosEventComm::Disconnected));
@@ -259,8 +259,8 @@ public:
 
 
 /*****************************************************************/
-class RedGreen_Test_StructuredPushSupplier 
-  : public POA_CosNotifyComm::StructuredPushSupplier, 
+class RedGreen_Test_StructuredPushSupplier
+  : public POA_CosNotifyComm::StructuredPushSupplier,
   public PortableServer::RefCountServantBase
 {
   // = TITLE
@@ -275,15 +275,15 @@ class RedGreen_Test_StructuredPushSupplier
   // Constructor.
 
   void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
   // Connect the Supplier to the EventChannel.
   // Creates a new proxy supplier and connects to it.
 
-  void disconnect (TAO_ENV_SINGLE_ARG_DECL);
+  void disconnect (ACE_ENV_SINGLE_ARG_DECL);
   // Disconnect from the supplier.
 
   virtual void send_event (CosNotification::StructuredEvent& event
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
   // Send one event.
 
   void accumulate_into (ACE_Throughput_Stats &throughput) const;
@@ -311,14 +311,14 @@ protected:
   virtual void subscription_change (
       const CosNotification::EventTypeSeq & added,
       const CosNotification::EventTypeSeq & removed
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosNotifyComm::InvalidEventType));
 
   // = StructuredPushSupplier method
   virtual void disconnect_structured_push_supplier (
-      TAO_ENV_SINGLE_ARG_DECL
+      ACE_ENV_SINGLE_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
index 78216136b95..384ff8b1c17 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
@@ -15,10 +15,10 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       client.init (argc, argv
-                   TAO_ENV_ARG_PARAMETER); //Init the Client
+                   ACE_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
-      client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ue)
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 9302f655c3a..0a0b9793776 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -34,7 +34,7 @@ Throughput_StructuredPushConsumer::accumulate_into (
 }
 
 void
-Throughput_StructuredPushConsumer::dump_stats (const char* msg, 
+Throughput_StructuredPushConsumer::dump_stats (const char* msg,
                                                ACE_UINT32 gsf)
 {
   this->throughput_.dump_results (msg, gsf);
@@ -43,7 +43,7 @@ Throughput_StructuredPushConsumer::dump_stats (const char* msg,
 void
 Throughput_StructuredPushConsumer::push_structured_event (
     const CosNotification::StructuredEvent & notification
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosEventComm::Disconnected))
@@ -82,13 +82,13 @@ Throughput_StructuredPushConsumer::push_structured_event (
   if (this->push_count_%1000 == 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P)(%t) event count = %d\n", 
+                  "(%P)(%t) event count = %d\n",
                   this->push_count_));
     }
 
   if (push_count_ == test_client_->perconsumer_count_)
   {
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
                 "(%t)expected count reached\n"));
     test_client_->peer_done ();
   }
@@ -117,7 +117,7 @@ Throughput_StructuredPushSupplier::accumulate_into (
 }
 
 void
-Throughput_StructuredPushSupplier::dump_stats (const char* msg, 
+Throughput_StructuredPushSupplier::dump_stats (const char* msg,
                                                ACE_UINT32 gsf)
 {
   this->throughput_.dump_results (msg, gsf);
@@ -157,7 +157,7 @@ Throughput_StructuredPushSupplier::svc (void)
 
   event.remainder_of_body <<= test_client_->payload_;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   this->throughput_start_ = ACE_OS::gethrtime ();
 
@@ -174,7 +174,7 @@ Throughput_StructuredPushSupplier::svc (void)
           event.filterable_data[0].value <<= Throughput_base;
 
           this->proxy_consumer_->push_structured_event (event
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -211,31 +211,31 @@ Notify_Throughput::Notify_Throughput (void)
 
 Notify_Throughput::~Notify_Throughput ()
 {
-  TAO_ENV_DECLARE_NEW_ENV;
-  this->orb_->shutdown (0 
-                        TAO_ENV_ARG_PARAMETER);
+  ACE_DECLARE_NEW_CORBA_ENV;
+  this->orb_->shutdown (0
+                        ACE_ENV_ARG_PARAMETER);
 
   delete payload_;
 }
 
 int
-Notify_Throughput::init (int argc, char* argv [] TAO_ENV_ARG_DECL)
+Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
 {
   // Initialize base class.
-  Notify_Test_Client::init_ORB (argc, 
-                                argv 
-                                TAO_ENV_ARG_PARAMETER);
+  Notify_Test_Client::init_ORB (argc,
+                                argv
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
   CORBA::Object_var manager_object =
     orb_->resolve_initial_references ("ORBPolicyManager"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::PolicyManager_var policy_manager =
     CORBA::PolicyManager::_narrow (manager_object.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Any sync_scope;
@@ -246,11 +246,11 @@ Notify_Throughput::init (int argc, char* argv [] TAO_ENV_ARG_DECL)
   policy_list[0] =
     orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                         sync_scope
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   policy_manager->set_policy_overrides (policy_list,
                                         CORBA::SET_OVERRIDE
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 #else
   ACE_DEBUG ((LM_DEBUG,
@@ -268,19 +268,19 @@ Notify_Throughput::init (int argc, char* argv [] TAO_ENV_ARG_DECL)
     }
 
   // Create all participents ...
-  this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CosNotifyChannelAdmin::AdminID adminid;
 
   supplier_admin_ =
-    ec_->new_for_suppliers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
+    ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
 
   consumer_admin_ =
-    ec_->new_for_consumers (this->ifgop_, adminid TAO_ENV_ARG_PARAMETER);
+    ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
@@ -301,12 +301,12 @@ Notify_Throughput::init (int argc, char* argv [] TAO_ENV_ARG_DECL)
       ACE_NEW_RETURN (consumers_[i],
                       Throughput_StructuredPushConsumer (this),
                       -1);
-      consumers_[i]->init (root_poa_.in () 
-                           TAO_ENV_ARG_PARAMETER);
+      consumers_[i]->init (root_poa_.in ()
+                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       consumers_[i]->connect (this->consumer_admin_.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -317,11 +317,11 @@ Notify_Throughput::init (int argc, char* argv [] TAO_ENV_ARG_DECL)
                       -1);
       suppliers_[i]->TAO_Notify_StructuredPushSupplier::init (
                          root_poa_.in ()
-                         TAO_ENV_ARG_PARAMETER
+                         ACE_ENV_ARG_PARAMETER
                        );
       ACE_CHECK_RETURN (-1);
       suppliers_[i]->connect (this->supplier_admin_.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -337,7 +337,7 @@ Notify_Throughput::init (int argc, char* argv [] TAO_ENV_ARG_DECL)
   added[0].type_name = CORBA::string_dup ("*");
 
   this->consumer_admin_->subscription_change (added, removed
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -395,8 +395,8 @@ Notify_Throughput::parse_args(int argc, char *argv[])
       else if ((current_arg = arg_shifter.get_the_parameter ("-payload")))
         {
           this->payload_size_ = ACE_OS::atoi (current_arg);
-          ACE_NEW_RETURN (this->payload_, 
-                          char [this->payload_size_], 
+          ACE_NEW_RETURN (this->payload_,
+                          char [this->payload_size_],
                           -1);
           //
           arg_shifter.consume_arg ();
@@ -444,22 +444,22 @@ Notify_Throughput::parse_args(int argc, char *argv[])
 }
 
 void
-Notify_Throughput::create_EC (TAO_ENV_SINGLE_ARG_DECL)
+Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->colocated_ec_ == 1)
     {
       this->notify_factory_ =
         TAO_Notify_EventChannelFactory_i::create (this->root_poa_.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ()));
     }
   else
     {
-      this->resolve_naming_service (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
-      this->resolve_Notify_factory (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -472,12 +472,12 @@ Notify_Throughput::create_EC (TAO_ENV_SINGLE_ARG_DECL)
 
       CORBA::Object_var obj =
         this->naming_context_->resolve (name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->ec_ =
         CosNotifyChannelAdmin::EventChannel::_narrow (obj.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 else
@@ -487,7 +487,7 @@ else
     ec_ = notify_factory_->create_channel (initial_qos_,
                                            initial_admin_,
                                            id
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -495,7 +495,7 @@ else
 }
 
 void
-Notify_Throughput::run_test (TAO_ENV_SINGLE_ARG_DECL)
+Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL)
 {
 
   ACE_DEBUG ((LM_DEBUG, "colocated_ec_ %d ,"
@@ -519,7 +519,7 @@ Notify_Throughput::run_test (TAO_ENV_SINGLE_ARG_DECL)
     {
       suppliers_[i]->
         TAO_Notify_StructuredPushSupplier::init (root_poa_.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (suppliers_[i]->activate (THR_NEW_LWP | THR_JOINABLE) != 0)
@@ -543,7 +543,7 @@ Notify_Throughput::run_test (TAO_ENV_SINGLE_ARG_DECL)
   if (this->ec_name_.length () == 0) // we are not using a global EC
     {
       // Destroy the ec.
-      this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -614,10 +614,10 @@ main (int argc, char* argv[])
   ACE_TRY_NEW_ENV
     {
       events.init (argc, argv
-                      TAO_ENV_ARG_PARAMETER); //Init the Client
+                      ACE_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
-      events.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Waiting for threads to exit...\n"));
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index e0a0a724b2c..ec5c1f64b88 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -58,7 +58,7 @@ private:
 
 class Notify_Throughput;
 
-class Throughput_StructuredPushConsumer 
+class Throughput_StructuredPushConsumer
   : public TAO_Notify_StructuredPushConsumer
 {
 public:
@@ -68,7 +68,7 @@ public:
   // = StructuredPushSupplier methods
   virtual void push_structured_event (
         const CosNotification::StructuredEvent & notification
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -99,8 +99,8 @@ protected:
 
 /***************************************************************************/
 
-class Throughput_StructuredPushSupplier 
-  : public TAO_Notify_StructuredPushSupplier, 
+class Throughput_StructuredPushSupplier
+  : public TAO_Notify_StructuredPushSupplier,
     public ACE_Task_Base
 {
 public:
@@ -143,10 +143,10 @@ public:
 
   int parse_args(int argc, char *argv[]) ;
 
-  int init (int argc, char *argv [] TAO_ENV_ARG_DECL);
+  int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
   // initialization.
 
-  void run_test (TAO_ENV_SINGLE_ARG_DECL);
+  void run_test (ACE_ENV_SINGLE_ARG_DECL);
   // Run the test.
 
   void peer_done (void);
@@ -157,7 +157,7 @@ public:
 
   Worker worker_;
 protected:
-  void create_EC (TAO_ENV_SINGLE_ARG_DECL);
+  void create_EC (ACE_ENV_SINGLE_ARG_DECL);
   // Create participants.
 
   CORBA::Boolean colocated_ec_;
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index f578d7fc690..88e2b054e22 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -28,12 +28,12 @@ ACE_RCSID(CosPropertyService, client, "$Id$")
 int
 Client::init (int argc,
               char *argv[]
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   // Init the ORB.
   manager_.init (argc,
                  argv
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Initialize the naming services
@@ -49,11 +49,11 @@ Client::init (int argc,
   propsetdef_name.length (1);
   propsetdef_name [0].id = CORBA::string_dup ("PropertySetDef");
   CORBA::Object_var propsetdef_obj = my_name_client_->resolve (propsetdef_name
-                                                               TAO_ENV_ARG_PARAMETER);
+                                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->propsetdef_ = CosPropertyService::PropertySetDef::_narrow (propsetdef_obj.in ()
-                                                                   TAO_ENV_ARG_PARAMETER);
+                                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->propsetdef_.in ()))
@@ -67,62 +67,62 @@ Client::init (int argc,
 // Testing the methods of the property service.
 
 int
-Client::property_tester (TAO_ENV_SINGLE_ARG_DECL)
+Client::property_tester (ACE_ENV_SINGLE_ARG_DECL)
 {
   // = Testing PropertySet & Iterators.
 
   // Testing define_property () of PropertySet interface.
-  this->test_define_property (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_define_property (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Test the number of properties.
-  this->test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing get_all_property_names.
-  this->test_get_all_property_names (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_get_all_property_names (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Test get_property_value.
-  this->test_get_property_value (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_get_property_value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing delete property.
-  this->test_delete_property ("no_property" TAO_ENV_ARG_PARAMETER);
+  this->test_delete_property ("no_property" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing get_properties.
-  this->test_get_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_get_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing delete_properties.
-  this->test_delete_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_delete_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Test the number of properties.
-  this->test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing define_properties.
-  this->test_define_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_define_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Test the number of properties.
-  this->test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing get_all_property_names.
-  this->test_get_all_property_names (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_get_all_property_names (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Testing get_all_properties.
-  this->test_get_all_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_get_all_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // = Testing PropertySetDef & Iterators.
 
   // Testing define_property_with_mode.
-  this->test_define_property_with_mode (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_define_property_with_mode (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -131,7 +131,7 @@ Client::property_tester (TAO_ENV_SINGLE_ARG_DECL)
 // Testing define_property.
 
 int
-Client::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
+Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Any anyval;
 
@@ -143,7 +143,7 @@ Client::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
 
   this->propsetdef_->define_property ("char_property",
                                       anyval
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Prepare a Short and "define" that in the PropertySet.
@@ -154,7 +154,7 @@ Client::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
 
   propsetdef_->define_property ("short_property",
                                 anyval
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Prepare a Long and "define" that in the PropertySet.
@@ -165,7 +165,7 @@ Client::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::Any newany(anyval);
   propsetdef_->define_property ("long_property",
                                 anyval
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Prepare a Float and "define" that in the PropertySet.
@@ -176,7 +176,7 @@ Client::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
 
   propsetdef_->define_property ("float_property",
                                 anyval
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
@@ -187,7 +187,7 @@ Client::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
   anyval >>= newstr;
   propsetdef_->define_property ("string_property",
                                 anyval
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
@@ -197,11 +197,11 @@ Client::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
 // Testing get_all_property_names of the PropertySet.
 
 int
-Client::test_get_all_property_names (TAO_ENV_SINGLE_ARG_DECL)
+Client::test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get the size.
   CORBA::ULong num_of_properties =
-    propsetdef_->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+    propsetdef_->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get half on the names and half of on the iterator.
@@ -220,7 +220,7 @@ Client::test_get_all_property_names (TAO_ENV_SINGLE_ARG_DECL)
   propsetdef_->get_all_property_names (how_many,
                                        names_out,
                                        iterator_out
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get the values back to var.
@@ -249,7 +249,7 @@ Client::test_get_all_property_names (TAO_ENV_SINGLE_ARG_DECL)
           CosPropertyService::PropertyName_out name_out (name_ptr);
 
           // Call the function.
-          CORBA::Boolean next_one_result = iterator_var->next_one (name_out TAO_ENV_ARG_PARAMETER);
+          CORBA::Boolean next_one_result = iterator_var->next_one (name_out ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           // Get the values back on a _var variable.
@@ -260,7 +260,7 @@ Client::test_get_all_property_names (TAO_ENV_SINGLE_ARG_DECL)
               ACE_DEBUG ((LM_DEBUG, "%s\n", name_var.in ()));
 
               // Call the function to iterate again.
-              next_one_result = iterator_var->next_one (name_out TAO_ENV_ARG_PARAMETER);
+              next_one_result = iterator_var->next_one (name_out ACE_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (-1);
 
               // Get the values back on a _var variable.
@@ -277,7 +277,7 @@ Client::test_get_all_property_names (TAO_ENV_SINGLE_ARG_DECL)
 // properties.
 
 int
-Client::test_get_properties (TAO_ENV_SINGLE_ARG_DECL)
+Client::test_get_properties (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get float_property, string_property and no_property. If return
   // value is false and type is tc_void then that name is not there in
@@ -304,7 +304,7 @@ Client::test_get_properties (TAO_ENV_SINGLE_ARG_DECL)
   // Get the properties.
   CORBA::Boolean return_val = propsetdef_->get_properties (names.in (),
                                                            properties_out
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_UNUSED_ARG (return_val);
   ACE_CHECK_RETURN (-1);
 
@@ -369,9 +369,9 @@ Client::test_get_properties (TAO_ENV_SINGLE_ARG_DECL)
 // Testing, get_number_of_properties.
 
 int
-Client::test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL)
+Client::test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL)
 {
-  CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (TAO_debug_level > 0)
@@ -387,14 +387,14 @@ Client::test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL)
 
 int
 Client::test_delete_property (const char *property_name
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       CORBA::String_var property_name_var (property_name);
 
       this->propsetdef_->delete_property (property_name_var.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ex)
@@ -419,7 +419,7 @@ Client::test_delete_property (const char *property_name
 // properties.
 
 int
-Client::test_delete_properties (TAO_ENV_SINGLE_ARG_DECL)
+Client::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosPropertyService::PropertyNames prop_names;
   prop_names.length (3);
@@ -428,7 +428,7 @@ Client::test_delete_properties (TAO_ENV_SINGLE_ARG_DECL)
   prop_names [2] = CORBA::string_dup ("long_property");
   // prop_names [3] = CORBA::string_dup ("no_property");
   this->propsetdef_->delete_properties (prop_names
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 0);
 
   return 0;
@@ -438,7 +438,7 @@ Client::test_delete_properties (TAO_ENV_SINGLE_ARG_DECL)
 // float in the property set.
 
 int
-Client::test_define_properties (TAO_ENV_SINGLE_ARG_DECL)
+Client::test_define_properties (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosPropertyService::Properties nproperties;
   nproperties.length (4);
@@ -476,7 +476,7 @@ Client::test_define_properties (TAO_ENV_SINGLE_ARG_DECL)
   nproperties[3].property_value <<= f;
 
   // Define this sequence of properties now.
-  this->propsetdef_->define_properties (nproperties TAO_ENV_ARG_PARAMETER);
+  this->propsetdef_->define_properties (nproperties ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( -1);
 
   return 0;
@@ -485,11 +485,11 @@ Client::test_define_properties (TAO_ENV_SINGLE_ARG_DECL)
 // Test get_all_properties.
 
 int
-Client::test_get_all_properties (TAO_ENV_SINGLE_ARG_DECL)
+Client::test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get the number of current properties.
   CORBA::ULong num_of_properties =
-    this->propsetdef_->get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->propsetdef_->get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN ( -1);
   ACE_UNUSED_ARG (num_of_properties);
 
@@ -505,7 +505,7 @@ Client::test_get_all_properties (TAO_ENV_SINGLE_ARG_DECL)
   propsetdef_->get_all_properties (how_many,
                                    properties_out,
                                    iterator_out
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( -1);
 
   // Get these values to the _var's.
@@ -562,7 +562,7 @@ Client::test_get_all_properties (TAO_ENV_SINGLE_ARG_DECL)
 
           // Call the funtion.
           CORBA::Boolean next_one_result = iterator->next_one (property_out
-                                                               TAO_ENV_ARG_PARAMETER);
+                                                               ACE_ENV_ARG_PARAMETER);
 
           // Get the value to the _var variable.
           CosPropertyService::Property_var property = property_out.ptr ();
@@ -612,7 +612,7 @@ Client::test_get_all_properties (TAO_ENV_SINGLE_ARG_DECL)
 
               // Call the function for the next iteraton.
               next_one_result = iterator->next_one (property_out
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
 
               // Get the value to the _var variable.
               property = property_out.ptr ();
@@ -626,7 +626,7 @@ Client::test_get_all_properties (TAO_ENV_SINGLE_ARG_DECL)
 // Testing define property with mode.
 // Defines char, short, long and float properties with different modes.
 int
-Client::test_define_property_with_mode (TAO_ENV_SINGLE_ARG_DECL)
+Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Any anyval;
 
@@ -639,7 +639,7 @@ Client::test_define_property_with_mode (TAO_ENV_SINGLE_ARG_DECL)
   this->propsetdef_->define_property_with_mode ("char_property",
                                                 anyval,
                                                 CosPropertyService::normal
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Prepare a Short and "define" that in the PropertySet.
@@ -651,7 +651,7 @@ Client::test_define_property_with_mode (TAO_ENV_SINGLE_ARG_DECL)
   propsetdef_->define_property_with_mode ("short_property",
                                           anyval,
                                           CosPropertyService::read_only
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Prepare a Long and "define" that in the PropertySet.
@@ -663,7 +663,7 @@ Client::test_define_property_with_mode (TAO_ENV_SINGLE_ARG_DECL)
   propsetdef_->define_property_with_mode ("long_property",
                                           anyval,
                                           CosPropertyService::fixed_normal
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( -1);
 
 
@@ -675,7 +675,7 @@ Client::test_define_property_with_mode (TAO_ENV_SINGLE_ARG_DECL)
   propsetdef_->define_property_with_mode ("float_property",
                                           anyval,
                                           CosPropertyService::fixed_readonly
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( -1);
 
   // Prepare a String and "define" that in the PropertySet.
@@ -686,20 +686,20 @@ Client::test_define_property_with_mode (TAO_ENV_SINGLE_ARG_DECL)
 
   propsetdef_->define_property  ("string_property",
                                  anyval
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( -1);
 
   return 0;
 }
 
 int
-Client::test_get_property_value (TAO_ENV_SINGLE_ARG_DECL)
+Client::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       // Get the ior property.
       CORBA::Any_ptr any_ptr = this->propsetdef_->get_property_value ("PropertySetDef_IOR"
-                                                                      TAO_ENV_ARG_PARAMETER);
+                                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check whether the IOR is fine.
@@ -708,7 +708,7 @@ Client::test_get_property_value (TAO_ENV_SINGLE_ARG_DECL)
 
       CosPropertyService::PropertySetDef_var propsetdef =
         CosPropertyService::PropertySetDef::_narrow (propsetdef_object.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (propsetdef.in ()))
@@ -730,7 +730,7 @@ Client::test_get_property_value (TAO_ENV_SINGLE_ARG_DECL)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -738,12 +738,12 @@ main (int argc, char **argv)
 
       if (client.init (argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER) == -1)
+                       ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       ACE_TRY_CHECK;
 
-      //  client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
-      int ret = client.property_tester (TAO_ENV_SINGLE_ARG_PARAMETER);
+      //  client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      int ret = client.property_tester (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret != 0)
         ACE_DEBUG ((LM_DEBUG, "Test failed\n"));
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index 95934187979..0361f0c6795 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -46,52 +46,52 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the ORB etc, and bind the MMDevices.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the client.  This will call StreamCtrl::bind_devs.
 
-  int property_tester (TAO_ENV_SINGLE_ARG_DECL);
+  int property_tester (ACE_ENV_SINGLE_ARG_DECL);
   // Testing  the property service methods.
 
 protected:
   int bind_to_remote_mmdevice (int argc,
                                char *argv[]
-                               TAO_ENV_ARG_DECL);
+                               ACE_ENV_ARG_DECL);
   // Bind to the remote MMDevice.
 
   // = Property Testing.
 
-  int test_define_property (TAO_ENV_SINGLE_ARG_DECL);
+  int test_define_property (ACE_ENV_SINGLE_ARG_DECL);
   // Testing the define property method.
 
-  int test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL);
+  int test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL);
   // Testing the number of properties, currently in the Property Set.
 
-  int test_get_all_property_names (TAO_ENV_SINGLE_ARG_DECL);
+  int test_get_all_property_names (ACE_ENV_SINGLE_ARG_DECL);
   //Testing get_all_property_names.
 
-  int test_get_property_value (TAO_ENV_SINGLE_ARG_DECL);
+  int test_get_property_value (ACE_ENV_SINGLE_ARG_DECL);
   // Testing get_property_value.
 
-  int test_get_properties (TAO_ENV_SINGLE_ARG_DECL);
+  int test_get_properties (ACE_ENV_SINGLE_ARG_DECL);
   //Testing get_properties.  Give the names and get their properties.
 
-  int test_get_all_properties (TAO_ENV_SINGLE_ARG_DECL);
+  int test_get_all_properties (ACE_ENV_SINGLE_ARG_DECL);
   // Testing get_all_properties.
 
   int test_delete_property (const char *property_name
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   // Testing delete_property.
 
-  int test_delete_properties (TAO_ENV_SINGLE_ARG_DECL);
+  int test_delete_properties (ACE_ENV_SINGLE_ARG_DECL);
   // Testing delete_properties.
 
-  int test_define_properties (TAO_ENV_SINGLE_ARG_DECL);
+  int test_define_properties (ACE_ENV_SINGLE_ARG_DECL);
   // Defining a sequence of properties.
 
-  int test_define_property_with_mode (TAO_ENV_SINGLE_ARG_DECL);
+  int test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL);
   // Defines properties with various modes.
 
   TAO_ORB_Manager manager_;
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index d9aa1ef279b..9ab18f5bcdc 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -40,31 +40,31 @@ public:
   ~TAO_PropertySet_Tester (void);
   // Destructor.
 
-  int test_define_property (TAO_ENV_SINGLE_ARG_DECL);
+  int test_define_property (ACE_ENV_SINGLE_ARG_DECL);
   // Defines a char,a short, a long, a float and a string property.
 
-  int test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL);
+  int test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL);
   // Gets the number of properties currently defined in the PropertySet.
 
   int test_delete_property (const char *property_name
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   // Delete a given property.
 
-  int test_is_property_defined (TAO_ENV_SINGLE_ARG_DECL);
+  int test_is_property_defined (ACE_ENV_SINGLE_ARG_DECL);
   // Check the following properties are defined or
   // no. "char_property", "short_property" and a "string_property".
 
-  int test_get_property_value (TAO_ENV_SINGLE_ARG_DECL);
+  int test_get_property_value (ACE_ENV_SINGLE_ARG_DECL);
   // Get the "float_property" and "string_property" and print them
   // out.
 
-  int test_delete_properties (TAO_ENV_SINGLE_ARG_DECL);
+  int test_delete_properties (ACE_ENV_SINGLE_ARG_DECL);
   // Delete char, short,long, and string properties.
 
-  int test_delete_all_properties (TAO_ENV_SINGLE_ARG_DECL);
+  int test_delete_all_properties (ACE_ENV_SINGLE_ARG_DECL);
   // Delete all the properties.
 
-  int test_define_properties (TAO_ENV_SINGLE_ARG_DECL);
+  int test_define_properties (ACE_ENV_SINGLE_ARG_DECL);
   // Define a sequence of properties. a char, a short, a long, a float
   // and a string.
 
@@ -89,14 +89,14 @@ public:
   ~TAO_PropertyNamesIterator_Tester (void);
   // Destructor.
 
-  int test_next_one (TAO_ENV_SINGLE_ARG_DECL);
+  int test_next_one (ACE_ENV_SINGLE_ARG_DECL);
   // Test next one method. Iterate thru all the names in the
   // PropertySet and print them out.
 
-  int test_reset (TAO_ENV_SINGLE_ARG_DECL);
+  int test_reset (ACE_ENV_SINGLE_ARG_DECL);
   // Test the reset method.
 
-  int test_next_n (size_t n TAO_ENV_ARG_DECL);
+  int test_next_n (size_t n ACE_ENV_ARG_DECL);
   // Test the next_n method.
 private:
   TAO_PropertyNamesIterator iterator_;
@@ -116,7 +116,7 @@ TAO_PropertySet_Tester::~TAO_PropertySet_Tester (void)
 
 // Defines a char, a short, a long, a float and a string.
 int
-TAO_PropertySet_Tester::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_property\n"));
@@ -133,7 +133,7 @@ TAO_PropertySet_Tester::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
               ch));
   property_set_.define_property ("char_property",
                                  anyval
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   // Prepare a Short and "define" that in the PropertySet.
@@ -146,7 +146,7 @@ TAO_PropertySet_Tester::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
               s));
   property_set_.define_property ("short_property",
                                  anyval
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
 
@@ -162,7 +162,7 @@ TAO_PropertySet_Tester::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
 
   property_set_.define_property ("long_property",
                                  anyval
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   // Prepare a Float and "define" that in the PropertySet.
@@ -175,7 +175,7 @@ TAO_PropertySet_Tester::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
               f));
   property_set_.define_property ("float_property",
                                  anyval
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   // Prepare a String and "define" that in the PropertySet.
@@ -191,7 +191,7 @@ TAO_PropertySet_Tester::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
               newstr));
   property_set_.define_property ("string_property",
                                  anyval
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   return 0;
@@ -199,11 +199,11 @@ TAO_PropertySet_Tester::test_define_property (TAO_ENV_SINGLE_ARG_DECL)
 
 // Testing, get_number_of_properties.
 int
-TAO_PropertySet_Tester::test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_get_number_of_properties (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Main : Number of props : %d\n",
-              property_set_.get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER)));
+              property_set_.get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER)));
   ACE_CHECK_RETURN ( 1);
 
   return 0;
@@ -213,11 +213,11 @@ TAO_PropertySet_Tester::test_get_number_of_properties (TAO_ENV_SINGLE_ARG_DECL)
 // if that exsists.
 int
 TAO_PropertySet_Tester::test_delete_property (const char *property_name
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "\nChecking delete_property\n"));
   property_set_.delete_property (property_name
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   return 0;
@@ -226,13 +226,13 @@ TAO_PropertySet_Tester::test_delete_property (const char *property_name
 // Gets the value of "short_property" and "string_property".
 
 int
-TAO_PropertySet_Tester::test_get_property_value (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking get_property_value\n"));
 
   CORBA::Any_ptr anyptr = property_set_.get_property_value ("short_property"
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   // Get the short value.
@@ -249,7 +249,7 @@ TAO_PropertySet_Tester::test_get_property_value (TAO_ENV_SINGLE_ARG_DECL)
                 "Short property not found\n"));
   // Get the string.
   anyptr = property_set_.get_property_value ("string_property"
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
   if (anyptr != 0)
     {
@@ -268,12 +268,12 @@ TAO_PropertySet_Tester::test_get_property_value (TAO_ENV_SINGLE_ARG_DECL)
 // "string_property" and "char_property".
 
 int
-TAO_PropertySet_Tester::test_is_property_defined (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_is_property_defined (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking is_property_defined ()\n"));
   if (property_set_.is_property_defined ("short_property"
-                                         TAO_ENV_ARG_PARAMETER) == 0)
+                                         ACE_ENV_ARG_PARAMETER) == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "short_property not defined\n"));
   else
@@ -281,7 +281,7 @@ TAO_PropertySet_Tester::test_is_property_defined (TAO_ENV_SINGLE_ARG_DECL)
                 "short_property defined\n"));
   ACE_CHECK_RETURN ( 1);
   if (property_set_.is_property_defined ("string_property"
-                                         TAO_ENV_ARG_PARAMETER) == 0)
+                                         ACE_ENV_ARG_PARAMETER) == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "string_property not defined\n"));
   else
@@ -289,7 +289,7 @@ TAO_PropertySet_Tester::test_is_property_defined (TAO_ENV_SINGLE_ARG_DECL)
                 "string_property defined\n"));
   ACE_CHECK_RETURN ( 1);
   if (property_set_.is_property_defined ("char_property"
-                                         TAO_ENV_ARG_PARAMETER) == 0)
+                                         ACE_ENV_ARG_PARAMETER) == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "char_property not defined\n"));
   else
@@ -304,7 +304,7 @@ TAO_PropertySet_Tester::test_is_property_defined (TAO_ENV_SINGLE_ARG_DECL)
 // PropertySet.  Deleting char, short, long, float and string
 // properties.
 int
-TAO_PropertySet_Tester::test_delete_properties (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_delete_properties (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking delete_properties == Deleting a sequence of Properties\n"));
@@ -319,7 +319,7 @@ TAO_PropertySet_Tester::test_delete_properties (TAO_ENV_SINGLE_ARG_DECL)
               prop_names.length (),
               prop_names.maximum ()));
   property_set_.delete_properties (prop_names
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 0);
 
   return 0;
@@ -328,7 +328,7 @@ TAO_PropertySet_Tester::test_delete_properties (TAO_ENV_SINGLE_ARG_DECL)
 // Defines a sequnce of properties containing, char, short, long,
 // float and string property in the property set.
 int
-TAO_PropertySet_Tester::test_define_properties (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_define_properties (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_properties == Defining sequence of properties\n"));
@@ -376,7 +376,7 @@ TAO_PropertySet_Tester::test_define_properties (TAO_ENV_SINGLE_ARG_DECL)
   nproperties[4].property_value <<= strvar.in ();
 
   // Define this sequence of properties now.
-  property_set_.define_properties (nproperties TAO_ENV_ARG_PARAMETER);
+  property_set_.define_properties (nproperties ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
 
   return 0;
@@ -384,12 +384,12 @@ TAO_PropertySet_Tester::test_define_properties (TAO_ENV_SINGLE_ARG_DECL)
 
 // Delete all the properties.
 int
-TAO_PropertySet_Tester::test_delete_all_properties (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertySet_Tester::test_delete_all_properties (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Deleting all the properties
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking delete_all_properties\n"));
-  int ret = property_set_.delete_all_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int ret = property_set_.delete_all_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (ret == 1)
     ACE_DEBUG ((LM_DEBUG,
@@ -414,18 +414,18 @@ TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester (void)
 // Test next one method. Iterate thru all the names in the
 // PropertySet and print them out.
 int
-TAO_PropertyNamesIterator_Tester::test_next_one (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertyNamesIterator_Tester::test_next_one (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::String_var strvar;
   ACE_DEBUG ((LM_DEBUG,
               "\nTesting next_one of NamesIterator, Iterating thru names.\n"));
   // Let us iterate, now.
-  int ret = iterator_.next_one (strvar.out () TAO_ENV_ARG_PARAMETER);
+  int ret = iterator_.next_one (strvar.out () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
   while (ret != 0)
     {
       ACE_DEBUG ((LM_DEBUG, "Str : %s\n", strvar.in ()));
-      ret = iterator_.next_one (strvar.out () TAO_ENV_ARG_PARAMETER);
+      ret = iterator_.next_one (strvar.out () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (1);
     }
   return 0;
@@ -433,11 +433,11 @@ TAO_PropertyNamesIterator_Tester::test_next_one (TAO_ENV_SINGLE_ARG_DECL)
 
 // Reset the names iterator.
 int
-TAO_PropertyNamesIterator_Tester::test_reset (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PropertyNamesIterator_Tester::test_reset (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Resetting (reset ()) the NamesIterator."));
-  iterator_.reset (TAO_ENV_SINGLE_ARG_PARAMETER);
+  iterator_.reset (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN ( 1);
   return 0;
 }
@@ -445,13 +445,13 @@ TAO_PropertyNamesIterator_Tester::test_reset (TAO_ENV_SINGLE_ARG_DECL)
 // Test the next_n method. Get the next n names and print them all.
 int
 TAO_PropertyNamesIterator_Tester::test_next_n (size_t n
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
 {
   CosPropertyService::PropertyNames_var pnames_var;
   ACE_DEBUG ((LM_DEBUG,
               "Checking next_n (), next %d\n",
               n));
-  int ret = iterator_.next_n (n, pnames_var.out () TAO_ENV_ARG_PARAMETER);
+  int ret = iterator_.next_n (n, pnames_var.out () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
   if (ret == 0)
     {
@@ -475,7 +475,7 @@ main (int argc, char *argv [])
       CORBA::ORB_var orb_var = CORBA::ORB_init (argc,
                                                 argv,
                                                 "internet"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // = Checking PropertySet interface.
@@ -486,57 +486,57 @@ main (int argc, char *argv [])
 
       // Checking define_property. define a char, a short,a long, a float
       // and a string.
-      propertyset_tester.test_define_property (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propertyset_tester.test_define_property (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test delete property. Delete "string_property"
-      propertyset_tester.test_delete_property ("string_property" TAO_ENV_ARG_PARAMETER);
+      propertyset_tester.test_delete_property ("string_property" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test delete_properties. Delete char, short, long and float.
-      propertyset_tester.test_delete_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propertyset_tester.test_delete_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Define a sequence of properties. char, short, long, float and
       // string.
-      propertyset_tester.test_define_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propertyset_tester.test_define_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Checking get_property_value. get the value of short and string.
-      propertyset_tester.test_get_property_value (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propertyset_tester.test_get_property_value (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Checking delete_all_properties.
-      propertyset_tester.test_delete_all_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propertyset_tester.test_delete_all_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Define a sequence of properties. char, short, long, float and
       // string.
-      propertyset_tester.test_define_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propertyset_tester.test_define_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (TAO_ENV_SINGLE_ARG_PARAMETER);
+      propertyset_tester.test_get_number_of_properties (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // = Checking the PropertyNamesIterator interface.
@@ -548,37 +548,37 @@ main (int argc, char *argv [])
       TAO_PropertyNamesIterator_Tester names_iterator_tester (propertyset_tester);
 
       // Checking next_one. Iterate thru the property names.
-      names_iterator_tester.test_next_one (TAO_ENV_SINGLE_ARG_PARAMETER);
+      names_iterator_tester.test_next_one (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Checking the reset () method.
-      names_iterator_tester.test_reset (TAO_ENV_SINGLE_ARG_PARAMETER);
+      names_iterator_tester.test_reset (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Iterating again thru the property names.
-      names_iterator_tester.test_next_one (TAO_ENV_SINGLE_ARG_PARAMETER);
+      names_iterator_tester.test_next_one (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Reset again.
-      names_iterator_tester.test_reset (TAO_ENV_SINGLE_ARG_PARAMETER);
+      names_iterator_tester.test_reset (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Checking next_n. Prints out all the names it has got.
-      names_iterator_tester.test_next_n (6 TAO_ENV_ARG_PARAMETER);
+      names_iterator_tester.test_next_n (6 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try next_n without resetting.
-      names_iterator_tester.test_next_n (6 TAO_ENV_ARG_PARAMETER);
+      names_iterator_tester.test_next_n (6 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
-      TAO_ENV_ARG_PARAMETER.print_exception ("System Exception");
+      ACE_ENV_ARG_PARAMETER.print_exception ("System Exception");
       return -1;
     }
   ACE_CATCH (CORBA::UserException, userex)
     {
-      TAO_ENV_ARG_PARAMETER.print_exception ("User Exception");
+      ACE_ENV_ARG_PARAMETER.print_exception ("User Exception");
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp
index 12eac84b999..bcaeae71a5f 100644
--- a/TAO/orbsvcs/tests/Property/server.cpp
+++ b/TAO/orbsvcs/tests/Property/server.cpp
@@ -25,7 +25,7 @@ ACE_RCSID(CosPropertyService, server, "$Id$")
 int
 main (int argc, char ** argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -35,7 +35,7 @@ main (int argc, char ** argv)
       m.init_child_poa (argc,
                         argv,
                         "child_poa"
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Using naming server.
@@ -49,7 +49,7 @@ main (int argc, char ** argv)
                       TAO_PropertySetDef,
                       -1);
       CosPropertyService::PropertySetDef_var propsetdef =
-        propsetdef_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        propsetdef_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name propsetdef_name (1);
@@ -57,28 +57,28 @@ main (int argc, char ** argv)
       propsetdef_name[0].id = CORBA::string_dup ("PropertySetDef");
       my_name_client->bind (propsetdef_name,
                             propsetdef.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Any any_val;
 
       // Make this IOR as one of the properties in there.
-      any_val <<= propsetdef_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      any_val <<= propsetdef_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Object_var ior = propsetdef_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Object_var ior = propsetdef_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Object_ptr ior_ptr = ior.in ();
       any_val <<= ior_ptr;
       // any_val.replace (CORBA::_tc_Object,
       //                  &ior_ptr,
       //                  1
-      //                  TAO_ENV_ARG_PARAMETER);
+      //                  ACE_ENV_ARG_PARAMETER);
       // ACE_TRY_CHECK;
 
       propsetdef_impl->define_property_with_mode ("PropertySetDef_IOR",
                                                   any_val,
                                                   CosPropertyService::fixed_readonly
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create PropertySet factory and then register.
@@ -87,7 +87,7 @@ main (int argc, char ** argv)
                       TAO_PropertySetFactory,
                       -1);
       CosPropertyService::PropertySetFactory_var propset_factory =
-        propset_factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        propset_factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name propset_factory_name (1);
@@ -95,11 +95,11 @@ main (int argc, char ** argv)
       propset_factory_name[0].id = CORBA::string_dup ("PropertySetFactory");
       my_name_client->bind (propset_factory_name,
                             propset_factory.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the ORB Event loop.
-      m.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      m.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index 43040ab75ed..5bdb77c54a9 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -322,11 +322,11 @@ main (int argc, char *argv[])
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil(poa_object.in ()))
@@ -335,14 +335,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in() TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in() 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize the naming services
@@ -369,7 +369,7 @@ main (int argc, char *argv[])
           // create the RT_Info
           config_infos[i].handle =
             ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // initialize the RT_Info
@@ -384,7 +384,7 @@ main (int argc, char *argv[])
                  config_infos[i].quantum,
                  config_infos[i].threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t, config_infos[i].info_type)
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // make operations in second half dependant on
@@ -397,7 +397,7 @@ main (int argc, char *argv[])
                                 config_infos[i - (operation_count / 2)].handle,
                                 2,                             // number of calls
                                 RtecBase::ONE_WAY_CALL    // type of dependency
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -426,7 +426,7 @@ main (int argc, char *argv[])
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          infos_out, configs_out, anomalies_out
-         TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
+         ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #else  /* ! __SUNPRO_CC */
       ACE_Scheduler_Factory::server ()->compute_scheduling
         (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
@@ -434,7 +434,7 @@ main (int argc, char *argv[])
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          infos.out (), configs.out (), anomalies.out ()
-         TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
+         ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #endif /* ! __SUNPRO_CC */
 
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index 844b4d3bfa4..690890674b2 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -194,11 +194,11 @@ main (int argc, char *argv[])
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil(poa_object.in ()))
@@ -207,11 +207,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in() TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in() 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;
 
       // Initialize the naming services
@@ -238,7 +238,7 @@ main (int argc, char *argv[])
           // create the RT_Info
           config_infos[i].handle =
             ACE_Scheduler_Factory::server ()->create (config_infos[i].entry_point
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // initialize the RT_Info
@@ -256,7 +256,7 @@ main (int argc, char *argv[])
                  config_infos[i].threads,
                  ACE_static_cast (RtecScheduler::Info_Type_t,
                                   config_infos[i].info_type)
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -267,7 +267,7 @@ main (int argc, char *argv[])
                         config_infos[0].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // register dependency of consumer that will have unresolved remote
@@ -277,7 +277,7 @@ main (int argc, char *argv[])
                         config_infos[2].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -288,7 +288,7 @@ main (int argc, char *argv[])
                         config_infos[4].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -299,7 +299,7 @@ main (int argc, char *argv[])
                         config_infos[0].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::server ()->
@@ -307,7 +307,7 @@ main (int argc, char *argv[])
                         config_infos[2].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::server ()->
@@ -315,7 +315,7 @@ main (int argc, char *argv[])
                         config_infos[4].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Register dependencies on each of the other consumers by second
@@ -326,7 +326,7 @@ main (int argc, char *argv[])
                         config_infos[1].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::server ()->
@@ -334,7 +334,7 @@ main (int argc, char *argv[])
                         config_infos[3].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::server ()->
@@ -342,7 +342,7 @@ main (int argc, char *argv[])
                         config_infos[5].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Scheduler_Factory::server ()->
@@ -350,7 +350,7 @@ main (int argc, char *argv[])
                         config_infos[6].handle,
                         1,                            // number of calls
                         RtecBase::ONE_WAY_CALL  // type of dependency
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RtecScheduler::RT_Info_Set_var infos;
@@ -376,14 +376,14 @@ main (int argc, char *argv[])
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos_out, configs_out, anomalies_out TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
+         infos_out, configs_out, anomalies_out ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #else  /* ! __SUNPRO_CC */
       ACE_Scheduler_Factory::server ()->compute_scheduling
         (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
          ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                          ACE_SCOPE_THREAD),
-         infos.out (), configs.out (), anomalies.out () TAO_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
+         infos.out (), configs.out (), anomalies.out () ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check
 #endif /* ! __SUNPRO_CC */
 
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index 90e248ce9fd..0c36545e9d6 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -24,11 +24,11 @@ main (int argc, char *argv[])
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil(poa_object.in ()))
@@ -37,14 +37,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in() TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in() 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Store a pointer to the local run-time scheduler.
@@ -64,18 +64,18 @@ main (int argc, char *argv[])
           // run-time scheduler's create and lookup methods.
           ACE_ASSERT (infos [i].handle ==
                       runtime_scheduler->create (infos [i].entry_point
-                                                 TAO_ENV_ARG_PARAMETER));
+                                                 ACE_ENV_ARG_PARAMETER));
           ACE_TRY_CHECK;
 
           ACE_ASSERT (infos [i].handle ==
                       runtime_scheduler->lookup (infos [i].entry_point
-                                                 TAO_ENV_ARG_PARAMETER));
+                                                 ACE_ENV_ARG_PARAMETER));
           ACE_TRY_CHECK;
 
           // Make sure the values in the RT_Info returned by get are OK.
           delete rt_info;
           rt_info = runtime_scheduler->get (infos [i].handle
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_ASSERT (rt_info != 0);
@@ -123,7 +123,7 @@ main (int argc, char *argv[])
                                   infos [i].threads,
                                   ACE_static_cast (RtecScheduler::Info_Type_t,
                                                    infos [i].info_type)
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Make sure the correct priority values are returned.
@@ -131,7 +131,7 @@ main (int argc, char *argv[])
                                        priority,
                                        subpriority,
                                        p_priority
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_ASSERT (priority == infos [i].priority);
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
                                                    priority,
                                                    subpriority,
                                                    p_priority
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_ASSERT (priority == infos [i].priority);
@@ -159,7 +159,7 @@ main (int argc, char *argv[])
             dispatch_configuration (configs [j].preemption_priority,
                                     priority,
                                     dispatching_type
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_ASSERT (priority == configs [j].thread_priority);
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
index 8428a57369a..b3910364baf 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.cpp
@@ -20,7 +20,7 @@ TX_Object_i::~TX_Object_i (void)
 
 void
 TX_Object_i::send (const DataSeq & data
-                   TAO_ENV_ARG_DECL_NOT_USED)
+                   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->data_ = data;
@@ -32,7 +32,7 @@ TX_Object_i::send (const DataSeq & data
 
 void
 TX_Object_i::recv (DataSeq_out data
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (data,
@@ -48,8 +48,8 @@ TX_Object_i::recv (DataSeq_out data
 }
 
 void
-TX_Object_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TX_Object_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);
 }
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
index df9720482f0..53bc2e447c9 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
+++ b/TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h
@@ -34,14 +34,14 @@ public:
   virtual ~TX_Object_i (void);
 
   virtual void send (const DataSeq & data
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void recv (DataSeq_out data
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
index 42ca277fc98..68ed8968ee6 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
@@ -41,14 +41,14 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      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;
 
       if (::parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (obj.in ()))
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
                           -1);
 
       TX_Object_var txObject =
-        TX_Object::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        TX_Object::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DataSeq data_input;
@@ -74,19 +74,19 @@ main (int argc, char *argv[])
                   "Sending  octet sequence of length:\t%u\n",
                   data_input.length()));
 
-      txObject->send (data_input TAO_ENV_ARG_PARAMETER);
+      txObject->send (data_input ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DataSeq_var data_output;
 
-      txObject->recv (data_output.out () TAO_ENV_ARG_PARAMETER);
+      txObject->recv (data_output.out () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Received octet sequence of length:\t%u\n",
                   data_output->length()));
 
-      txObject->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      txObject->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Sanity check
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
index 191d6c0da9e..ef3d1329fe3 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -46,22 +46,22 @@ main (int argc, char * argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      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;
 
       CORBA::Object_var poaObj =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var rootPoa =
-        PortableServer::POA::_narrow (poaObj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poaObj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        rootPoa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        rootPoa->the_POAManager (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;
 
       if (::parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char * argv[])
 
       TX_Object_i implObject (orb.in ());
 
-      TX_Object_var txObject = implObject._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      TX_Object_var txObject = implObject._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (txObject.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (txObject.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -91,17 +91,17 @@ main (int argc, char * argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "\n"
                   "Event loop finished.\n"));
 
-      rootPoa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      rootPoa->destroy (1, 1 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/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index 353f3d5e4a0..682a8e857fb 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -20,7 +20,7 @@ main (int argc, char *argv[])
       //
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -28,19 +28,19 @@ main (int argc, char *argv[])
       //
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () 
-                                      TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in ()
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
       // Get a reference to the server.
       //
       obj = orb->string_to_object ("file://server.ior"
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (obj.in ()))
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
       //
       server_var server_obj =
         server::_narrow (obj.in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server_obj.in ()))
@@ -75,47 +75,47 @@ main (int argc, char *argv[])
                       -1);
       PortableServer::ServantBase_var theClient = servant;
 
-      client_var client_ref = servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      client_var client_ref = servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
       // Activate the POA manager.
       //
       PortableServer::POAManager_var mgr =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
       // Set the server's callback and invoke the test request.
       //
       server_obj->set_client (client_ref.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server_obj->test_request ("first secure callback to client"
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
       // Repeat the callback test.
       //
-      server_obj->set_client (client_ref.in () TAO_ENV_ARG_PARAMETER);
+      server_obj->set_client (client_ref.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       server_obj->test_request ("second secure callback to client"
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server_obj->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server_obj->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       poa->destroy (1, 1
-                    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/orbsvcs/tests/Security/Callback/client_i.cpp b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
index b6193edd141..ff5ecb97cb4 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp
@@ -16,7 +16,7 @@ client_i::~client_i (void)
 
 void
 client_i::test_reply (const char *msg
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG((LM_INFO,
diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h
index 8e7dc9d4174..117617125e0 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/client_i.h
@@ -32,7 +32,7 @@ public:
   virtual ~client_i (void);
 
   virtual void test_reply (const char *msg
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index 6ddee8ead2a..0f746242f0a 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -19,7 +19,7 @@ main (int argc, char *argv[])
       //
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -27,12 +27,12 @@ main (int argc, char *argv[])
       //
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -47,15 +47,15 @@ main (int argc, char *argv[])
 
       PortableServer::ObjectId_var oid =
         poa->activate_object (theServer.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Object_var server_obj =
         poa->id_to_reference (oid.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::String_var server_IORString =
         orb->object_to_string (server_obj.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //
@@ -68,22 +68,22 @@ main (int argc, char *argv[])
       // Activate the POA manager.
       //
       PortableServer::POAManager_var mgr =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_INFO,
                   ACE_TEXT ("(%P) calling orb->run () ...\n")));
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       poa->destroy (1, 1
-                    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/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
index aa4b158d466..dbf2ffe849e 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
@@ -18,7 +18,7 @@ server_i::~server_i (void)
 
 void
 server_i::set_client (client_ptr c
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->client_ = client::_duplicate (c);
@@ -26,15 +26,15 @@ server_i::set_client (client_ptr c
 
 void
 server_i::test_request (const char *msg
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->client_->test_reply (msg TAO_ENV_ARG_PARAMETER);
+  this->client_->test_reply (msg ACE_ENV_ARG_PARAMETER);
 }
 
 void
-server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+server_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);
 }
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h
index 97dbdcf84e1..628782bedd3 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.h
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.h
@@ -32,14 +32,14 @@ public:
   virtual ~server_i (void);
 
   virtual void set_client (client_ptr c
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void test_request (const char *msg
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
index b4ea8515927..19a858e1241 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp
@@ -11,7 +11,7 @@ Client_Worker::Client_Worker (Simple_Server_ptr server,
 }
 
 void
-Client_Worker::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
+Client_Worker::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -21,7 +21,7 @@ Client_Worker::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
    {
       ACE_TRY
         {
-          this->server_->test_method (j TAO_ENV_ARG_PARAMETER);
+          this->server_->test_method (j ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if(TAO_debug_level > 0)
             ACE_DEBUG (( LM_DEBUG,
@@ -37,17 +37,17 @@ Client_Worker::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 int
 Client_Worker::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Validate connections befire doing any actual work..
-      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
        ACE_TRY_CHECK;
 
        for (int i = 0; i < this->niterations_; ++i)
          {
-           this->server_->test_method (i TAO_ENV_ARG_PARAMETER);
+           this->server_->test_method (i ACE_ENV_ARG_PARAMETER);
            ACE_TRY_CHECK;
 
            if (TAO_debug_level > 0)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
index 3324b086ffc..b0c462455ec 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
@@ -45,7 +45,7 @@ public:
   // thread entry point
 
 private:
-  void validate_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Validate the connection
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
index e0e9030be77..cad95255acd 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
@@ -12,7 +12,7 @@ Server_Worker::svc (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index 919696c7716..5da628db89d 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -53,12 +53,12 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the 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;
 
       if (parse_args (argc, argv) != 0)
@@ -66,12 +66,12 @@ main (int argc, char *argv[])
 
       // Get Object Reference using IOR file
       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;
 
       // Cast to Appropriate Type
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -97,12 +97,12 @@ main (int argc, char *argv[])
       // Shut down the server if -x option given in command line
       if (do_shutdown)
         {
-          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Destroying the ORB..
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index b5149ff965f..29c53ecb7b8 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -41,16 +41,16 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -60,11 +60,11 @@ main (int argc, char *argv[])
 
       // Get a Root POA reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -73,11 +73,11 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -95,7 +95,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Worker worker (orb.in ());
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index cd3bc2abbc3..062d4555b9f 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -10,7 +10,7 @@
 ACE_RCSID(MT_Server, test_i, "$Id$")
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -21,8 +21,8 @@ Simple_Server_i::test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_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);
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
index 60fdc9a457b..65fa40ed8b2 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Long x 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:
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
index 715d498538c..3004c93b38f 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp
@@ -16,7 +16,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb,
 }
 
 void
-Foo_i::baz (TAO_ENV_SINGLE_ARG_DECL)
+Foo_i::baz (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Foo::Bar::NoSecurityAttributes))
 {
@@ -37,7 +37,7 @@ Foo_i::baz (TAO_ENV_SINGLE_ARG_DECL)
   // Get the desired security attributes
   Security::AttributeList_var attribute_list =
     this->current_->get_attributes (attribute_type_list
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // If the SecurityLevel1::Current::get_attributes() call above
@@ -109,8 +109,8 @@ Foo_i::baz (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Foo_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Foo_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);
 }
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
index 7af168555f1..b2742274afe 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
@@ -27,11 +27,11 @@ public:
          SecurityLevel2::Current_ptr current);
 
   /// Test method.
-  virtual void baz (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void baz (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Foo::Bar::NoSecurityAttributes));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index 468ad3bce42..ea861c51cd2 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -14,7 +14,7 @@ const char *ior = "file://test.ior";
 void
 insecure_invocation_test (CORBA::ORB_ptr orb,
                           CORBA::Object_ptr obj
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   // Disable protection for this insecure invocation test.
 
@@ -27,7 +27,7 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
   CORBA::Policy_var policy =
     orb->create_policy (Security::SecQOPPolicy,
                         no_protection
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::PolicyList policy_list (1);
@@ -39,11 +39,11 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
   CORBA::Object_var object =
     obj->_set_policy_overrides (policy_list,
                                 CORBA::SET_OVERRIDE
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   Foo::Bar_var server =
-    Foo::Bar::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+    Foo::Bar::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (server.in ()))
@@ -60,7 +60,7 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
     {
       // This invocation should result in a CORBA::NO_PERMISSION
       // exception.
-      server->baz (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->baz (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::NO_PERMISSION, exc)
@@ -83,10 +83,10 @@ insecure_invocation_test (CORBA::ORB_ptr orb,
 
 void
 secure_invocation_test (CORBA::Object_ptr object
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   Foo::Bar_var server =
-    Foo::Bar::_narrow (object TAO_ENV_ARG_PARAMETER);
+    Foo::Bar::_narrow (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (server.in ()))
@@ -100,10 +100,10 @@ secure_invocation_test (CORBA::Object_ptr object
     }
 
   // This invocation should return successfully.
-  server->baz (TAO_ENV_SINGLE_ARG_PARAMETER);
+  server->baz (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -138,14 +138,14 @@ 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->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This test sets creates a Security::QOPPolicy with the
@@ -154,17 +154,17 @@ main (int argc, char *argv[])
       // then result in a CORBA::NO_PERMISSION exception.
       //
       // The server is not shutdown by this test.
-      insecure_invocation_test (orb.in (), object.in () TAO_ENV_ARG_PARAMETER);
+      insecure_invocation_test (orb.in (), object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This test uses the default secure SSLIOP settings to securely
       // invoke a method on the server.  No exception should occur.
       //
       // The server *is* shutdown by this test.
-      secure_invocation_test (object.in () TAO_ENV_ARG_PARAMETER);
+      secure_invocation_test (object.in () 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/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index 45304dcd39d..7f0d60a97ff 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -40,11 +40,11 @@ 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;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (obj.in ()))
@@ -54,23 +54,23 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () 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;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       obj = orb->resolve_initial_references ("SecurityCurrent"
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       SecurityLevel2::Current_var security_current =
         SecurityLevel2::Current::_narrow (obj.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (security_current.in ()))
@@ -82,11 +82,11 @@ main (int argc, char *argv[])
       Foo_i server_impl (orb.in (), security_current.in ());
 
       Foo::Bar_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -104,20 +104,20 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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,
                   "\n"
                   "Event loop finished.\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp
index fd43bfedff5..acc3937b3af 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.cpp
@@ -14,7 +14,7 @@ SLevel1_Server_i::SLevel1_Server_i (CORBA::ORB_ptr orb,
 }
 
 CORBA::Boolean
-SLevel1_Server_i::authorize_level1 (TAO_ENV_SINGLE_ARG_DECL)
+SLevel1_Server_i::authorize_level1 (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -43,7 +43,7 @@ SLevel1_Server_i::authorize_level1 (TAO_ENV_SINGLE_ARG_DECL)
   /// value/s of the attribute type/s that we want.
   Security::AttributeList_var attribute_list =
     this->ss_current_->get_attributes (attribute_type_list
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   /// Just a preliminary check to see if we received something or
@@ -217,8 +217,8 @@ SLevel1_Server_i::create_check_cert ()
 }
 
 void
-SLevel1_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+SLevel1_Server_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);
 }
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
index 765d81005c0..51f15de9d38 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
@@ -27,10 +27,10 @@ class SLevel1_Server_i : public POA_SLevel1_Server
                     SecurityLevel1::Current_ptr ss_current);
 
   /// Simple method invoked to test if the client reached server etc.
-  CORBA::Boolean authorize_level1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Boolean authorize_level1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   X509 *create_check_cert ();
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
index f631708d4fc..2c30c19fb17 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
@@ -39,18 +39,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->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       SLevel1_Server_var server =
-        SLevel1_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        SLevel1_Server::_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 [])
         }
 
       CORBA::Boolean authorized =
-        server->authorize_level1 (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server->authorize_level1 (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (authorized == 0)
@@ -72,10 +72,10 @@ main (int argc, char *argv [])
         ACE_DEBUG ((LM_DEBUG,
                     "DENIED: You Do NOT have enough privileges\n"));
 
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (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/orbsvcs/tests/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp
index 724b5139f91..d31444a36ee 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/server.cpp
@@ -42,12 +42,12 @@ main (int argc, char *argv[])
     {
       /// Our regular ORB Initialization.
       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;
 
       /// Get a reference to the 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;
 
       if (CORBA::is_nil (object.in ()))
@@ -57,11 +57,11 @@ main (int argc, char *argv[])
 
       /// Narrow down the reference to the currect interface.
       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;
 
       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;
 
       if (parse_args (argc, argv) != 0)
@@ -69,13 +69,13 @@ main (int argc, char *argv[])
 
       // Resolve reference to SecurityCurrent Object.
       object = orb->resolve_initial_references ("SecurityCurrent"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow it down to get the correct reference.
       SecurityLevel1::Current_var ss_current =
         SecurityLevel1::Current::_narrow (object.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ss_current.in ()))
@@ -87,12 +87,12 @@ main (int argc, char *argv[])
       SLevel1_Server_i level1_server (orb.in (), ss_current.in ());
 
       SLevel1_Server_var server =
-        level1_server._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        level1_server._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -108,17 +108,17 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Start the ORB
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 233ea44feb0..1279dee82b7 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -42,11 +42,11 @@ public:
 
   // = Interface implementation accessor methods.
 
-  void id (CORBA::Short id TAO_ENV_ARG_DECL)
+  void id (CORBA::Short id ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Sets id.
 
-  CORBA::Short id (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::Short id (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Gets id.
 
@@ -64,14 +64,14 @@ My_Test_Object::~My_Test_Object (void)
 }
 
 CORBA::Short
-My_Test_Object::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+My_Test_Object::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return id_;
 }
 
 void
-My_Test_Object::id (CORBA::Short id TAO_ENV_ARG_DECL_NOT_USED)
+My_Test_Object::id (CORBA::Short id ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   id_ = id;
@@ -206,16 +206,16 @@ CosNaming_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize ORB.
       this->orbmgr_.init (this->argc_,
                           this->argv_
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->orbmgr_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orbmgr_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -250,16 +250,16 @@ MT_Test::svc (void)
 
   CosNaming::NamingContext_var name_service;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY_EX (SETUP)
     {
       CORBA::Object_var name_service_obj =
-        orb_->string_to_object (name_service_ior_ TAO_ENV_ARG_PARAMETER);
+        orb_->string_to_object (name_service_ior_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (SETUP);
 
       name_service =
         CosNaming::NamingContext::_narrow (name_service_obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (SETUP);
     }
   ACE_CATCHANY
@@ -278,7 +278,7 @@ MT_Test::svc (void)
     {
       name_service->bind (test_name_,
                           test_ref_.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (BIND);
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK in thread %t\n"));
@@ -306,17 +306,17 @@ MT_Test::svc (void)
     {
       CORBA::Object_var result_obj_ref =
         name_service->resolve (test_name_
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (RESOLVE);
 
       Test_Object_var result_object =
         Test_Object::_narrow (result_obj_ref.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (RESOLVE);
 
       if (!CORBA::is_nil (result_object.in ()))
         {
-          CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RESOLVE);
 
           if (id == CosNaming_Client::OBJ1_ID)
@@ -341,7 +341,7 @@ MT_Test::svc (void)
   ACE_TRY_EX (UNBIND)
     {
       name_service->unbind (test_name_
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (UNBIND);
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK in thread %t\n"));
@@ -374,14 +374,14 @@ MT_Test::execute (TAO_Naming_Client &root_context)
   My_Test_Object *test_obj_impl =
     new My_Test_Object (CosNaming_Client::OBJ1_ID);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       test_ref_ =
-        test_obj_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test_obj_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the IOR for the Naming Service.  Each thread can use it
@@ -395,7 +395,7 @@ MT_Test::execute (TAO_Naming_Client &root_context)
 
       name_service_ior_ =
         orb_->object_to_string (context.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -425,17 +425,17 @@ MT_Test::execute (TAO_Naming_Client &root_context)
 int
 Simple_Test::execute (TAO_Naming_Client &root_context)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Dummy object instantiation.
       My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID);
       Test_Object_var test_obj_ref =
-        test_obj_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        test_obj_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Give ownership of this object to POA.
-      test_obj_impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test_obj_impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind an object to the Naming Context.
@@ -444,7 +444,7 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
       test_name[0].id = CORBA::string_dup ("Foo");
       root_context->bind (test_name,
                           test_obj_ref.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK\n"));
@@ -452,15 +452,15 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
       // Resolve the object from the Naming Context.
       CORBA::Object_var result_obj_ref =
         root_context->resolve (test_name
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       Test_Object_var result_object =
         Test_Object::_narrow (result_obj_ref.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (!CORBA::is_nil (result_object.in ()))
         {
-          CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (id == CosNaming_Client::OBJ1_ID)
             ACE_DEBUG ((LM_DEBUG, "Resolved name OK\n"));
@@ -468,7 +468,7 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
 
       // Unbind the object from the Naming Context.
       root_context->unbind (test_name
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK\n"));
@@ -487,7 +487,7 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
 int
 Tree_Test::execute (TAO_Naming_Client &root_context)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Create a tree of contexts: root->level1->level2.  Bind object
@@ -499,27 +499,27 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       level1[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
       level1_context = root_context->bind_new_context (level1
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a new context.
       CosNaming::NamingContext_var level2_context;
-      level2_context = root_context->new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
+      level2_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate a dummy object and bind it under the new context.
       My_Test_Object *impl1 =
         new My_Test_Object (CosNaming_Client::OBJ1_ID);
-      Test_Object_var obj1 = impl1->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Test_Object_var obj1 = impl1->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      impl1->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      impl1->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name obj_name;
       obj_name.length (1);
       obj_name[0].id = CORBA::string_dup ("foo");
       level2_context->bind (obj_name, obj1.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind the context we just created under level1.
@@ -528,7 +528,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       level2[1].id = CORBA::string_dup ("level2_context");
       root_context->bind_context (level2,
                                   level2_context.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Resolve and unbind level1/level2/foo, and bind it back.
@@ -537,11 +537,11 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       test_name[2].id = obj_name[0].id;
       CORBA::Object_var result_obj_ref =
         root_context->resolve (test_name
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       Test_Object_var result_object =
         Test_Object::_narrow (result_obj_ref.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (result_object.in ()))
@@ -549,7 +549,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
                            "Problems with resolving foo in Tree Test - nil object ref.\n"),
                           -1);
 
-      CORBA::Short id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Short id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (id != CosNaming_Client::OBJ1_ID)
@@ -560,36 +560,36 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       // Unbind the object from the Naming Context and bind it back
       // in.
       root_context->unbind (test_name
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       root_context->bind (test_name,
                           obj1.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create new context and rebind under the name level1/level2.
       CosNaming::NamingContext_var new_level2_context;
       new_level2_context =
-        root_context->new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       root_context->rebind_context (level2,
                                   new_level2_context.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind, resolve, rebind, and resolve foo under level1/level2.
       root_context->bind (test_name,
                           obj1.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       result_obj_ref = root_context->resolve (test_name
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Short obj_id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Short obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (result_object.in ())
@@ -600,24 +600,24 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 
       My_Test_Object *impl2 =
         new My_Test_Object (CosNaming_Client::OBJ2_ID);
-      Test_Object_var obj2 = impl2->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Test_Object_var obj2 = impl2->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      impl2->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      impl2->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       root_context->rebind (test_name,
                             obj2.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       result_obj_ref = root_context->resolve (test_name
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       result_object = Test_Object::_narrow (result_obj_ref.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      obj_id = result_object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+      obj_id = result_object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (result_object.in ())
@@ -644,7 +644,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 int
 Exceptions_Test::execute (TAO_Naming_Client &root_context)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Set things up.
@@ -655,19 +655,19 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
       context_name[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
       level1_context = root_context->bind_new_context (context_name
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       context_name[0].id = CORBA::string_dup ("level2_context");
       CosNaming::NamingContext_var level2_context;
       level2_context = level1_context->bind_new_context (context_name
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind a dummy object foo under each context.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name object_name;
@@ -675,35 +675,35 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
       object_name[0].id = CORBA::string_dup ("foo");
       root_context->bind (object_name,
                           obj.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       level1_context->bind (object_name,
                             obj.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       level2_context->bind (object_name,
                             obj.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run exceptions tests.
       invalid_name_test (root_context
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       already_bound_test (root_context
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       already_bound_test2 (root_context
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       not_found_test (root_context
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       not_found_test2 (root_context
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       not_found_test3 (root_context
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -719,7 +719,7 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
 
 void
 Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -727,7 +727,7 @@ Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context
       test_name.length (0);
 
       root_context->resolve (test_name
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
     }
@@ -747,7 +747,7 @@ Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context
 
 void
 Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -755,14 +755,14 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
       test_name.length (1);
       test_name[0].id = CORBA::string_dup ("foo");
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       root_context->bind (test_name,
                           obj.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
     }
@@ -783,7 +783,7 @@ Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context
 
 void
 Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -792,14 +792,14 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
       test_name[0].id = CORBA::string_dup ("level1_context");
       test_name[1].id = CORBA::string_dup ("foo");
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       root_context->bind (test_name,
                           obj.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
     }
@@ -819,7 +819,7 @@ Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context
 
 void
 Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -830,7 +830,7 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
       test_name[2].id = CORBA::string_dup ("bar");
 
       root_context->unbind (test_name
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
     }
@@ -858,7 +858,7 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context
 
 void
 Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -869,7 +869,7 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
       test_name[2].id = CORBA::string_dup ("foo");
 
       root_context->unbind (test_name
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
     }
@@ -900,7 +900,7 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context
 
 void
 Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -910,7 +910,7 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
       test_name[1].id = CORBA::string_dup ("foo");
       test_name[2].id = CORBA::string_dup ("foo");
 
-      root_context->unbind (test_name TAO_ENV_ARG_PARAMETER);
+      root_context->unbind (test_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed - no exception was thrown\n"));
     }
@@ -941,14 +941,14 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context
 int
 Iterator_Test::execute (TAO_Naming_Client &root_context)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Instantiate four dummy objects.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind objects to the naming context.
@@ -966,19 +966,19 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       name4[0].id = CORBA::string_dup ("foo4");
       root_context->bind (name1,
                           obj.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       root_context->bind (name2,
                           obj.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       root_context->bind (name3,
                           obj.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       root_context->bind (name4,
                           obj.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // List the content of the Naming Context.
@@ -987,7 +987,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       root_context->list (1,
                           bindings_list.out (),
                           iter.out ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (iter.in ())
           || bindings_list->length () != 1
@@ -1002,7 +1002,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       // Invoke operations on the iterator.
       CosNaming::Binding_var binding;
       iter->next_one (binding.out ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (binding->binding_type != CosNaming::nobject)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -1012,7 +1012,7 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
                   "Second binding: %s\n",
                   binding->binding_name[0].id.in ()));
 
-      iter->next_n (2, bindings_list.out () TAO_ENV_ARG_PARAMETER);
+      iter->next_n (2, bindings_list.out () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (bindings_list->length () != 2
           || bindings_list[0u].binding_type != CosNaming::nobject
@@ -1029,13 +1029,13 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       // We already iterated over all the bindings, so the following
       // should return false.
       CORBA::Boolean result = iter->next_one (binding.out ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (result)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::BindingIterator does not function properly\n"),
                           -1);
-      iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1052,20 +1052,20 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
 int
 Destroy_Test::execute (TAO_Naming_Client &root_context)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Create a context and bind an object under it.
 
       CosNaming::NamingContext_var my_context;
-      my_context = root_context->new_context (TAO_ENV_SINGLE_ARG_PARAMETER);
+      my_context = root_context->new_context (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind a dummy object foo under my_context.
       My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Test_Object_var obj = impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      impl->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      impl->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::Name object_name;
@@ -1073,21 +1073,21 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
       object_name[0].id = CORBA::string_dup ("foo");
       my_context->bind (object_name,
                             obj.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Do the testing.
       not_empty_test (my_context
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      my_context->unbind (object_name TAO_ENV_ARG_PARAMETER);
+      my_context->unbind (object_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      my_context->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      my_context->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       not_exist_test (my_context
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
@@ -1104,11 +1104,11 @@ Destroy_Test::execute (TAO_Naming_Client &root_context)
 
 void
 Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      ref->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
@@ -1123,11 +1123,11 @@ Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref
 
 void
 Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      ref->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ref->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
@@ -1154,7 +1154,7 @@ Persistent_Test_Begin::~Persistent_Test_Begin (void)
 int
 Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Create a name structure we will reuse.
@@ -1165,19 +1165,19 @@ Persistent_Test_Begin::execute (TAO_Naming_Client &root_context)
       // Create and bind a naming context under the <root> context.
       CosNaming::NamingContext_var level1_context =
         root_context->bind_new_context (test_name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create and bind a naming context under <level1> context.
       test_name[0].id = CORBA::string_dup ("level2");
       CosNaming::NamingContext_var level2_context =
         level1_context->bind_new_context (test_name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Log the ior of <level1_context> for use by <Persistent_Test_End>.
       CORBA::String_var ior =
-        orb_->object_to_string (level1_context.in () TAO_ENV_ARG_PARAMETER);
+        orb_->object_to_string (level1_context.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::fprintf (this->file_,
@@ -1213,7 +1213,7 @@ Persistent_Test_End::~Persistent_Test_End (void)
 int
 Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Create a name structure we will reuse.
@@ -1224,11 +1224,11 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
       // Convert stringified ior we got from <Persistent_Test_Begin>
       // for <level1> Naming Context to Naming Context reference.
       CORBA::Object_var obj =
-        orb_->string_to_object (ior_ TAO_ENV_ARG_PARAMETER);
+        orb_->string_to_object (ior_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var level1_context =
-        CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (level1_context.in ()))
@@ -1238,7 +1238,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 
       //  Resolve for <level2> context through the persistent ior we
       // got from part 1 of this test.
-      obj = level1_context->resolve (test_name TAO_ENV_ARG_PARAMETER);
+      obj = level1_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now, resolve for <level2> context using the <root> context
@@ -1247,7 +1247,7 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
       test_name[0].id = CORBA::string_dup ("level1");
       test_name[1].id = CORBA::string_dup ("level2");
       CORBA::Object_var obj2 =
-        root_context->resolve (test_name TAO_ENV_ARG_PARAMETER);
+        root_context->resolve (test_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Make sure we got the same answer through both methods.
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index e94a1f5f295..83738d0ec6c 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -172,17 +172,17 @@ private:
   // limitation of only 1 TAO_TRY being allowed per function.
 
   void invalid_name_test (TAO_Naming_Client &root_context
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   void already_bound_test (TAO_Naming_Client &root_context
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
   void already_bound_test2 (TAO_Naming_Client &root_context
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   void not_found_test (TAO_Naming_Client &root_context
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   void not_found_test2 (TAO_Naming_Client &root_context
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   void not_found_test3 (TAO_Naming_Client &root_context
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 };
 
 class Destroy_Test : public Naming_Test
@@ -206,9 +206,9 @@ public:
 private:
   // = The following functions isolate specific tests.
   void not_empty_test (CosNaming::NamingContext_var &ref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   void not_exist_test (CosNaming::NamingContext_var &ref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
 };
 
 class Persistent_Test_Begin : public Naming_Test
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 3036479c109..46bc4dd1d3e 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -30,11 +30,11 @@ Client_i::test_for_secure_universal_time (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing secure_time()\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CosTime::UTO_var UTO_server =
-           this->clerk_->secure_universal_time (TAO_ENV_SINGLE_ARG_PARAMETER);
+           this->clerk_->secure_universal_time (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
@@ -55,11 +55,11 @@ Client_i::test_for_universal_time (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing universal_time()\n"));
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CosTime::UTO_var UTO_server =
-        this->clerk_->universal_time (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->clerk_->universal_time (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -108,21 +108,21 @@ Client_i::test_for_new_universal_time (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing new_universal_time()\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CosTime::UTO_var UTO_server = this->clerk_->new_universal_time (time,
                                                                       inaccuracy,
                                                                       tdf
-                                                                      TAO_ENV_ARG_PARAMETER);
+                                                                      ACE_ENV_ARG_PARAMETER);
 
-      ACE_ASSERT (UTO_server->time (TAO_ENV_SINGLE_ARG_PARAMETER) == 999999999);
-      ACE_ASSERT (UTO_server->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER) == 9999);
-      ACE_ASSERT (UTO_server->tdf (TAO_ENV_SINGLE_ARG_PARAMETER) == 99);
-      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
-      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacchi == 0);
-      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacclo == 9999);
-      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
+      ACE_ASSERT (UTO_server->time (ACE_ENV_SINGLE_ARG_PARAMETER) == 999999999);
+      ACE_ASSERT (UTO_server->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER) == 9999);
+      ACE_ASSERT (UTO_server->tdf (ACE_ENV_SINGLE_ARG_PARAMETER) == 99);
+      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
+      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacchi == 0);
+      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacclo == 9999);
+      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
 
       ACE_TRY_CHECK;
     }
@@ -148,23 +148,23 @@ Client_i::test_for_uto_from_utc (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing uto_from_utc ()\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct
-                                                                TAO_ENV_ARG_PARAMETER);
+                                                                ACE_ENV_ARG_PARAMETER);
 
       TimeBase::InaccuracyT inaccuracy = utc_struct.inacchi;
       inaccuracy <<= 32;
       inaccuracy |= utc_struct.inacclo;
 
-      ACE_ASSERT (UTO_server->time (TAO_ENV_SINGLE_ARG_PARAMETER) == 999999999);
-      ACE_ASSERT (UTO_server->inaccuracy (TAO_ENV_SINGLE_ARG_PARAMETER) == inaccuracy);
-      ACE_ASSERT (UTO_server->tdf (TAO_ENV_SINGLE_ARG_PARAMETER) == 99);
-      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
-      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacclo == 50);
-      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).inacchi == 50);
-      ACE_ASSERT ((UTO_server->utc_time (TAO_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
+      ACE_ASSERT (UTO_server->time (ACE_ENV_SINGLE_ARG_PARAMETER) == 999999999);
+      ACE_ASSERT (UTO_server->inaccuracy (ACE_ENV_SINGLE_ARG_PARAMETER) == inaccuracy);
+      ACE_ASSERT (UTO_server->tdf (ACE_ENV_SINGLE_ARG_PARAMETER) == 99);
+      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).time == 999999999);
+      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacclo == 50);
+      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).inacchi == 50);
+      ACE_ASSERT ((UTO_server->utc_time (ACE_ENV_SINGLE_ARG_PARAMETER)).tdf == 99);
 
       ACE_TRY_CHECK;
     }
@@ -186,15 +186,15 @@ Client_i::test_for_new_interval (void)
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Testing new_interval ()\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CosTime::TIO_var TIO_server = this->clerk_->new_interval (lower,
                                                                 upper
-                                                                TAO_ENV_ARG_PARAMETER);
+                                                                ACE_ENV_ARG_PARAMETER);
 
-      ACE_ASSERT ((TIO_server->time_interval (TAO_ENV_SINGLE_ARG_PARAMETER)).lower_bound == 666666666);
-      ACE_ASSERT ((TIO_server->time_interval (TAO_ENV_SINGLE_ARG_PARAMETER)).upper_bound == 999999999);
+      ACE_ASSERT ((TIO_server->time_interval (ACE_ENV_SINGLE_ARG_PARAMETER)).lower_bound == 666666666);
+      ACE_ASSERT ((TIO_server->time_interval (ACE_ENV_SINGLE_ARG_PARAMETER)).upper_bound == 999999999);
 
       ACE_TRY_CHECK;
     }
@@ -324,7 +324,7 @@ Client_i::~Client_i (void)
 int
 Client_i::obtain_initial_references (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -356,11 +356,11 @@ Client_i::obtain_initial_references (void)
 
       CORBA::Object_var temp_object =
         my_name_client_->resolve (clerk_name
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       clerk_ = CosTime::TimeService::_narrow (temp_object.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (clerk_.in ()))
@@ -388,7 +388,7 @@ Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -396,7 +396,7 @@ Client_i::init (int argc, char **argv)
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     0
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -410,7 +410,7 @@ Client_i::init (int argc, char **argv)
 
           CORBA::Object_var server_object =
           this->orb_->string_to_object (this->ior_
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (server_object.in ()))
@@ -420,7 +420,7 @@ Client_i::init (int argc, char **argv)
                               -1);
           this->clerk_ =
             CosTime::TimeService::_narrow (server_object.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 
           ACE_DEBUG ((LM_DEBUG,
                       "[CLIENT] Process/Thread Id : (%P/%t) Using the IOR provided\n"));
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 6ac66fc4f7a..e4fa0e39cba 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -8,17 +8,17 @@ ACE_RCSID(Trading, Offer_Exporter, "$Id$")
 TAO_Offer_Exporter::
 TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
                     CORBA::Boolean verbose
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
     : verbose_ (verbose)
 {
   // Initialize the offer sequences and structures.
-  this->create_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->create_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   // Obtain the necessary trading service interfaces.
-  this->register_ = lookup_if->register_if (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->register_ = lookup_if->register_if (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  this->admin_ = lookup_if->admin_if (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->admin_ = lookup_if->admin_if (ACE_ENV_SINGLE_ARG_PARAMETER);
   // ACE_CHECK;
 }
 
@@ -33,7 +33,7 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
 }
 
 void
-TAO_Offer_Exporter::export_offers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::export_offers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
@@ -54,13 +54,13 @@ TAO_Offer_Exporter::export_offers (TAO_ENV_SINGLE_ARG_DECL)
       this->props_fs_[i][4].value <<= "Default";
     }
 
-  this->export_to (this->register_.in () TAO_ENV_ARG_PARAMETER);
+  this->export_to (this->register_.in () ACE_ENV_ARG_PARAMETER);
   // ACE_CHECK;
 }
 
 void
 TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Register::InvalidObjectRef,
                    CosTrading::IllegalServiceType,
@@ -76,14 +76,14 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
     {
       for (int i = 0; i < NUM_OFFERS; i++)
         {
-          CORBA::Object_ptr offer_obj= this->plotter_[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::Object_ptr offer_obj= this->plotter_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CosTrading::OfferId_var offer_id =
             reg->_cxx_export (offer_obj,
                               TT_Info::INTERFACE_NAMES[1],
                               this->props_plotters_[i]
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (this->verbose_)
@@ -91,13 +91,13 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
               ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
             }
 
-          offer_obj = this->printer_[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          offer_obj = this->printer_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           offer_id = reg->_cxx_export (offer_obj,
                                        TT_Info::INTERFACE_NAMES[2],
                                        this->props_printers_[i]
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (this->verbose_)
@@ -105,13 +105,13 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
               ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
             }
 
-          offer_obj = this->fs_[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          offer_obj = this->fs_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           offer_id = reg->_cxx_export (offer_obj,
                                        TT_Info::INTERFACE_NAMES[3],
                                        this->props_fs_[i]
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK
 
           if (this->verbose_)
@@ -130,7 +130,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
 }
 
 void
-TAO_Offer_Exporter::export_offers_to_all (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::Register::InvalidObjectRef,
                    CosTrading::IllegalServiceType,
@@ -149,7 +149,7 @@ TAO_Offer_Exporter::export_offers_to_all (TAO_ENV_SINGLE_ARG_DECL)
       ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
     }
 
-  CosTrading::Link_var link_if = this->register_->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CosTrading::Link_var link_if = this->register_->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose_)
@@ -158,7 +158,7 @@ TAO_Offer_Exporter::export_offers_to_all (TAO_ENV_SINGLE_ARG_DECL)
                   " linked to the root trader.\n"));
     }
 
-  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose_)
@@ -178,7 +178,7 @@ TAO_Offer_Exporter::export_offers_to_all (TAO_ENV_SINGLE_ARG_DECL)
             }
 
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i] TAO_ENV_ARG_PARAMETER);
+            link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           for (int j = 0; j < NUM_OFFERS; j++)
@@ -194,7 +194,7 @@ TAO_Offer_Exporter::export_offers_to_all (TAO_ENV_SINGLE_ARG_DECL)
                           ACE_static_cast (const char*, link_name_seq[i])));
             }
 
-          this->export_to (link_info->target_reg.in () TAO_ENV_ARG_PARAMETER);
+          this->export_to (link_info->target_reg.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -207,7 +207,7 @@ TAO_Offer_Exporter::export_offers_to_all (TAO_ENV_SINGLE_ARG_DECL)
 
 
 void
-TAO_Offer_Exporter::withdraw_offers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -219,7 +219,7 @@ TAO_Offer_Exporter::withdraw_offers (TAO_ENV_SINGLE_ARG_DECL)
     {
       CORBA::ULong length;
 
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (offer_id_seq.ptr () != 0)
@@ -227,7 +227,7 @@ TAO_Offer_Exporter::withdraw_offers (TAO_ENV_SINGLE_ARG_DECL)
           length = offer_id_seq->length ();
           for (CORBA::ULong i = 0; i < length; i++)
             {
-              this->register_->withdraw (offer_id_seq[i] TAO_ENV_ARG_PARAMETER);
+              this->register_->withdraw (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -241,7 +241,7 @@ TAO_Offer_Exporter::withdraw_offers (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Offer_Exporter::describe_offers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -252,7 +252,7 @@ TAO_Offer_Exporter::describe_offers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_TRY
     {
       CORBA::ULong length;
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (offer_id_seq.ptr () != 0)
@@ -265,14 +265,14 @@ TAO_Offer_Exporter::describe_offers (TAO_ENV_SINGLE_ARG_DECL)
           for (CORBA::ULong i = 0; i < length; i++)
             {
               CosTrading::Register::OfferInfo_var offer_info =
-                this->register_->describe (offer_id_seq[i] TAO_ENV_ARG_PARAMETER);
+                this->register_->describe (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (this->verbose_)
                 {
                   ACE_DEBUG ((LM_DEBUG, "Offer Id: %s\n", (const char *) offer_id_seq[i]));
                   ACE_DEBUG ((LM_DEBUG, "Service Type: %s\n", offer_info->type.in ()));
-                  TT_Info::dump_properties (offer_info->properties, 0 TAO_ENV_ARG_PARAMETER);
+                  TT_Info::dump_properties (offer_info->properties, 0 ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                   ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
                 }
@@ -288,7 +288,7 @@ TAO_Offer_Exporter::describe_offers (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Offer_Exporter::modify_offers (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented,
                    CosTrading::IllegalOfferId,
@@ -306,7 +306,7 @@ TAO_Offer_Exporter::modify_offers (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CosTrading::OfferIdSeq_var offer_id_seq = this->grab_offerids (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (offer_id_seq.ptr () != 0)
@@ -328,7 +328,7 @@ TAO_Offer_Exporter::modify_offers (TAO_ENV_SINGLE_ARG_DECL)
               this->register_->modify (offer_id_seq[i],
                                        del_list,
                                        modify_list
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -343,7 +343,7 @@ TAO_Offer_Exporter::modify_offers (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_Offer_Exporter::
-withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_DECL)
+withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -363,19 +363,19 @@ withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_DECL)
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER],
                                    constraint
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PRINTER],
                                    constraint
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->register_->
         withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM],
                                    constraint
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -388,7 +388,7 @@ withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CosTrading::OfferIdSeq*
-TAO_Offer_Exporter::grab_offerids (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Exporter::grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented))
 {
@@ -404,7 +404,7 @@ TAO_Offer_Exporter::grab_offerids (TAO_ENV_SINGLE_ARG_DECL)
       this->admin_->list_offers (NUM_OFFERS,
                                  CosTrading::OfferIdSeq_out (offer_id_seq),
                                  CosTrading::OfferIdIterator_out (offer_id_iter)
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if ((! CORBA::is_nil (offer_id_iter)) && offer_id_seq != 0)
@@ -418,7 +418,7 @@ TAO_Offer_Exporter::grab_offerids (TAO_ENV_SINGLE_ARG_DECL)
               any_left =
                 offer_id_iter->next_n (length,
                                        CosTrading::OfferIdSeq_out (id_seq)
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               int offers = id_seq->length ();
@@ -432,7 +432,7 @@ TAO_Offer_Exporter::grab_offerids (TAO_ENV_SINGLE_ARG_DECL)
             }
           while (any_left);
 
-          offer_id_iter->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          offer_id_iter->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -457,7 +457,7 @@ TAO_Offer_Exporter::grab_offerids (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Offer_Exporter::create_offers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Offer_Exporter::create_offers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   const int QUEUE_SIZE = 4;
 
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
index 95e5b719f3d..5e09f087fba 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h
@@ -25,12 +25,12 @@ public:
 
   TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if,
                       CORBA::Boolean verbose
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   ~TAO_Offer_Exporter (void);
 
-  void export_offers (TAO_ENV_SINGLE_ARG_DECL)
+  void export_offers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
@@ -43,7 +43,7 @@ public:
                      CosTrading::DuplicatePropertyName));
   // Export a number of offers to the Trading Service.
 
-  void export_offers_to_all (TAO_ENV_SINGLE_ARG_DECL)
+  void export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
@@ -57,21 +57,21 @@ public:
   // Export a number of offers to all traders accessible by the
   // bootstrapped trader.
 
-  void withdraw_offers (TAO_ENV_SINGLE_ARG_DECL)
+  void withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
                      CosTrading::Register::ProxyOfferId));
   // Withdraw all exported offers.
 
-  void describe_offers (TAO_ENV_SINGLE_ARG_DECL)
+  void describe_offers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalOfferId,
                      CosTrading::UnknownOfferId,
                      CosTrading::Register::ProxyOfferId));
   // Describe all the offers registered with the bootstrapped trader.
 
-  void modify_offers (TAO_ENV_SINGLE_ARG_DECL)
+  void modify_offers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented,
                      CosTrading::IllegalOfferId,
@@ -86,7 +86,7 @@ public:
                      CosTrading::DuplicatePropertyName));
   // Remove some properties and change some properties in each offer.
 
-  void withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_DECL)
+  void withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -96,15 +96,15 @@ public:
 
 private:
 
-  CosTrading::OfferIdSeq* grab_offerids (TAO_ENV_SINGLE_ARG_DECL)
+  CosTrading::OfferIdSeq* grab_offerids (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::NotImplemented));
 
-  void create_offers (TAO_ENV_SINGLE_ARG_DECL);
+  void create_offers (ACE_ENV_SINGLE_ARG_DECL);
   // Fill in each of the offer structures.
 
   void export_to (CosTrading::Register_ptr reg
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::Register::InvalidObjectRef,
                      CosTrading::IllegalServiceType,
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 440f470bda9..8e367d0f0d8 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -12,7 +12,7 @@ TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
 }
 
 void
-TAO_Offer_Importer::perform_queries (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Importer::perform_queries (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -34,12 +34,12 @@ TAO_Offer_Importer::perform_queries (TAO_ENV_SINGLE_ARG_DECL)
   policies.return_card (16*NUM_OFFERS);
   policies.link_follow_rule (CosTrading::always);
 
-  this->perform_queries_with_policies (policies TAO_ENV_ARG_PARAMETER);
+  this->perform_queries_with_policies (policies ACE_ENV_ARG_PARAMETER);
   // ACE_CHECK;
 }
 
 void
-TAO_Offer_Importer::perform_directed_queries (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -63,7 +63,7 @@ TAO_Offer_Importer::perform_directed_queries (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->verbose_)
     ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
-  CosTrading::Link_var link_if = this->lookup_->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CosTrading::Link_var link_if = this->lookup_->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->verbose_)
@@ -71,7 +71,7 @@ TAO_Offer_Importer::perform_directed_queries (TAO_ENV_SINGLE_ARG_DECL)
       ACE_DEBUG ((LM_DEBUG, "Obtaining references to traders directly"
                   " linked to the root trader.\n"));
     }
-  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (link_name_seq->length () > 0)
@@ -83,14 +83,14 @@ TAO_Offer_Importer::perform_directed_queries (TAO_ENV_SINGLE_ARG_DECL)
         }
 
       CosTrading::Link::LinkInfo_var link_info =
-        link_if->describe_link (link_name_seq[0u] TAO_ENV_ARG_PARAMETER);
+        link_if->describe_link (link_name_seq[0u] ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosTrading::Lookup_ptr lookup_if = link_info->target.in ();
-      CosTrading::Link_var link_if2 = lookup_if->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CosTrading::Link_var link_if2 = lookup_if->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (link_name_seq2->length () > 0)
@@ -117,7 +117,7 @@ TAO_Offer_Importer::perform_directed_queries (TAO_ENV_SINGLE_ARG_DECL)
               policies.starting_trader (new CosTrading::TraderName
                                         (2, 2, trader_name, 1));
 
-              this->perform_queries_with_policies (policies TAO_ENV_ARG_PARAMETER);
+              this->perform_queries_with_policies (policies ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -138,7 +138,7 @@ TAO_Offer_Importer::perform_directed_queries (TAO_ENV_SINGLE_ARG_DECL)
 void
 TAO_Offer_Importer::
 perform_queries_with_policies (const TAO_Policy_Creator& policies
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -190,7 +190,7 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies
                                 offer_seq_out,
                                 offer_iterator_out,
                                 limits_applied_out
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CosTrading::OfferSeq_var offer_seq (offer_seq_ptr);
@@ -202,7 +202,7 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies
               ACE_DEBUG ((LM_DEBUG, "*** Results:\n\n"));
               this->display_results (*offer_seq_ptr,
                                      offer_iterator_ptr
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (limits_applied_out->length () > 0)
@@ -228,7 +228,7 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies
 void
 TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
                                      CosTrading::OfferIterator_ptr offer_iterator
-                                     TAO_ENV_ARG_DECL) const
+                                     ACE_ENV_ARG_DECL) const
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -242,13 +242,13 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
           // Call back to the exported object.
           TAO_Trader_Test::Remote_Output_var remote_output =
             TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          remote_output->confirm (TAO_ENV_SINGLE_ARG_PARAMETER);
+          remote_output->confirm (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          TT_Info::dump_properties (offer_seq[i].properties, 1 TAO_ENV_ARG_PARAMETER);
+          TT_Info::dump_properties (offer_seq[i].properties, 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
         }
@@ -267,7 +267,7 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
 
               any_left = offer_iterator->next_n (length,
                                                  iter_offers_out
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CosTrading::OfferSeq_var iter_offers (iter_offers_ptr);
@@ -276,14 +276,14 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
                   // Call back to the exported object.
                   TAO_Trader_Test::Remote_Output_var remote_output =
                     TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
-                  remote_output->confirm (TAO_ENV_SINGLE_ARG_PARAMETER);
+                  remote_output->confirm (ACE_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   CosTrading::PropertySeq& props = iter_offers[i].properties;
-                  TT_Info::dump_properties (props, 1 TAO_ENV_ARG_PARAMETER);
+                  TT_Info::dump_properties (props, 1 ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
@@ -291,7 +291,7 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq,
 
             } while (any_left);
 
-          offer_iterator->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          offer_iterator->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index 3f47723c4e6..5d58a4b58dd 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -32,7 +32,7 @@ public:
   TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if,
                       CORBA::Boolean verbose = 1);
 
-  void perform_queries (TAO_ENV_SINGLE_ARG_DECL)
+  void perform_queries (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -46,7 +46,7 @@ public:
                      CosTrading::DuplicatePolicyName));
   // Barrage the bootstrapped-to trader with queries.
 
-  void perform_directed_queries (TAO_ENV_SINGLE_ARG_DECL)
+  void perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -64,7 +64,7 @@ public:
 private:
 
   void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -81,7 +81,7 @@ private:
 
   void display_results (const CosTrading::OfferSeq& offer_seq,
                         CosTrading::OfferIterator_ptr offer_iterator
-                        TAO_ENV_ARG_DECL) const
+                        ACE_ENV_ARG_DECL) const
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Display the results of the query to the screen.
 
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index dedb5b91f77..2a60d2a9798 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -7,18 +7,18 @@ ACE_RCSID(Trading, Service_Type_Exporter, "$Id$")
 TAO_Service_Type_Exporter::
 TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
                            CORBA::Boolean verbose
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   : verbose_ (verbose),
     lookup_ (lookup_if)
 {
   // Obtain the Service Type Repository.
-  CosTrading::TypeRepository_var obj = lookup_if->type_repos (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CosTrading::TypeRepository_var obj = lookup_if->type_repos (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Narrow the Service Type Repository.
   this->repos_ = CosTradingRepos::ServiceTypeRepository::_narrow (obj.in ()
-                                                                  TAO_ENV_ARG_PARAMETER);
+                                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Build the service type descriptions.
@@ -26,7 +26,7 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
 }
 
 void
-TAO_Service_Type_Exporter::remove_all_types (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::remove_all_types (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType,
@@ -39,7 +39,7 @@ TAO_Service_Type_Exporter::remove_all_types (TAO_ENV_SINGLE_ARG_DECL)
     {
       ACE_TRY
         {
-          this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i] TAO_ENV_ARG_PARAMETER);
+          this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i] ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosTrading::UnknownServiceType, excp)
@@ -62,7 +62,7 @@ TAO_Service_Type_Exporter::remove_all_types (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Service_Type_Exporter::add_all_types (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::add_all_types (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -76,12 +76,12 @@ TAO_Service_Type_Exporter::add_all_types (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
               "adding all types to the Repository.\n"));
-  this->add_all_types_to (this->repos_.ptr () TAO_ENV_ARG_PARAMETER);
+  this->add_all_types_to (this->repos_.ptr () ACE_ENV_ARG_PARAMETER);
   // ACE_CHECK;
 }
 
 void
-TAO_Service_Type_Exporter::add_all_types_to_all (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -96,12 +96,12 @@ TAO_Service_Type_Exporter::add_all_types_to_all (TAO_ENV_SINGLE_ARG_DECL)
               "add all types to all repositories.\n"));
 
   ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n"));
-  CosTrading::Link_var link_if = this->lookup_->link_if (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CosTrading::Link_var link_if = this->lookup_->link_if (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "Obtaining references to traders directly"
               " linked to the root trader.\n"));
-  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "Exporting service types with each of the linked"
@@ -114,19 +114,19 @@ TAO_Service_Type_Exporter::add_all_types_to_all (TAO_ENV_SINGLE_ARG_DECL)
           ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
                       ACE_static_cast (const char*, link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (link_name_seq[i] TAO_ENV_ARG_PARAMETER);
+            link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n",
                       ACE_static_cast (const char*, link_name_seq[i])));
 
           CosTrading::TypeRepository_var remote_repos =
-            link_info->target->type_repos (TAO_ENV_SINGLE_ARG_PARAMETER);
+            link_info->target->type_repos (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           str =
             CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in ()
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
@@ -138,7 +138,7 @@ TAO_Service_Type_Exporter::add_all_types_to_all (TAO_ENV_SINGLE_ARG_DECL)
       ACE_CHECK;
 
       // @@ Seth, But this one?
-      this->add_all_types_to (str TAO_ENV_ARG_PARAMETER);
+      this->add_all_types_to (str ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -146,7 +146,7 @@ TAO_Service_Type_Exporter::add_all_types_to_all (TAO_ENV_SINGLE_ARG_DECL)
 void
 TAO_Service_Type_Exporter::
 add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -165,7 +165,7 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
                            this->type_structs_[i].if_name,
                            this->type_structs_[i].props,
                            this->type_structs_[i].super_types
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosTradingRepos::ServiceTypeRepository::ServiceTypeExists, ste)
@@ -203,7 +203,7 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
 }
 
 void
-TAO_Service_Type_Exporter::list_all_types (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::list_all_types (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -214,7 +214,7 @@ TAO_Service_Type_Exporter::list_all_types (TAO_ENV_SINGLE_ARG_DECL)
 
       sst.all_ (1);
       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq_var type_names =
-        this->repos_->list_types (sst TAO_ENV_ARG_PARAMETER);
+        this->repos_->list_types (sst ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ULong l = type_names->length ();
@@ -240,7 +240,7 @@ TAO_Service_Type_Exporter::list_all_types (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Service_Type_Exporter::describe_all_types (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
@@ -254,7 +254,7 @@ TAO_Service_Type_Exporter::describe_all_types (TAO_ENV_SINGLE_ARG_DECL)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
             this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i]
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (this->verbose_)
@@ -274,7 +274,7 @@ TAO_Service_Type_Exporter::describe_all_types (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Service_Type_Exporter::fully_describe_all_types (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Service_Type_Exporter::fully_describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType))
@@ -288,7 +288,7 @@ TAO_Service_Type_Exporter::fully_describe_all_types (TAO_ENV_SINGLE_ARG_DECL)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
             this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i]
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (this->verbose_)
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
index 3ddbee392b9..073bbf8aaec 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h
@@ -24,17 +24,17 @@ public:
 
   TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
                              CORBA::Boolean verbose
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void remove_all_types (TAO_ENV_SINGLE_ARG_DECL)
+  void remove_all_types (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
                      CosTradingRepos::ServiceTypeRepository::HasSubTypes));
   // Remove all service types from the trading service instance.
 
-  void add_all_types (TAO_ENV_SINGLE_ARG_DECL)
+  void add_all_types (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -46,7 +46,7 @@ public:
                      CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
   // Add all the generated service types to the trading service instance.
 
-  void add_all_types_to_all (TAO_ENV_SINGLE_ARG_DECL)
+  void add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
@@ -59,19 +59,19 @@ public:
   // Add all the generated service types to all the trading service
   // instances linked to the trading service we bootstrapped to.
 
-  void list_all_types (TAO_ENV_SINGLE_ARG_DECL)
+  void list_all_types (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // List all the service types registered with the trading service
   // instance.
 
-  void describe_all_types (TAO_ENV_SINGLE_ARG_DECL)
+  void describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
                    CosTrading::UnknownServiceType));
   // Describe all the service types registered with the trading
   // service instance.
 
-  void fully_describe_all_types (TAO_ENV_SINGLE_ARG_DECL)
+  void fully_describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -85,7 +85,7 @@ private:
   // Generate the service type description structures.
 
   void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index 67a7e894c17..c28feb6e4f3 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -17,7 +17,7 @@ template <class T> CORBA::Any*
 TAO_Simple_Dynamic_Property<T>::evalDP (const char*,
                                         CORBA::TypeCode_ptr,
                                         const CORBA::Any&
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   CORBA::Any* return_value = 0;
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index 2b646a75c56..28cf7b442dd 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -35,7 +35,7 @@ public:
   virtual CORBA::Any* evalDP (const char* /* name */,
                               CORBA::TypeCode_ptr /* returned_type */,
                               const CORBA::Any& /* extra_info */
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
 
 private:
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index 8a4f464d1f4..66b252093c2 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -140,7 +140,7 @@ const char* TT_Info::QUERIES[][3] =
 void
 TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
                           CORBA::Boolean print_dynamic
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   TAO_Property_Evaluator prop_eval (prop_seq);
 
@@ -157,7 +157,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
 
           if (print_dynamic || ! is_dynamic)
             {
-              value = prop_eval.property_value(k TAO_ENV_ARG_PARAMETER);
+              value = prop_eval.property_value(k ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               tc = value->type ();
@@ -177,7 +177,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
 
       if (tc == 0)
         continue;
-      int check = tc->equal (TAO_Trader_Test::_tc_StringSeq TAO_ENV_ARG_PARAMETER);
+      int check = tc->equal (TAO_Trader_Test::_tc_StringSeq ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (check)
@@ -192,7 +192,7 @@ TT_Info::dump_properties (const CosTrading::PropertySeq& prop_seq,
         }
       else
         {
-          check = tc->equal (TAO_Trader_Test::_tc_ULongSeq TAO_ENV_ARG_PARAMETER);
+          check = tc->equal (TAO_Trader_Test::_tc_ULongSeq ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           if (check)
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index 9ad80c25ab7..70fff2a5646 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -16,7 +16,7 @@ public:
 
   static void dump_properties (const CosTrading::PropertySeq& prop_seq,
                                CORBA::Boolean print_dynamic = 1
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Dump the contents of this property sequence.
 
   enum INTERFACES
@@ -37,7 +37,7 @@ public:
 
     Remote_Output (void) {}
 
-    virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -50,7 +50,7 @@ public:
 
     Printer (void) {}
 
-    virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -62,7 +62,7 @@ public:
   public:
     Plotter (void) {}
 
-    virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -74,7 +74,7 @@ public:
   public:
     File_System (void) {}
 
-    virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
@@ -86,7 +86,7 @@ public:
   public:
     PostScript_Printer (void) {}
 
-    virtual void confirm (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    virtual void confirm (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException)) {}
     // Method to test that the importer received a valid reference to
     // the exported object.
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index cf065e56c5d..895c8cab06b 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -32,7 +32,7 @@ main (int argc, char** argv)
   ACE_TRY_NEW_ENV
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Command line argument interpretation.
@@ -49,7 +49,7 @@ main (int argc, char** argv)
       TAO_Trading_Components_i& trd_comp = trader->trading_components ();
 
       // Set the service type repository
-      sup_attr.type_repos (type_repos._this (TAO_ENV_SINGLE_ARG_PARAMETER));
+      sup_attr.type_repos (type_repos._this (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_TRY_CHECK;
 
       // Run the Service Type Exporter tests
@@ -57,22 +57,22 @@ main (int argc, char** argv)
       TAO_Service_Type_Exporter type_exporter
         (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
          verbose
-         TAO_ENV_ARG_PARAMETER);
+         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.remove_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
+      type_exporter.remove_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.add_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
+      type_exporter.add_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.list_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
+      type_exporter.list_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
+      type_exporter.describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.fully_describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
+      type_exporter.fully_describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the Offer Exporter tests
@@ -80,37 +80,37 @@ main (int argc, char** argv)
       TAO_Offer_Exporter offer_exporter
         (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()),
          verbose
-         TAO_ENV_ARG_PARAMETER);
+         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.modify_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.modify_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the Offer Importer tests
@@ -118,7 +118,7 @@ main (int argc, char** argv)
       TAO_Offer_Importer offer_importer
         (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), verbose);
 
-      offer_importer.perform_queries (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_importer.perform_queries (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index 34801bf7be1..03cd930d8ea 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -16,7 +16,7 @@ main (int argc, char** argv)
   ACE_TRY_NEW_ENV
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Command line argument interpretation.
@@ -29,7 +29,7 @@ main (int argc, char** argv)
       char* ior = parse_args.ior ();
       CORBA::Object_var trading_obj = (ior == 0) ?
         orb->resolve_initial_references ("TradingService") :
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (trading_obj.in ()))
@@ -40,86 +40,86 @@ main (int argc, char** argv)
       // Narrow the lookup interface.
       ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
       CosTrading::Lookup_var lookup_if =
-        CosTrading::Lookup::_narrow (trading_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosTrading::Lookup::_narrow (trading_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the Service Type Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n"));
       TAO_Service_Type_Exporter type_exporter (lookup_if.in (),
                                                ! parse_args.quiet ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.remove_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
+      type_exporter.remove_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.add_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
+      type_exporter.add_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.remove_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
+      type_exporter.remove_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.add_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
+      type_exporter.add_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args.federated ())
         {
-          type_exporter.add_all_types_to_all (TAO_ENV_SINGLE_ARG_PARAMETER);
+          type_exporter.add_all_types_to_all (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      type_exporter.list_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
+      type_exporter.list_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
+      type_exporter.describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      type_exporter.fully_describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER);
+      type_exporter.fully_describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "*** Service Type Exporter tests complete.\n"));
 
       // Run the Offer Exporter tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n"));
-      TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet () TAO_ENV_ARG_PARAMETER);
+      TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // = Test series.
 
-      offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.modify_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.modify_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args.federated ())
         {
-          offer_exporter.export_offers_to_all (TAO_ENV_SINGLE_ARG_PARAMETER);
+          offer_exporter.export_offers_to_all (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "*** Offer Exporter tests complete.\n"));
@@ -143,7 +143,7 @@ main (int argc, char** argv)
         ACE_DEBUG ((LM_WARNING, "Unable to open %s for output.\n", file));
       }
 
-      orb_manager.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb_manager.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp
index 58c14450669..8c96bd0b963 100644
--- a/TAO/orbsvcs/tests/Trading/import_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/import_test.cpp
@@ -11,7 +11,7 @@ main (int argc, char** argv)
   ACE_TRY_NEW_ENV
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Command line argument interpretation.
@@ -23,7 +23,7 @@ main (int argc, char** argv)
       char* ior = parse_args.ior ();
       CORBA::Object_var trading_obj = (ior == 0) ?
         orb->resolve_initial_references ("TradingService") :
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (trading_obj.in ()))
@@ -34,19 +34,19 @@ main (int argc, char** argv)
       // Narrow the lookup interface.
       ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
       CosTrading::Lookup_var lookup_if =
-        CosTrading::Lookup::_narrow (trading_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosTrading::Lookup::_narrow (trading_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the Offer Importer tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n"));
       TAO_Offer_Importer offer_importer (lookup_if.in (), ! parse_args.quiet ());
 
-      offer_importer.perform_queries (TAO_ENV_SINGLE_ARG_PARAMETER);
+      offer_importer.perform_queries (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args.federated ())
         {
-          offer_importer.perform_directed_queries (TAO_ENV_SINGLE_ARG_PARAMETER);
+          offer_importer.perform_directed_queries (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
index 75f1fbe0608..54eb5f996f4 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
@@ -33,7 +33,7 @@ int main (int argc, char *argv [])
         return 1;
       else
         {
-          return client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          return client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
index 7ff9800e620..301482c7658 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -34,7 +34,7 @@ IOR_corbaname_Client_i::~IOR_corbaname_Client_i (void)
 }
 
 int
-IOR_corbaname_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
+IOR_corbaname_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
 
   ACE_TRY
@@ -63,12 +63,12 @@ IOR_corbaname_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
       // Resolve the stringified name.
       CORBA::Object_var factory_object =
         this->orb_->string_to_object (corbaname_url.c_str ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow
       corbaname::Status_var factory =
-        corbaname::Status::_narrow (factory_object.in () TAO_ENV_ARG_PARAMETER);
+        corbaname::Status::_narrow (factory_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -81,7 +81,7 @@ IOR_corbaname_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        factory->print_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        factory->print_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret_value == 0)
@@ -117,7 +117,7 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 
@@ -126,7 +126,7 @@ IOR_corbaname_Client_i::init (int argc, char **argv)
         CORBA::ORB_init (this->argc_,
                          this->argv_,
                          "" /* the ORB name, it can be anything! */
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // There must be at least one argument, the file that has to be
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
index aad6df15978..04dfc884fbb 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
@@ -39,7 +39,7 @@ class IOR_corbaname_Client_i
   IOR_corbaname_Client_i (void);
   ~IOR_corbaname_Client_i (void);
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Execute the client example code.
 
   int init (int argc, char **argv);
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index 5c54587bf12..1da3867a5da 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -5,7 +5,7 @@
 
 int main (int argc, char* argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 
@@ -13,26 +13,26 @@ int main (int argc, char* argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv,
                          "" /* the ORB name, it can be anything! */
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow down to the correct reference
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA Manager
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the servant
@@ -44,13 +44,13 @@ int main (int argc, char* argv[])
 
       // Get a reference to Naming Context
       CORBA::Object_var naming_context_object =
-        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow down the reference
       CosNaming::NamingContext_var naming_context =
         CosNaming::NamingContext::_narrow (naming_context_object.in()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind Status to the Naming Context
@@ -60,11 +60,11 @@ int main (int argc, char* argv[])
 
       naming_context->bind (name,
                             status.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Run the orb
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the POA, waiting until the destruction terminates
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
index 4712b42c9fe..db6078e18c5 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
@@ -4,13 +4,13 @@
 
 #include "status_i.h"
 
-corbaname_Status_i::corbaname_Status_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+corbaname_Status_i::corbaname_Status_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // Constructor
 }
 
 CORBA::Boolean
-corbaname_Status_i::print_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+corbaname_Status_i::print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If the client makes a succesful request, return a true value
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
index 07c1c1ce442..9154aacc09e 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
@@ -9,9 +9,9 @@
 
 class corbaname_Status_i : public POA_corbaname::Status {
 public:
-  corbaname_Status_i (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  corbaname_Status_i (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
-  CORBA::Boolean print_status (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean print_status (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
index 2d5f59b38ae..abed29ebdb3 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
@@ -32,12 +32,12 @@ ACE_RCSID(tests_svc_loader, tests_svc_loader, "$Id$")
 int main (int argc, char *argv [])
 {
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // There must be at least one argument, the file that has to be
@@ -53,12 +53,12 @@ int main (int argc, char *argv [])
 
       // Use the first argument to create the object reference.
       CORBA::Object_var object =
-        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check if this object reference is a valid one..
       CORBA::Boolean not_exists =
-        object->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+        object->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (not_exists)
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip.cpp b/TAO/performance-tests/AMI_Latency/Roundtrip.cpp
new file mode 100644
index 00000000000..c9e68d98406
--- /dev/null
+++ b/TAO/performance-tests/AMI_Latency/Roundtrip.cpp
@@ -0,0 +1,26 @@
+//
+// $Id$
+//
+#include "Roundtrip.h"
+
+ACE_RCSID(AMI_Latency, Roundtrip, "$Id$")
+
+Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+Test::Timestamp
+Roundtrip::test_method (Test::Timestamp send_time
+                        ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return send_time;
+}
+
+void
+Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+}
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip.h b/TAO/performance-tests/AMI_Latency/Roundtrip.h
new file mode 100644
index 00000000000..efef33dd7e6
--- /dev/null
+++ b/TAO/performance-tests/AMI_Latency/Roundtrip.h
@@ -0,0 +1,46 @@
+//
+// $Id$
+//
+
+#ifndef ROUNDTRIP_H
+#define ROUNDTRIP_H
+#include "ace/pre.h"
+
+#include "TestS.h"
+
+#if defined (_MSC_VER)
+# if (_MSC_VER >= 1200)
+#  pragma warning(push)
+# endif /* _MSC_VER >= 1200 */
+# pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
+/// Implement the Test::Roundtrip interface
+class Roundtrip
+  : public virtual POA_Test::Roundtrip
+  , public virtual PortableServer::RefCountServantBase
+{
+public:
+  /// Constructor
+  Roundtrip (CORBA::ORB_ptr orb);
+
+  // = The skeleton methods
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include "ace/post.h"
+#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp
new file mode 100644
index 00000000000..5f0061601e4
--- /dev/null
+++ b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp
@@ -0,0 +1,75 @@
+//
+// $Id$
+//
+#include "Roundtrip_Handler.h"
+
+ACE_RCSID(AMI_Latency, Roundtrip, "$Id$")
+
+Roundtrip_Handler::Roundtrip_Handler (int expected_callbacks)
+  : pending_callbacks_ (expected_callbacks)
+{
+}
+
+int
+Roundtrip_Handler::pending_callbacks (void) const
+{
+  return this->pending_callbacks_;
+}
+
+void
+Roundtrip_Handler::dump_results (ACE_UINT32 gsf)
+{
+  this->latency_stats_.dump_results ("AMI Latency", gsf);
+}
+
+void
+Roundtrip_Handler::test_method (Test::Timestamp send_time
+                                ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->pending_callbacks_--;
+
+  ACE_hrtime_t now = ACE_OS::gethrtime ();
+  this->latency_stats_.sample (now - send_time);
+}
+
+void
+Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                      ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_TRY
+    {
+      this->pending_callbacks_--;
+      holder->raise_test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_method:");
+    }
+  ACE_ENDTRY;
+}
+
+void
+Roundtrip_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+}
+
+void
+Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                   ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_TRY
+    {
+      holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "shutdown:");
+    }
+  ACE_ENDTRY;
+}
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h
new file mode 100644
index 00000000000..ae777f50f20
--- /dev/null
+++ b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h
@@ -0,0 +1,61 @@
+//
+// $Id$
+//
+
+#ifndef ROUNDTRIP_HANDLER_H
+#define ROUNDTRIP_HANDLER_H
+#include "ace/pre.h"
+
+#include "TestS.h"
+#include "ace/Basic_Stats.h"
+
+#if defined (_MSC_VER)
+# if (_MSC_VER >= 1200)
+#  pragma warning(push)
+# endif /* _MSC_VER >= 1200 */
+# pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
+/// Implement the Test::Roundtrip interface
+class Roundtrip_Handler
+  : public virtual POA_Test::AMI_RoundtripHandler
+  , public virtual PortableServer::RefCountServantBase
+{
+public:
+  /// Constructor
+  Roundtrip_Handler (int expected_callbacks);
+
+  /// Return the number of pending callbacks
+  int pending_callbacks (void) const;
+
+  /// Dump the results
+  void dump_results (ACE_UINT32 gsf);
+
+  // = The skeleton methods
+  virtual void test_method (Test::Timestamp send_time
+                            ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                  ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+                               ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+private:
+  /// The number of callbacks not received yet
+  int pending_callbacks_;
+
+  /// Collect the latency results
+  ACE_Basic_Stats latency_stats_;
+};
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include "ace/post.h"
+#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/AMI_Latency/Server_Task.cpp b/TAO/performance-tests/AMI_Latency/Server_Task.cpp
new file mode 100644
index 00000000000..6df92f32a3f
--- /dev/null
+++ b/TAO/performance-tests/AMI_Latency/Server_Task.cpp
@@ -0,0 +1,24 @@
+//
+// $Id$
+//
+#include "Server_Task.h"
+
+ACE_RCSID(AMI_Latency, Server_Task, "$Id$")
+
+Server_Task::Server_Task (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+int
+Server_Task::svc (void)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY {} ACE_ENDTRY;
+  return 0;
+}
diff --git a/TAO/performance-tests/AMI_Latency/client.cpp b/TAO/performance-tests/AMI_Latency/client.cpp
new file mode 100644
index 00000000000..0d396c4b67b
--- /dev/null
+++ b/TAO/performance-tests/AMI_Latency/client.cpp
@@ -0,0 +1,185 @@
+// $Id$
+
+#include "Roundtrip_Handler.h"
+#include "tao/debug.h"
+#include "ace/Get_Opt.h"
+#include "ace/High_Res_Timer.h"
+#include "ace/Sched_Params.h"
+#include "ace/Stats.h"
+
+ACE_RCSID(AMI_Latency, client, "$Id$")
+
+const char *ior = "file://test.ior";
+
+ACE_hrtime_t throughput_base;
+
+int niterations = 1000;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "k:i:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "-i <niterations> "
+                           "-p <period (msecs)> "
+                           "-b <burst size> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var object =
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      Test::Roundtrip_var roundtrip =
+        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (roundtrip.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Nil Test::Roundtrip reference <%s>\n",
+                           ior),
+                          1);
+
+      for (int j = 0; j < 100; ++j)
+        {
+          ACE_hrtime_t start = 0;
+          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+
+      Roundtrip_Handler *roundtrip_handler_impl;
+      ACE_NEW_RETURN (roundtrip_handler_impl,
+                      Roundtrip_Handler (niterations),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(roundtrip_handler_impl);
+
+      Test::AMI_RoundtripHandler_var roundtrip_handler =
+        roundtrip_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
+
+      for (int i = 0; i != niterations; ++i)
+         {
+           // Invoke asynchronous operation....
+           roundtrip->sendc_test_method (roundtrip_handler.in (),
+                                         ACE_OS::gethrtime ()
+                                         ACE_ENV_ARG_PARAMETER);
+           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
+              orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
+
+           ACE_TRY_CHECK;
+         }
+
+       ACE_Time_Value tv (0, 2000);
+
+       while (roundtrip_handler_impl->pending_callbacks ())
+         {
+           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
+           ACE_TRY_CHECK;
+         }
+
+      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
+
+      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
+      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_DEBUG ((LM_DEBUG, "done\n"));
+
+      roundtrip_handler_impl->dump_results (gsf);
+
+      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
+                                             test_end - test_start,
+                                             niterations);
+
+      roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught: ");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/AMI_Latency/server.cpp b/TAO/performance-tests/AMI_Latency/server.cpp
new file mode 100644
index 00000000000..74498dc13e0
--- /dev/null
+++ b/TAO/performance-tests/AMI_Latency/server.cpp
@@ -0,0 +1,155 @@
+// $Id$
+
+#include "Roundtrip.h"
+#include "Server_Task.h"
+#include "ace/Get_Opt.h"
+#include "ace/Sched_Params.h"
+
+#include "tao/Strategies/advanced_resource.h"
+
+ACE_RCSID(AMI_Latency, server, "$Id$")
+
+const char *ior_output_file = "test.ior";
+int nthreads = 4;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "o:n:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case 'n':
+        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile> "
+                           "-n <nthreads> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+
+  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
+                                              priority);
+
+  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
+                                              priority);
+
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      Roundtrip *roundtrip_impl;
+      ACE_NEW_RETURN (roundtrip_impl,
+                      Roundtrip (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
+
+      Test::Roundtrip_var roundtrip =
+        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::String_var ior =
+        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // If the ior_output_file exists, output the ior to it
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           ior_output_file),
+                          1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      Server_Task server_task (orb.in ());
+      if (server_task.activate (THR_NEW_LWP | THR_JOINABLE,
+                                nthreads) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot activate server threads\n"),
+                          1);
+
+      server_task.thr_mgr ()->wait ();
+
+      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/Callback/Callback_i.cpp b/TAO/performance-tests/Callback/Callback_i.cpp
index f86c6f605cb..83e357965ce 100644
--- a/TAO/performance-tests/Callback/Callback_i.cpp
+++ b/TAO/performance-tests/Callback/Callback_i.cpp
@@ -18,7 +18,7 @@ Callback_i::done (void)
 void
 Callback_i::response (Test::TimeStamp time_stamp,
                       const Test::Payload &
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
diff --git a/TAO/performance-tests/Callback/Callback_i.h b/TAO/performance-tests/Callback/Callback_i.h
index 95b9850ee4e..b3423a573b0 100644
--- a/TAO/performance-tests/Callback/Callback_i.h
+++ b/TAO/performance-tests/Callback/Callback_i.h
@@ -23,7 +23,7 @@ public:
   //@{
   void response (Test::TimeStamp,
                  const Test::Payload &
-                 TAO_ENV_ARG_DECL_NOT_USED)
+                 ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/performance-tests/Callback/Server_i.cpp b/TAO/performance-tests/Callback/Server_i.cpp
index 67c2780de3e..a4cc4de2484 100644
--- a/TAO/performance-tests/Callback/Server_i.cpp
+++ b/TAO/performance-tests/Callback/Server_i.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(Callback, Server_i, "$Id$")
 
 void
 Server_i::set_callback (Test::Callback_ptr callback
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->callback_ = Test::Callback::_duplicate (callback);
@@ -19,17 +19,17 @@ Server_i::set_callback (Test::Callback_ptr callback
 void
 Server_i::request (Test::TimeStamp time_stamp,
                    const Test::Payload &payload
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->callback_.in ()))
     return;
 
-  this->callback_->response (time_stamp, payload TAO_ENV_ARG_PARAMETER);
+  this->callback_->response (time_stamp, payload ACE_ENV_ARG_PARAMETER);
 }
 
 void
-Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->done_ = 1;
diff --git a/TAO/performance-tests/Callback/Server_i.h b/TAO/performance-tests/Callback/Server_i.h
index 5cf73c65ce7..60887393721 100644
--- a/TAO/performance-tests/Callback/Server_i.h
+++ b/TAO/performance-tests/Callback/Server_i.h
@@ -18,15 +18,15 @@ public:
   /// Implement the CORBA methods
   //@{
   void set_callback (Test::Callback_ptr callback
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void request (Test::TimeStamp,
                 const Test::Payload &
-                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));
 
   //@}
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index e8af409d5a4..56743477b20 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -73,17 +73,17 @@ 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;
 
       CORBA::Object_var manager_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 (manager_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -94,15 +94,15 @@ main (int argc, char *argv [])
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_scope
-                            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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -111,14 +111,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -126,11 +126,11 @@ main (int argc, char *argv [])
 
       // Get the event channel object reference
       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::Server_var server =
-        Test::Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test::Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (server.in ()))
         {
@@ -143,10 +143,10 @@ main (int argc, char *argv [])
 
       Callback_i callback_i (iterations);
 
-      Test::Callback_var callback = callback_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Test::Callback_var callback = callback_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server->set_callback (callback.in () TAO_ENV_ARG_PARAMETER);
+      server->set_callback (callback.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Connected callback\n"));
@@ -158,7 +158,7 @@ main (int argc, char *argv [])
       while (!callback_i.done () || !task.done ())
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv TAO_ENV_ARG_PARAMETER);
+          orb->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -188,15 +188,15 @@ main (int argc, char *argv [])
                                              end - start,
                                              stats.samples_count ());
 
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&callback_i TAO_ENV_ARG_PARAMETER);
+        root_poa->servant_to_id (&callback_i ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      root_poa->deactivate_object (id.in () 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_CATCH (CORBA::Exception, ex)
@@ -270,7 +270,7 @@ Task::svc (void)
       for (;;)
         {
           Test::TimeStamp creation = ACE_OS::gethrtime ();
-          this->server_->request (creation, payload TAO_ENV_ARG_PARAMETER);
+          this->server_->request (creation, payload ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_Time_Value tv (0, 5000);
diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp
index cd0cec3d909..cd7874e13a7 100644
--- a/TAO/performance-tests/Callback/server.cpp
+++ b/TAO/performance-tests/Callback/server.cpp
@@ -42,17 +42,17 @@ 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;
 
       CORBA::Object_var manager_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 (manager_object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -63,15 +63,15 @@ main (int argc, char *argv [])
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             sync_scope
-                            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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -80,14 +80,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -95,11 +95,11 @@ main (int argc, char *argv [])
 
       Server_i server_i;
 
-      Test::Server_var server = server_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Test::Server_var server = server_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ior_file_name != 0)
@@ -117,16 +117,16 @@ main (int argc, char *argv [])
       while (!server_i.done ())
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv TAO_ENV_ARG_PARAMETER);
+          orb->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&server_i TAO_ENV_ARG_PARAMETER);
-      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+        root_poa->servant_to_id (&server_i ACE_ENV_ARG_PARAMETER);
+      root_poa->deactivate_object (id.in () 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_CATCH (CORBA::Exception, ex)
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index 09a07be02fd..4c17c253c65 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -201,7 +201,7 @@ DII_Cubit_Client::init (int argc, char **argv)
       this->orb_var_ = CORBA::ORB_init (this->argc_,
                                         this->argv_,
                                         "internet"
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -214,12 +214,12 @@ DII_Cubit_Client::init (int argc, char **argv)
       // Get a factory object reference from the factory IOR.
       this->factory_var_ =
         this->orb_var_->string_to_object (this->factory_IOR_
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a Cubit object with a DII request on the Cubit factory.
       CORBA::Request_var mc_req (this->factory_var_->_request ("make_cubit"
-                                                               TAO_ENV_ARG_PARAMETER));
+                                                               ACE_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -233,7 +233,7 @@ DII_Cubit_Client::init (int argc, char **argv)
 
       // Invoke the <make_cubit> operation to ask the Cubit factory
       // for a Cubit object.
-      mc_req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mc_req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Extract the returned object reference from the request.
@@ -388,7 +388,7 @@ DII_Cubit_Client::cube_short_dii (void)
     {
       // Create the request ...
       CORBA::Request_var req (this->obj_var_->_request ("cube_short"
-                                                        TAO_ENV_ARG_PARAMETER));
+                                                        ACE_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -402,7 +402,7 @@ DII_Cubit_Client::cube_short_dii (void)
 
       this->call_count_++;
 
-      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       req->return_value () >>= ret_short;
@@ -432,7 +432,7 @@ DII_Cubit_Client::cube_long_dii (void)
     {
       // Create the request ...
       CORBA::Request_var req (this->obj_var_->_request ("cube_long"
-                                                        TAO_ENV_ARG_PARAMETER));
+                                                        ACE_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -446,7 +446,7 @@ DII_Cubit_Client::cube_long_dii (void)
 
       this->call_count_++;
 
-      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -477,7 +477,7 @@ DII_Cubit_Client::cube_octet_dii (void)
     {
       // Create the request ...
       CORBA::Request_var req (this->obj_var_->_request ("cube_octet"
-                                                        TAO_ENV_ARG_PARAMETER));
+                                                        ACE_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -493,7 +493,7 @@ DII_Cubit_Client::cube_octet_dii (void)
       // Invoke, check for an exception and verify the result.
       this->call_count_++;
 
-      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -525,7 +525,7 @@ DII_Cubit_Client::cube_union_dii (void)
     {
       // Create the request ...
       CORBA::Request_var req (this->obj_var_->_request ("cube_union"
-                                                        TAO_ENV_ARG_PARAMETER));
+                                                        ACE_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -545,7 +545,7 @@ DII_Cubit_Client::cube_union_dii (void)
 
       this->call_count_++;
 
-      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -580,7 +580,7 @@ DII_Cubit_Client::cube_struct_dii (void)
     {
       // Create the request ...
       CORBA::Request_var req (this->obj_var_->_request ("cube_struct"
-                                                        TAO_ENV_ARG_PARAMETER));
+                                                        ACE_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -599,7 +599,7 @@ DII_Cubit_Client::cube_struct_dii (void)
 
       this->call_count_++;
 
-      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -632,7 +632,7 @@ DII_Cubit_Client::cube_octet_seq_dii (int length)
     {
       // Create the request ...
       CORBA::Request_var req (this->obj_var_->_request ("cube_octet_sequence"
-                                                         TAO_ENV_ARG_PARAMETER));
+                                                         ACE_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -652,7 +652,7 @@ DII_Cubit_Client::cube_octet_seq_dii (int length)
 
       this->call_count_++;
 
-      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -693,7 +693,7 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
     {
       // Create the request ...
       CORBA::Request_var req (this->obj_var_->_request ("cube_long_sequence"
-                                                        TAO_ENV_ARG_PARAMETER));
+                                                        ACE_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -714,7 +714,7 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
 
       this->call_count_++;
 
-      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -822,12 +822,12 @@ DII_Cubit_Client::run (void)
       if (this->shutdown_)
         {
           CORBA::Request_var req (this->obj_var_->_request ("shutdown"
-                                                            TAO_ENV_ARG_PARAMETER));
+                                                            ACE_ENV_ARG_PARAMETER));
 
           ACE_TRY_CHECK;
 
           // Cubit::shutdown () is a oneway operation.
-          req->send_oneway (TAO_ENV_SINGLE_ARG_PARAMETER);
+          req->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index 3f9d51cff0b..cd4c2b57d43 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -382,7 +382,7 @@ Cubit_Client::check_enabled (u_int mask) const
 // Exercise the union.  Cube a union.
 
 void
-Cubit_Client::cube_union (TAO_ENV_SINGLE_ARG_DECL)
+Cubit_Client::cube_union (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -398,7 +398,7 @@ Cubit_Client::cube_union (TAO_ENV_SINGLE_ARG_DECL)
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START);
 
         r = this->cubit_->cube_union (u
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -426,7 +426,7 @@ Cubit_Client::cube_union (TAO_ENV_SINGLE_ARG_DECL)
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START);
 
         r = this->cubit_->cube_union (u
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -459,7 +459,7 @@ Cubit_Client::cube_union (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Cubit_Client::cube_short (int i
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -471,7 +471,7 @@ Cubit_Client::cube_short (int i
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_SHORT_START);
 
         ret_short = cubit_->cube_short (arg_short
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -510,12 +510,12 @@ Cubit_Client::cube_short (int i
 
 void
 Cubit_Client::cube_oneway (int
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ONEWAY_START);
-      this->cubit_->cube_oneway (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->cubit_->cube_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->call_count_++;
     }
@@ -531,12 +531,12 @@ Cubit_Client::cube_oneway (int
 
 void
 Cubit_Client::cube_void (int
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_VOID_START);
-      this->cubit_->cube_void (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->cubit_->cube_void (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->call_count_++;
     }
@@ -554,7 +554,7 @@ Cubit_Client::cube_void (int
 
 void
 Cubit_Client::cube_octet (int i
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -566,7 +566,7 @@ Cubit_Client::cube_octet (int i
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_OCTET_START);
 
         ret_octet = this->cubit_->cube_octet (arg_octet
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -606,7 +606,7 @@ Cubit_Client::cube_octet (int i
 
 void
 Cubit_Client::cube_long (int i
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -618,7 +618,7 @@ Cubit_Client::cube_long (int i
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_LONG_START);
 
         ret_long = this->cubit_->cube_long (arg_long
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -661,7 +661,7 @@ Cubit_Client::cube_long (int i
 
 void
 Cubit_Client::cube_struct (int i
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -679,7 +679,7 @@ Cubit_Client::cube_struct (int i
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_STRUCT_START);
 
         ret_struct = this->cubit_->cube_struct (arg_struct
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -718,7 +718,7 @@ Cubit_Client::cube_struct (int i
 void
 Cubit_Client::cube_long_sequence (int,
                                   int l
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -746,7 +746,7 @@ Cubit_Client::cube_long_sequence (int,
 
         this->cubit_->cube_long_sequence (input,
                                           vout
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -791,7 +791,7 @@ Cubit_Client::cube_long_sequence (int,
 void
 Cubit_Client::cube_octet_sequence (int,
                                    int l
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -820,7 +820,7 @@ Cubit_Client::cube_octet_sequence (int,
 
         this->cubit_->cube_octet_sequence (input,
                                            vout
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -866,7 +866,7 @@ Cubit_Client::cube_octet_sequence (int,
 void
 Cubit_Client::cube_many_sequence (int,
                                   int l
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -902,7 +902,7 @@ Cubit_Client::cube_many_sequence (int,
 
         this->cubit_->cube_many_sequence (input,
                                           vout
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -951,7 +951,7 @@ void
 Cubit_Client::cube_rti_data (int,
                              int numUpdates,
                              int numAttrs
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -1022,7 +1022,7 @@ Cubit_Client::cube_rti_data (int,
 
         this->cubit_->cube_rti_data (input,
                                      vout
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -1054,7 +1054,7 @@ Cubit_Client::cube_rti_data (int,
 
 void
 Cubit_Client::cube_any (int i
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -1069,7 +1069,7 @@ Cubit_Client::cube_any (int i
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ANY_START);
         ret_any = this->cubit_->cube_any (arg_any
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       }
       ACE_TRY_CHECK;
 
@@ -1114,7 +1114,7 @@ Cubit_Client::cube_any (int i
 
 void
 Cubit_Client::cube_any_struct (int i
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -1134,7 +1134,7 @@ Cubit_Client::cube_any_struct (int i
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ANY_STRUCT_START);
         ret_any = this->cubit_->cube_any_struct (arg_any
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       }
       ACE_TRY_CHECK;
 
@@ -1246,7 +1246,7 @@ Cubit_Client::run ()
 
   // Show the results one type at a time.
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // VOID
@@ -1259,7 +1259,7 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_void (i
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1280,7 +1280,7 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_short (i
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1301,7 +1301,7 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_octet (i
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1322,7 +1322,7 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_long (i
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1342,7 +1342,7 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_struct (i
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1362,7 +1362,7 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_union (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->cube_union (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1384,7 +1384,7 @@ Cubit_Client::run ()
             {
               this->cube_long_sequence (this->loop_count_,
                                         4
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1406,7 +1406,7 @@ Cubit_Client::run ()
             {
               this->cube_long_sequence (this->loop_count_,
                                         1024
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1433,7 +1433,7 @@ Cubit_Client::run ()
                 {
                   this->cube_octet_sequence (this->loop_count_,
                                              bytes_in_octet_sequence_
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -1443,7 +1443,7 @@ Cubit_Client::run ()
                 {
                   this->cube_octet_sequence (this->loop_count_,
                                              16
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -1466,7 +1466,7 @@ Cubit_Client::run ()
             {
               this->cube_octet_sequence (this->loop_count_,
                                          4096
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1488,7 +1488,7 @@ Cubit_Client::run ()
             {
               this->cube_many_sequence (this->loop_count_,
                                         4
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1510,7 +1510,7 @@ Cubit_Client::run ()
             {
               this->cube_many_sequence (this->loop_count_,
                                         1024
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1531,15 +1531,15 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_short (i
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               this->cube_octet (i
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               this->cube_long (i
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1561,7 +1561,7 @@ Cubit_Client::run ()
               this->cube_rti_data (this->loop_count_,
                                    2,
                                    5
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1582,7 +1582,7 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_oneway (i
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1603,7 +1603,7 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_any (i
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1623,7 +1623,7 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_any_struct (i
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
             }
@@ -1636,7 +1636,7 @@ Cubit_Client::run ()
         }
 
       this->shutdown_server (this->shutdown_
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1651,7 +1651,7 @@ Cubit_Client::run ()
 
 int
 Cubit_Client::shutdown_server (int do_shutdown
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   if (do_shutdown)
     {
@@ -1660,7 +1660,7 @@ Cubit_Client::shutdown_server (int do_shutdown
 
       ACE_TRY_EX(NOT_COLLOCATED)
         {
-          this->cubit_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->cubit_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (NOT_COLLOCATED);
         }
       ACE_CATCHANY
@@ -1714,7 +1714,7 @@ Cubit_Client::init (int argc, char **argv)
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     "internet"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -1744,12 +1744,12 @@ Cubit_Client::init (int argc, char **argv)
 
       CORBA::Object_var factory_object =
         this->orb_->string_to_object (this->cubit_factory_key_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->factory_ =
         Cubit_Factory::_narrow (factory_object.in()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->factory_.in ()))
@@ -1765,7 +1765,7 @@ Cubit_Client::init (int argc, char **argv)
 
       // Now retrieve the Cubit obj ref corresponding to the key.
       this->cubit_ =
-        this->factory_->make_cubit (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->factory_->make_cubit (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->cubit_.in ()))
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index 4cddf3da4bd..54d2244eaaa 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -82,59 +82,59 @@ private:
                     ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
   // Prints the time stats.
 
-  void cube_union (TAO_ENV_SINGLE_ARG_DECL);
+  void cube_union (ACE_ENV_SINGLE_ARG_DECL);
   // Exercise the union.  Cube a union.
 
   void cube_struct (int i
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // calculate the cube from a struct.
 
   void cube_long (int i
-                  TAO_ENV_ARG_DECL);
+                  ACE_ENV_ARG_DECL);
   // calculate the cube from a long.
 
   void cube_oneway (int i
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // Oneway operation test.
 
   void cube_void (int i
-                  TAO_ENV_ARG_DECL);
+                  ACE_ENV_ARG_DECL);
   // Twoway operation test.
 
   void cube_octet (int i
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
   // Cube an octet.
 
   void cube_short (int i
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
   // Cube a short.
 
   void cube_long_sequence (int i, int l
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
   // Cube a sequence <l> is the length of the sequence.
 
   void cube_octet_sequence (int i, int l
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   // Cube a sequence of octets, <l> is the length of the sequence.
 
   void cube_many_sequence (int i, int l
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
   // Cube a sequence of manys, <l> is the length of the sequence.
 
   void cube_rti_data (int i, int numUpdates, int numAttrs
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   // Cube a sequence <l> is the length of the sequence.
 
   void cube_any_struct (int i
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // calculate the cube from a struct in an any.
 
   void cube_any (int i
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
   // calculate the cube from a long in an any.
 
   int shutdown_server (int do_shutdown
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // Invoke the method with <do_shutdown> != 0 to shutdown the server.
 
   int argc_;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index 9e39a72109b..539f14720cb 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -56,14 +56,14 @@ Cubit_Server::parse_args (void)
 int
 Cubit_Server::init (int argc,
                     char** argv
-                    TAO_ENV_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
+                    ACE_ENV_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
                                          "child_poa"
-                                         TAO_ENV_ARG_PARAMETER) == -1)
+                                         ACE_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -89,7 +89,7 @@ Cubit_Server::init (int argc,
   this->factory_id_ =
     this->orb_manager_.activate_under_child_poa ("factory",
                                                  this->factory_impl_
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -108,9 +108,9 @@ Cubit_Server::init (int argc,
 }
 
 int
-Cubit_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+Cubit_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cubit_Server::run"),
                       -1);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
index d31269dd6ee..5f5bb1419d4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
@@ -52,10 +52,10 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Cubit_Server state - parsing arguments and ...
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index 6eca9eb5f98..d3c6cc45515 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -126,10 +126,10 @@ Cubit_Factory_i::~Cubit_Factory_i (void)
 }
 
 Cubit_ptr
-Cubit_Factory_i::make_cubit (TAO_ENV_SINGLE_ARG_DECL)
+Cubit_Factory_i::make_cubit (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return my_cubit_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return my_cubit_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -152,7 +152,7 @@ Cubit_i::~Cubit_i (void)
 }
 
 PortableServer::POA_ptr
-Cubit_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Cubit_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -164,14 +164,14 @@ Cubit_i::set_default_poa (PortableServer::POA_ptr poa)
 }
 
 void
-Cubit_i::cube_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Cubit_i::cube_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ONEWAY_START);
 }
 
 void
-Cubit_i::cube_void (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Cubit_i::cube_void (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_VOID_START);
@@ -181,7 +181,7 @@ Cubit_i::cube_void (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Octet
 Cubit_i::cube_octet (CORBA::Octet o
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_START);
@@ -193,7 +193,7 @@ Cubit_i::cube_octet (CORBA::Octet o
 
 CORBA::Short
 Cubit_i::cube_short (CORBA::Short s
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_SHORT_START);
@@ -205,7 +205,7 @@ Cubit_i::cube_short (CORBA::Short s
 
 CORBA::Long
 Cubit_i::cube_long (CORBA::Long l
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_START);
@@ -217,7 +217,7 @@ Cubit_i::cube_long (CORBA::Long l
 
 Cubit::Many
 Cubit_i::cube_struct (const Cubit::Many &values
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_STRUCT_START);
@@ -235,7 +235,7 @@ Cubit_i::cube_struct (const Cubit::Many &values
 
 Cubit::oneof
 Cubit_i::cube_union (const Cubit::oneof &values
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_UNION_START);
@@ -269,7 +269,7 @@ Cubit_i::cube_union (const Cubit::oneof &values
 void
 Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
                              Cubit::long_seq_out output
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START);
@@ -296,7 +296,7 @@ Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
 void
 Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
                               Cubit::octet_seq_out output
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_SEQUENCE_START);
@@ -337,7 +337,7 @@ Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
 void
 Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
                              Cubit::many_seq_out output
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_MANY_SEQUENCE_START);
@@ -371,7 +371,7 @@ Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
 void
 Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
                         Cubit::RtiPacket_out output
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START);
@@ -403,7 +403,7 @@ Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
 
 CORBA::Any *
 Cubit_i::cube_any (const CORBA::Any & any
-                   TAO_ENV_ARG_DECL_NOT_USED)
+                   ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ANY_START);
@@ -420,7 +420,7 @@ Cubit_i::cube_any (const CORBA::Any & any
 
 CORBA::Any *
 Cubit_i::cube_any_struct (const CORBA::Any & any
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ANY_STRUCT_START);
@@ -439,7 +439,7 @@ Cubit_i::cube_any_struct (const CORBA::Any & any
 
 // Shutdown.
 
-void Cubit_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+void Cubit_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
index 454be029601..517bd50068c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -37,77 +37,77 @@ public:
   ~Cubit_i (void);
   // Destructor
 
-  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Returns the default POA for this servant.
 
-  virtual void cube_oneway (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void cube_oneway (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a oneway call.
 
-  virtual void cube_void (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void cube_void (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a twoway call.
 
   virtual CORBA::Octet cube_octet (CORBA::Octet o
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube an octet
 
   virtual CORBA::Short cube_short (CORBA::Short s
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a short
 
   virtual CORBA::Long cube_long (CORBA::Long l
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a long
 
   virtual Cubit::Many cube_struct (const Cubit::Many &values
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a struct.
 
   virtual Cubit::oneof cube_union (const Cubit::oneof &values
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a union.
 
   virtual void cube_long_sequence (const Cubit::long_seq &input,
                                    Cubit::long_seq_out output
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a sequence.
 
   virtual void cube_octet_sequence (const Cubit::octet_seq &input,
                                     Cubit::octet_seq_out output
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube an octet sequence.
 
   virtual void cube_many_sequence (const Cubit::many_seq & input,
                                    Cubit::many_seq_out output
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube an Many sequence.
 
   virtual void cube_rti_data (const Cubit::RtiPacket &input,
                               Cubit::RtiPacket_out output
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a sequence.
 
   virtual CORBA::Any * cube_any (const CORBA::Any & any
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a long in an any
 
   virtual CORBA::Any * cube_any_struct (const CORBA::Any & any
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a struct in an any
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown routine.
 
@@ -135,7 +135,7 @@ public:
   ~Cubit_Factory_i (void);
   // Destructor.
 
-  virtual Cubit_ptr make_cubit (TAO_ENV_SINGLE_ARG_DECL)
+  virtual Cubit_ptr make_cubit (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Make a cubit object.
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index b988891d80a..aef78ddc350 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -44,14 +44,14 @@ svr_worker (void *arg)
     {
       int result = cubit_server.init (args.argc (),
                                       args.argv ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
         return (void *) 1;
 
       barrier->server_init_.wait ();
-      cubit_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      cubit_server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       barrier->client_fini_.wait ();
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
index af690c0ace4..b32c03b6451 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -46,13 +46,13 @@ main (int argc, char *argv[])
               "\n\tIDL_Cubit: server\n\n"));
   ACE_TRY_NEW_ENV
     {
-      int ret = cubit_server.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int ret = cubit_server.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret == -1)
         return -1;
 
-      cubit_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      cubit_server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::sleep (5);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index 1105a5a099c..25363f792a3 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -64,14 +64,14 @@ Cubit_Task::svc (void)
                        "Create Servants failed.\n"),
                       -1);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       GLOBALS::instance ()->barrier_->wait ();
 
       // Handle requests for this object until we're killed, or one of
       // the methods asks us to exit.
-      int r = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      int r = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
@@ -84,7 +84,7 @@ Cubit_Task::svc (void)
       CORBA::ORB_var orb =
         this->orb_manager_.orb ();
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -105,7 +105,7 @@ Cubit_Task::svc (void)
 int
 Cubit_Task::initialize_orb (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       ACE_ARGV args (this->orbargs_);
@@ -122,7 +122,7 @@ Cubit_Task::initialize_orb (void)
                                                  argv,
                                                  "persistent_poa",
                                                  orb_name
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         return -1;
@@ -166,23 +166,23 @@ Cubit_Task::get_servant_ior (u_int index)
 int
 Cubit_Task::create_servants (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::Object_var obj =
         this->orb_->resolve_initial_references ("RootPOA"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var manager =
-        poa->the_POAManager(TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      manager->activate(TAO_ENV_SINGLE_ARG_PARAMETER);
+      manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the array of cubit implementations.
@@ -232,13 +232,13 @@ Cubit_Task::create_servants (void)
           // some client.  Then release the object.
 
           Cubit_var cubit =
-            this->servants_[i]->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->servants_[i]->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
           CORBA::String_var str =
             this->orb_->object_to_string (cubit.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->servants_iors_[i] =
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 824d3dbcabc..da15b9ad9b3 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -553,7 +553,7 @@ Client::find_frequency (void)
 }
 
 CORBA::ORB_ptr
-Client::init_orb (TAO_ENV_SINGLE_ARG_DECL)
+Client::init_orb (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "I'm thread %t\n"));
@@ -583,7 +583,7 @@ Client::init_orb (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv,
                                         orbid
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
   if (this->id_ == 0)
@@ -613,7 +613,7 @@ Client::init_orb (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Client::get_cubit (CORBA::ORB_ptr orb TAO_ENV_ARG_DECL)
+Client::get_cubit (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 {
   char *my_ior =
     this->ts_->use_utilization_test_ == 1
@@ -633,7 +633,7 @@ Client::get_cubit (CORBA::ORB_ptr orb TAO_ENV_ARG_DECL)
 
   CORBA::Object_var objref =
     orb->string_to_object (my_ior
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (objref.in ()))
@@ -644,7 +644,7 @@ Client::get_cubit (CORBA::ORB_ptr orb TAO_ENV_ARG_DECL)
   // Narrow the CORBA::Object reference to the stub object,
   // checking the type along the way using _is_a.
   this->cubit_ = Cubit::_narrow (objref.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->cubit_))
@@ -657,7 +657,7 @@ Client::get_cubit (CORBA::ORB_ptr orb TAO_ENV_ARG_DECL)
 
   CORBA::String_var str =
     orb->object_to_string (this->cubit_
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -670,18 +670,18 @@ Client::get_cubit (CORBA::ORB_ptr orb TAO_ENV_ARG_DECL)
 int
 Client::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = this->init_orb (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ORB_var orb = this->init_orb (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Find the frequency of CORBA requests based on thread id.
       this->find_frequency ();
 
       // Get the cubit object from the file.
-      int r = this->get_cubit (orb.in () TAO_ENV_ARG_PARAMETER);
+      int r = this->get_cubit (orb.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r != 0)
         return r;
@@ -716,14 +716,14 @@ Client::svc (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%t) CALLING SHUTDOWN() ON THE SERVANT\n"));
-          this->cubit_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->cubit_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       CORBA::release (this->cubit_);
       this->cubit_ = 0;
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -746,7 +746,7 @@ Client::svc (void)
 int
 Client::cube_octet (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->call_count_++;
@@ -758,10 +758,10 @@ Client::cube_octet (void)
 
       if (this->ts_->use_utilization_test_ == 1 && this->ts_->remote_invocations_ == 0)
         ret_octet = this->cubit_impl_.cube_octet (arg_octet
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       else
         ret_octet = this->cubit_->cube_octet (arg_octet
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
 
       STOP_QUANTIFY;
       ACE_TRY_CHECK;
@@ -792,7 +792,7 @@ Client::cube_octet (void)
 int
 Client::cube_short (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->call_count_++;
@@ -802,7 +802,7 @@ Client::cube_short (void)
 
       START_QUANTIFY;
       ret_short = this->cubit_->cube_short (arg_short
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       STOP_QUANTIFY;
       ACE_TRY_CHECK;
       arg_short = arg_short * arg_short * arg_short;
@@ -829,7 +829,7 @@ Client::cube_short (void)
 int
 Client::cube_long (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->call_count_++;
@@ -839,7 +839,7 @@ Client::cube_long (void)
 
       START_QUANTIFY;
       ret_long = this->cubit_->cube_long (arg_long
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       STOP_QUANTIFY;
       ACE_TRY_CHECK;
 
@@ -866,7 +866,7 @@ Client::cube_long (void)
 int
 Client::cube_struct (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       Cubit::Many arg_struct;
@@ -880,7 +880,7 @@ Client::cube_struct (void)
 
       START_QUANTIFY;
       ret_struct = this->cubit_->cube_struct (arg_struct
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       STOP_QUANTIFY;
       ACE_TRY_CHECK;
 
@@ -940,12 +940,12 @@ Client::make_request (void)
     }
   else
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
           this->call_count_++;
           START_QUANTIFY;
-          this->cubit_->noop (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->cubit_->noop (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           STOP_QUANTIFY;
         }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index 554ad87b619..cd169ebe4d0 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -279,14 +279,14 @@ public:
   // cubed.
 
 private:
-  CORBA::ORB_ptr init_orb (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::ORB_ptr init_orb (ACE_ENV_SINGLE_ARG_DECL);
   // initialize the ORB.
 
   void read_ior (void);
   // reads the cubit ior from a file.
 
   int get_cubit (CORBA::ORB_ptr orb
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
   // gets the cubit object.
 
   int run_tests (void);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
index 8de8568c427..0dbd9106a87 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
@@ -19,7 +19,7 @@ Cubit_i::~Cubit_i (void)
 
 CORBA::Octet
 Cubit_i::cube_octet (CORBA::Octet o
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Octet) (o * o * o);
@@ -27,7 +27,7 @@ Cubit_i::cube_octet (CORBA::Octet o
 
 CORBA::Short
 Cubit_i::cube_short (CORBA::Short s
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Short) (s * s * s);
@@ -35,7 +35,7 @@ Cubit_i::cube_short (CORBA::Short s
 
 CORBA::Long
 Cubit_i::cube_long (CORBA::Long l
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Long) (l * l * l);
@@ -43,7 +43,7 @@ Cubit_i::cube_long (CORBA::Long l
 
 Cubit::Many
 Cubit_i::cube_struct (const Cubit::Many &values
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Cubit::Many out_values;
@@ -56,13 +56,13 @@ Cubit_i::cube_struct (const Cubit::Many &values
 }
 
 void
-Cubit_i::noop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Cubit_i::noop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // does nothing.
 }
 
-void Cubit_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+void Cubit_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -71,7 +71,7 @@ void Cubit_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 PortableServer::POA_ptr
-Cubit_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Cubit_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
index bc65208821d..eaa646cfb06 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
@@ -30,29 +30,29 @@ public:
   ~Cubit_i (void);
 
   virtual CORBA::Octet cube_octet (CORBA::Octet o
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Short cube_short (CORBA::Short s
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Long cube_long (CORBA::Long l
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Cubit::Many cube_struct (const Cubit::Many &values
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void noop (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void noop (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual PortableServer::POA_ptr
-      _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+      _default_POA (ACE_ENV_SINGLE_ARG_DECL);
   // The default POA
 
 protected:
diff --git a/TAO/performance-tests/DII_Latency/Roundtrip.cpp b/TAO/performance-tests/DII_Latency/Roundtrip.cpp
new file mode 100644
index 00000000000..df15cd65d8a
--- /dev/null
+++ b/TAO/performance-tests/DII_Latency/Roundtrip.cpp
@@ -0,0 +1,26 @@
+//
+// $Id$
+//
+#include "Roundtrip.h"
+
+ACE_RCSID(DII_Latency, Roundtrip, "$Id$")
+
+Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+Test::Timestamp
+Roundtrip::test_method (Test::Timestamp send_time
+                        ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return send_time;
+}
+
+void
+Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+}
diff --git a/TAO/performance-tests/DII_Latency/Roundtrip.h b/TAO/performance-tests/DII_Latency/Roundtrip.h
new file mode 100644
index 00000000000..efef33dd7e6
--- /dev/null
+++ b/TAO/performance-tests/DII_Latency/Roundtrip.h
@@ -0,0 +1,46 @@
+//
+// $Id$
+//
+
+#ifndef ROUNDTRIP_H
+#define ROUNDTRIP_H
+#include "ace/pre.h"
+
+#include "TestS.h"
+
+#if defined (_MSC_VER)
+# if (_MSC_VER >= 1200)
+#  pragma warning(push)
+# endif /* _MSC_VER >= 1200 */
+# pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
+/// Implement the Test::Roundtrip interface
+class Roundtrip
+  : public virtual POA_Test::Roundtrip
+  , public virtual PortableServer::RefCountServantBase
+{
+public:
+  /// Constructor
+  Roundtrip (CORBA::ORB_ptr orb);
+
+  // = The skeleton methods
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include "ace/post.h"
+#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/DII_Latency/client.cpp b/TAO/performance-tests/DII_Latency/client.cpp
new file mode 100644
index 00000000000..57935526269
--- /dev/null
+++ b/TAO/performance-tests/DII_Latency/client.cpp
@@ -0,0 +1,178 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/High_Res_Timer.h"
+#include "ace/Sched_Params.h"
+#include "ace/Stats.h"
+#include "ace/Sample_History.h"
+
+#include "tao/Strategies/advanced_resource.h"
+#include "tao/DynamicInterface/Request.h"
+
+ACE_RCSID(DII_Latency, client, "$Id$")
+
+const char *ior = "file://test.ior";
+int niterations = 100;
+int do_dump_history = 0;
+int do_shutdown = 1;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'h':
+        do_dump_history = 1;
+        break;
+
+      case 'x':
+        do_shutdown = 0;
+        break;
+
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "-i <niterations> "
+                           "-x (disable shutdown) "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "client (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "client (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        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 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (object.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Nil CORBA::Object reference <%s>\n",
+                             ior),
+                            1);
+        }
+
+      for (int j = 0; j < 100; ++j)
+        {
+          CORBA::Request_var request =
+            object->_request ("test_method" ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          CORBA::ULongLong dummy = 0;
+          request->add_in_arg("send_time") <<= dummy;
+
+          request->set_return_type (CORBA::_tc_ulonglong);
+          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+
+      ACE_Sample_History history (niterations);
+
+      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
+      for (int i = 0; i < niterations; ++i)
+        {
+          CORBA::ULongLong start = ACE_OS::gethrtime ();
+
+          CORBA::Request_var request =
+            object->_request ("test_method" ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          request->add_in_arg("send_time") <<= start;
+
+          request->set_return_type (CORBA::_tc_ulonglong);
+          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          ACE_hrtime_t now = ACE_OS::gethrtime ();
+          history.sample (now - start);
+        }
+
+      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
+
+      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
+
+      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
+      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_DEBUG ((LM_DEBUG, "done\n"));
+
+      if (do_dump_history)
+        {
+          history.dump_samples ("HISTORY", gsf);
+        }
+
+      ACE_Basic_Stats stats;
+      history.collect_basic_stats (stats);
+      stats.dump_results ("Total", gsf);
+
+      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
+                                             test_end - test_start,
+                                             stats.samples_count ());
+
+      if (do_shutdown)
+        {
+          CORBA::Request_var request =
+            object->_request ("shutdown" ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/DII_Latency/server.cpp b/TAO/performance-tests/DII_Latency/server.cpp
new file mode 100644
index 00000000000..e96f0ff595a
--- /dev/null
+++ b/TAO/performance-tests/DII_Latency/server.cpp
@@ -0,0 +1,136 @@
+// $Id$
+
+#include "Roundtrip.h"
+#include "ace/Get_Opt.h"
+#include "ace/Sched_Params.h"
+
+#include "tao/Strategies/advanced_resource.h"
+
+ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
+
+const char *ior_output_file = "test.ior";
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "o:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
+                                                  priority);
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      Roundtrip *roundtrip_impl;
+      ACE_NEW_RETURN (roundtrip_impl,
+                      Roundtrip (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
+
+      Test::Roundtrip_var roundtrip =
+        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::String_var ior =
+        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // If the ior_output_file exists, output the ior to it
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           ior_output_file),
+                          1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/DSI_Latency/Roundtrip.cpp b/TAO/performance-tests/DSI_Latency/Roundtrip.cpp
new file mode 100644
index 00000000000..6de5cfe047a
--- /dev/null
+++ b/TAO/performance-tests/DSI_Latency/Roundtrip.cpp
@@ -0,0 +1,97 @@
+//
+// $Id$
+//
+#include "Roundtrip.h"
+#include "tao/DynamicInterface/Server_Request.h"
+
+ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
+
+Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+void
+Roundtrip::invoke (CORBA::ServerRequest_ptr request
+                   ACE_ENV_ARG_DECL)
+{
+  if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
+    {
+      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      return;
+    }
+
+  else if (ACE_OS::strcmp ("_is_a", request->operation ()) == 0)
+    {
+      CORBA::NVList_ptr list;
+      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      CORBA::Any type_id (CORBA::_tc_string);
+      list->add_value ("type_id", type_id, CORBA::ARG_IN
+                       ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      request->arguments (list ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      const char *arg;
+      *(nv->value ()) >>= arg;
+
+      CORBA::Boolean type_matches = 0;
+      if (ACE_OS::strcmp (arg, "IDL:Test/Roundtrip:1.0") == 0
+          || ACE_OS::strcmp (arg, "IDL:omg.org/CORBA/Object:1.0") == 0
+          || ACE_OS::strcmp (arg, "") == 0)
+        type_matches = 1;
+
+      CORBA::Any result;
+      result <<= CORBA::Any::from_boolean (type_matches);
+
+      request->set_result (result ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      return;
+    }
+
+  else if (ACE_OS::strcmp ("test_method", request->operation ()) == 0)
+    {
+      CORBA::NVList_ptr list;
+      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      CORBA::Any send_time (CORBA::_tc_ulonglong);
+      list->add_value ("send_time", send_time, CORBA::ARG_IN
+                       ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      request->arguments (list ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      return;
+    }
+
+  CORBA::Any bad_operation;
+  CORBA::BAD_OPERATION exception;
+  bad_operation <<= exception;
+  request->set_exception (bad_operation ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+CORBA::RepositoryId
+Roundtrip::_primary_interface (const PortableServer::ObjectId &,
+                               PortableServer::POA_ptr
+                               ACE_ENV_ARG_DECL_NOT_USED)
+{
+  return CORBA::string_dup ("IDL:Test/Roundtrip:1.0");
+}
diff --git a/TAO/performance-tests/DSI_Latency/Roundtrip.h b/TAO/performance-tests/DSI_Latency/Roundtrip.h
new file mode 100644
index 00000000000..d795dcb56f1
--- /dev/null
+++ b/TAO/performance-tests/DSI_Latency/Roundtrip.h
@@ -0,0 +1,48 @@
+//
+// $Id$
+//
+
+#ifndef ROUNDTRIP_H
+#define ROUNDTRIP_H
+#include "ace/pre.h"
+
+#include "tao/DynamicInterface/Dynamic_Implementation.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/corba.h"
+
+#if defined (_MSC_VER)
+# if (_MSC_VER >= 1200)
+#  pragma warning(push)
+# endif /* _MSC_VER >= 1200 */
+# pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
+/// Implement the Test::Roundtrip interface
+class Roundtrip
+  : public virtual PortableServer::DynamicImplementation
+  , public virtual PortableServer::RefCountServantBase
+{
+public:
+  /// Constructor
+  Roundtrip (CORBA::ORB_ptr orb);
+
+  // = The DSI methods
+  virtual void invoke (CORBA::ServerRequest_ptr request
+                       ACE_ENV_ARG_DECL);
+  virtual CORBA::RepositoryId _primary_interface (
+      const PortableServer::ObjectId &oid,
+      PortableServer::POA_ptr poa
+      ACE_ENV_ARG_DECL);
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include "ace/post.h"
+#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/DSI_Latency/client.cpp b/TAO/performance-tests/DSI_Latency/client.cpp
new file mode 100644
index 00000000000..2a264e91b43
--- /dev/null
+++ b/TAO/performance-tests/DSI_Latency/client.cpp
@@ -0,0 +1,163 @@
+// $Id$
+
+#include "TestC.h"
+#include "ace/Get_Opt.h"
+#include "ace/High_Res_Timer.h"
+#include "ace/Sched_Params.h"
+#include "ace/Stats.h"
+#include "ace/Sample_History.h"
+
+#include "tao/Strategies/advanced_resource.h"
+
+ACE_RCSID(DSI_Latency, client, "$Id$")
+
+const char *ior = "file://test.ior";
+int niterations = 100;
+int do_dump_history = 0;
+int do_shutdown = 1;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'h':
+        do_dump_history = 1;
+        break;
+
+      case 'x':
+        do_shutdown = 0;
+        break;
+
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "-i <niterations> "
+                           "-x (disable shutdown) "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "client (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "client (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        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 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      Test::Roundtrip_var roundtrip =
+        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (roundtrip.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Nil Test::Roundtrip reference <%s>\n",
+                             ior),
+                            1);
+        }
+
+      for (int j = 0; j < 100; ++j)
+        {
+          ACE_hrtime_t start = 0;
+          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+
+      ACE_Sample_History history (niterations);
+
+      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
+      for (int i = 0; i < niterations; ++i)
+        {
+          ACE_hrtime_t start = ACE_OS::gethrtime ();
+
+          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          ACE_hrtime_t now = ACE_OS::gethrtime ();
+          history.sample (now - start);
+        }
+
+      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
+
+      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
+
+      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
+      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_DEBUG ((LM_DEBUG, "done\n"));
+
+      if (do_dump_history)
+        {
+          history.dump_samples ("HISTORY", gsf);
+        }
+
+      ACE_Basic_Stats stats;
+      history.collect_basic_stats (stats);
+      stats.dump_results ("Total", gsf);
+
+      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
+                                             test_end - test_start,
+                                             stats.samples_count ());
+
+      if (do_shutdown)
+        {
+          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/DSI_Latency/server.cpp b/TAO/performance-tests/DSI_Latency/server.cpp
new file mode 100644
index 00000000000..ebc70ade1d7
--- /dev/null
+++ b/TAO/performance-tests/DSI_Latency/server.cpp
@@ -0,0 +1,142 @@
+// $Id$
+
+#include "Roundtrip.h"
+#include "ace/Get_Opt.h"
+#include "ace/Sched_Params.h"
+
+#include "tao/Strategies/advanced_resource.h"
+
+ACE_RCSID(DSI_Latency, server, "$Id$")
+
+const char *ior_output_file = "test.ior";
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "o:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
+                                                  priority);
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      Roundtrip *roundtrip_impl;
+      ACE_NEW_RETURN (roundtrip_impl,
+                      Roundtrip (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
+
+      PortableServer::ObjectId_var oid =
+        root_poa->activate_object (roundtrip_impl
+                                   ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var roundtrip =
+        root_poa->id_to_reference (oid.in ()
+                                   ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::String_var ior =
+        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // If the ior_output_file exists, output the ior to it
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           ior_output_file),
+                          1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp b/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp
new file mode 100644
index 00000000000..72f83576b44
--- /dev/null
+++ b/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp
@@ -0,0 +1,26 @@
+//
+// $Id$
+//
+#include "Roundtrip.h"
+
+ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
+
+Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+Test::Timestamp
+Roundtrip::test_method (Test::Timestamp send_time
+                        ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return send_time;
+}
+
+void
+Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+}
diff --git a/TAO/performance-tests/Deferred_Latency/Roundtrip.h b/TAO/performance-tests/Deferred_Latency/Roundtrip.h
new file mode 100644
index 00000000000..efef33dd7e6
--- /dev/null
+++ b/TAO/performance-tests/Deferred_Latency/Roundtrip.h
@@ -0,0 +1,46 @@
+//
+// $Id$
+//
+
+#ifndef ROUNDTRIP_H
+#define ROUNDTRIP_H
+#include "ace/pre.h"
+
+#include "TestS.h"
+
+#if defined (_MSC_VER)
+# if (_MSC_VER >= 1200)
+#  pragma warning(push)
+# endif /* _MSC_VER >= 1200 */
+# pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
+/// Implement the Test::Roundtrip interface
+class Roundtrip
+  : public virtual POA_Test::Roundtrip
+  , public virtual PortableServer::RefCountServantBase
+{
+public:
+  /// Constructor
+  Roundtrip (CORBA::ORB_ptr orb);
+
+  // = The skeleton methods
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include "ace/post.h"
+#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Deferred_Latency/client.cpp b/TAO/performance-tests/Deferred_Latency/client.cpp
new file mode 100644
index 00000000000..8aa94d94172
--- /dev/null
+++ b/TAO/performance-tests/Deferred_Latency/client.cpp
@@ -0,0 +1,203 @@
+// $Id$
+
+#include "TestC.h"
+
+#include "tao/DynamicInterface/Request.h"
+
+#include "tao/Strategies/advanced_resource.h"
+
+#include "ace/Get_Opt.h"
+#include "ace/Sched_Params.h"
+#include "ace/High_Res_Timer.h"
+#include "ace/Sched_Params.h"
+#include "ace/Stats.h"
+#include "ace/Sample_History.h"
+
+ACE_RCSID(Deferred_Latency, client, "$Id$")
+
+const char *ior = "file://test.ior";
+int niterations = 1000;
+int burst = 10;
+int do_shutdown = 1;
+int do_dump_history = 0;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "hxk:i:b:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'h':
+        do_dump_history = 1;
+        break;
+
+      case 'x':
+        do_shutdown = 0;
+        break;
+
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case 'b':
+        burst = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "-i <niterations> "
+                           "-b <burst> "
+                           "-x (disable shutdown) "
+                           "-h (dump history) "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "client (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "client (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        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 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      Test::Roundtrip_var roundtrip =
+        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (roundtrip.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Nil Test::Roundtrip reference <%s>\n",
+                             ior),
+                            1);
+        }
+
+      for (int j = 0; j < 100; ++j)
+        {
+          ACE_hrtime_t start = 0;
+          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+
+      ACE_Sample_History history (niterations);
+
+      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
+
+      CORBA::Request_var *request;
+      ACE_NEW_RETURN (request, CORBA::Request_var[burst], 1);
+
+      for (int i = 0; i < niterations; ++i)
+        {
+          int j;
+
+          for (j = 0; j != burst; ++j)
+            {
+              CORBA::ULongLong start = ACE_OS::gethrtime ();
+
+              request[j] =
+                roundtrip->_request ("test_method"
+                                     ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+
+              request[j]->add_in_arg () <<= start;
+              request[j]->set_return_type (CORBA::_tc_ulonglong);
+
+              request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
+
+          for (j = 0; j != burst; ++j)
+            {
+              request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+
+              CORBA::ULongLong retval;
+              if ((request[j]->return_value () >>= retval) == 1)
+                {
+                  ACE_hrtime_t now = ACE_OS::gethrtime ();
+                  history.sample (now - retval);
+                }
+            }
+        }
+      delete[] request;
+
+      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
+
+      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
+
+      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
+      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_DEBUG ((LM_DEBUG, "done\n"));
+
+      if (do_dump_history)
+        {
+          history.dump_samples ("HISTORY", gsf);
+        }
+
+      ACE_Basic_Stats stats;
+      history.collect_basic_stats (stats);
+      stats.dump_results ("Total", gsf);
+
+      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
+                                             test_end - test_start,
+                                             stats.samples_count ());
+
+      if (do_shutdown)
+        {
+          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Caught exception:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/Deferred_Latency/server.cpp b/TAO/performance-tests/Deferred_Latency/server.cpp
new file mode 100644
index 00000000000..e96f0ff595a
--- /dev/null
+++ b/TAO/performance-tests/Deferred_Latency/server.cpp
@@ -0,0 +1,136 @@
+// $Id$
+
+#include "Roundtrip.h"
+#include "ace/Get_Opt.h"
+#include "ace/Sched_Params.h"
+
+#include "tao/Strategies/advanced_resource.h"
+
+ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
+
+const char *ior_output_file = "test.ior";
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "o:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
+                                                  priority);
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      Roundtrip *roundtrip_impl;
+      ACE_NEW_RETURN (roundtrip_impl,
+                      Roundtrip (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
+
+      Test::Roundtrip_var roundtrip =
+        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::String_var ior =
+        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // If the ior_output_file exists, output the ior to it
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           ior_output_file),
+                          1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
index 286b7d6282c..e26b101e25e 100644
--- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
+++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
@@ -75,7 +75,7 @@ set_rt_scheduling (void)
 void
 object_creation_test (PortableServer::POA_ptr poa,
                       int create_reference_with_id
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nCreating %d object references with %s\n",
@@ -102,14 +102,14 @@ object_creation_test (PortableServer::POA_ptr poa,
           object =
             poa->create_reference_with_id (oid.in (),
                                            "IDL:Test/Simple:1.0"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
         {
           object =
             poa->create_reference ("IDL:Test/Simple:1.0"
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -136,12 +136,12 @@ main (int argc, char *argv[])
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -151,14 +151,14 @@ main (int argc, char *argv[])
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -168,32 +168,32 @@ main (int argc, char *argv[])
 
       policies[0] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("TestPOA",
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       object_creation_test (root_poa.in (),
                             0  // POA::create_reference
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object_creation_test (child_poa.in (),
                             1  // POA::create_reference_with_id
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp
index 22f2bd9048f..9a013dadf0b 100644
--- a/TAO/performance-tests/POA/Demux/client.cpp
+++ b/TAO/performance-tests/POA/Demux/client.cpp
@@ -34,12 +34,12 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV;
     {
       int r = demux_test_client.init (argc, argv
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         return -1;
 
-      demux_test_client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      demux_test_client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
index a11e1675aea..5ff3035ce57 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
@@ -45,7 +45,7 @@ Demux_Test_Client::~Demux_Test_Client (void)
 
 int
 Demux_Test_Client::init (int argc, char *argv []
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -55,7 +55,7 @@ Demux_Test_Client::init (int argc, char *argv []
     {
       // get the underlying ORB
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (GET_ORB);
     }
   ACE_CATCHANY
@@ -102,13 +102,13 @@ Demux_Test_Client::init (int argc, char *argv []
         ACE_TRY_EX (IOR)
           {
             CORBA::Object_var objref = this->orb_->string_to_object (str
-                                                                     TAO_ENV_ARG_PARAMETER);
+                                                                     ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK_EX (IOR);
 
             // now narrow to Demux_Test object
 
             this->demux_test_[i][j] = Demux_Test::_narrow (objref.in ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
 
             ACE_TRY_CHECK_EX (IOR);
 
@@ -252,7 +252,7 @@ Demux_Test_Client::parse_args (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Client::run (TAO_ENV_SINGLE_ARG_DECL)
+Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   // open a temporary results file
   if ((this->result_fp_ = ACE_OS::fopen ("results.dat", "w")) == 0)
@@ -267,19 +267,19 @@ Demux_Test_Client::run (TAO_ENV_SINGLE_ARG_DECL)
       switch (this->is_)
         {
         case Demux_Test_Client::LINEAR:
-          (void) this->run_linear_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (void) this->run_linear_test (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RUN);
           break;
         case Demux_Test_Client::RANDOM:
-          (void) this->run_random_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (void) this->run_random_test (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RUN);
           break;
         case Demux_Test_Client::BEST:
-          (void) this->run_best_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (void) this->run_best_test (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RUN);
           break;
         case Demux_Test_Client::WORST:
-          (void) this->run_worst_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (void) this->run_worst_test (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RUN);
           break;
         }
@@ -301,7 +301,7 @@ Demux_Test_Client::run (TAO_ENV_SINGLE_ARG_DECL)
   ACE_TRY_EX (SHUTDOWN)
     {
       // call the shutdown method one the first object
-      this->demux_test_[0][0]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->demux_test_[0][0]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (SHUTDOWN);
     }
   ACE_CATCHANY
@@ -329,7 +329,7 @@ Demux_Test_Client::run (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Demux_Test_Client::run_linear_test (TAO_ENV_SINGLE_ARG_DECL)
+Demux_Test_Client::run_linear_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULong j, k, l, m;
   ACE_hrtime_t start, end;
@@ -342,7 +342,7 @@ Demux_Test_Client::run_linear_test (TAO_ENV_SINGLE_ARG_DECL)
             start = ACE_OS::gethrtime ();
 
             // invoke the method
-            this->op_db_[l].op_ (this->demux_test_[j][k].in () TAO_ENV_ARG_PARAMETER);
+            this->op_db_[l].op_ (this->demux_test_[j][k].in () ACE_ENV_ARG_PARAMETER);
 
             end = ACE_OS::gethrtime ();
 
@@ -355,7 +355,7 @@ Demux_Test_Client::run_linear_test (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Demux_Test_Client::run_random_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Demux_Test_Client::run_random_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Random test\n"));
@@ -363,7 +363,7 @@ Demux_Test_Client::run_random_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 int
-Demux_Test_Client::run_best_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Demux_Test_Client::run_best_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Best Test\n"));
@@ -371,7 +371,7 @@ Demux_Test_Client::run_best_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 int
-Demux_Test_Client::run_worst_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Demux_Test_Client::run_worst_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Worst test\n"));
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.h b/TAO/performance-tests/POA/Demux/demux_test_client.h
index a6ed4afce27..7b0a3714f32 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.h
@@ -38,7 +38,7 @@ public:
     WORST
   };
 
-  typedef void (*OP_PTR) (Demux_Test_ptr TAO_ENV_ARG_DECL_NOT_USED);
+  typedef void (*OP_PTR) (Demux_Test_ptr ACE_ENV_ARG_DECL_NOT_USED);
 
   struct Operation_DB_Entry
   {
@@ -51,10 +51,10 @@ public:
   ~Demux_Test_Client (void);
   // DTOR
 
-  int init (int argc, char *argv [] TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init (int argc, char *argv [] ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // initialize the client test bed
 
-  int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run the tests
 
 private:
@@ -65,16 +65,16 @@ private:
   int init_operation_db (void);
   // initialize the operation database
 
-  int run_linear_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run_linear_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run linear strategy
 
-  int run_random_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run_random_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run random strategy
 
-  int run_best_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run_best_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run best strategy (w.r.t to linear)
 
-  int run_worst_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run_worst_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run worst strategy (w.r.t to linear)
 
   int print_results (void);
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.i b/TAO/performance-tests/POA/Demux/demux_test_client.i
index 9a113cb2f85..0d2081ee78c 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.i
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.i
@@ -1,14 +1,14 @@
 //$Id$
 static void M302 (Demux_Test_ptr objref
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
-  objref->M302 (TAO_ENV_SINGLE_ARG_PARAMETER);
+  objref->M302 (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 static void shutdown (Demux_Test_ptr objref
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
-  objref->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  objref->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int Demux_Test_Client::init_operation_db (void)
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
index d20766f2711..c8810c36650 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
@@ -12,12 +12,12 @@ Demux_Test_i::Demux_Test_i (void)
 Demux_Test_i::~Demux_Test_i (void)
 {}
 
-void Demux_Test_i::M302 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+void Demux_Test_i::M302 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-void Demux_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+void Demux_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.h b/TAO/performance-tests/POA/Demux/demux_test_i.h
index ffa9d017ec2..6d302340364 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.h
@@ -24,15 +24,15 @@ public:
   // dtor
 
   // Return the Default POA of this Servant
-  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     };
 
-  virtual void M302 (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void M302 (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index ec61f957ee0..52c2607319b 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -46,7 +46,7 @@ Demux_Test_Server::~Demux_Test_Server (void)
 
 int
 Demux_Test_Server::init (int argc, char *argv []
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   printf ("here\n");
 
@@ -58,7 +58,7 @@ Demux_Test_Server::init (int argc, char *argv []
     {
       // get the underlying ORB
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX(GET_ORB);
     }
   ACE_CATCHANY
@@ -78,7 +78,7 @@ Demux_Test_Server::init (int argc, char *argv []
 
       temp =
         this->orb_->resolve_initial_references ("RootPOA"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX(GET_ROOT_POA);
       if (CORBA::is_nil (temp.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -87,7 +87,7 @@ Demux_Test_Server::init (int argc, char *argv []
 
       this->root_poa_ =
         PortableServer::POA::_narrow (temp.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (GET_ROOT_POA);
     }
   ACE_CATCHANY
@@ -104,7 +104,7 @@ Demux_Test_Server::init (int argc, char *argv []
     {
 
       this->poa_mgr_ =
-        this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (GET_POA_MGR);
     }
   ACE_CATCHANY
@@ -147,7 +147,7 @@ Demux_Test_Server::init (int argc, char *argv []
 
           policies[0] =
             this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
         }
       else
         {
@@ -156,7 +156,7 @@ Demux_Test_Server::init (int argc, char *argv []
 
           policies[0] =
             this->root_poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
         }
 
       ACE_TRY_CHECK_EX (POLICY);
@@ -169,7 +169,7 @@ Demux_Test_Server::init (int argc, char *argv []
 
           policies[1] =
             this->root_poa_->create_lifespan_policy (PortableServer::TRANSIENT
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
         }
       else
         {
@@ -178,7 +178,7 @@ Demux_Test_Server::init (int argc, char *argv []
 
           policies[1] =
             this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
         }
 
       ACE_TRY_CHECK_EX (POLICY);
@@ -230,7 +230,7 @@ Demux_Test_Server::init (int argc, char *argv []
           this->child_poa_[i] = prev_poa->create_POA (poa_name,
                                                       this->poa_mgr_.in (),
                                                       policies
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (CREATE_POA);
         }
       ACE_CATCHANY
@@ -258,7 +258,7 @@ Demux_Test_Server::init (int argc, char *argv []
 
                   //id = this->child_poa_[i]->activate_object (&this->demux_test_[j],
                   id = this->child_poa_[i]->activate_object (demux_test_i_ptr
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (ACTIVATE_OBJ);
                 }
               ACE_CATCHANY
@@ -274,11 +274,11 @@ Demux_Test_Server::init (int argc, char *argv []
               ACE_TRY_EX (IOR)
                 {
                   CORBA::Object_var demux_var = this->child_poa_[i]->id_to_reference (id.in ()
-                                                                                      TAO_ENV_ARG_PARAMETER);
+                                                                                      ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (IOR);
 
                   CORBA::String_var ior = this->orb_->object_to_string
-                    (demux_var.in () TAO_ENV_ARG_PARAMETER);
+                    (demux_var.in () ACE_ENV_ARG_PARAMETER);
 
                   ACE_TRY_CHECK_EX (IOR);
 
@@ -319,16 +319,16 @@ Demux_Test_Server::init (int argc, char *argv []
 
                   this->child_poa_[i]->activate_object_with_id (oid.in (),
                                                                 demux_test_i_ptr
-                                                                TAO_ENV_ARG_PARAMETER);
+                                                                ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   // Get Object reference for demux_test_i impl object.
-                  CORBA::Object_var demux_var = demux_test_i_ptr->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+                  CORBA::Object_var demux_var = demux_test_i_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 
                   ACE_TRY_CHECK;
 
                   CORBA::String_var ior = this->orb_->object_to_string
-                    (demux_var.in () TAO_ENV_ARG_PARAMETER);
+                    (demux_var.in () ACE_ENV_ARG_PARAMETER);
 
                   ACE_TRY_CHECK;
 
@@ -359,7 +359,7 @@ Demux_Test_Server::init (int argc, char *argv []
 
   ACE_TRY_EX (ACTIVATE)
     {
-      this->poa_mgr_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->poa_mgr_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK_EX (ACTIVATE);
     }
@@ -468,11 +468,11 @@ Demux_Test_Server::init_naming_service (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+Demux_Test_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h
index b0cc927ed31..588119e4e98 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.h
@@ -39,10 +39,10 @@ public:
   ~Demux_Test_Server (void);
   // dtor
 
-  int run (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Execute client code.
 
-  int init (int argc, char **argv TAO_ENV_ARG_DECL_NOT_USED);
+  int init (int argc, char **argv ACE_ENV_ARG_DECL_NOT_USED);
   // Initialize the communication endpoint with server.
 
   int calculate_avg_latency (void);
diff --git a/TAO/performance-tests/POA/Demux/server.cpp b/TAO/performance-tests/POA/Demux/server.cpp
index 27014a37cff..629bb31cf5f 100644
--- a/TAO/performance-tests/POA/Demux/server.cpp
+++ b/TAO/performance-tests/POA/Demux/server.cpp
@@ -34,13 +34,13 @@ int main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       int r =
-        demux_test_server.init (argc, argv TAO_ENV_ARG_PARAMETER);
+        demux_test_server.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
         return -1;
 
-      demux_test_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      demux_test_server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
index 88490f1c62e..048928657c2 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
@@ -12,7 +12,7 @@ Factory::Factory (CORBA::ORB_ptr orb)
 }
 
 Test::Simple_ptr
-Factory::create_simple_object (TAO_ENV_SINGLE_ARG_DECL)
+Factory::create_simple_object (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Simple *simple_impl;
@@ -23,12 +23,12 @@ Factory::create_simple_object (TAO_ENV_SINGLE_ARG_DECL)
 
   PortableServer::ServantBase_var owner_transfer(simple_impl);
 
-  return simple_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return simple_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Factory::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Factory::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);
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.h b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
index 69967f06580..52e9055f912 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
@@ -26,10 +26,10 @@ public:
 
   // = The skeleton methods
 
-  virtual Test::Simple_ptr create_simple_object (TAO_ENV_SINGLE_ARG_DECL)
+  virtual Test::Simple_ptr create_simple_object (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
index 6ff7ad5edb4..f15b8b826ff 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
@@ -10,16 +10,16 @@ Simple::Simple (void)
 }
 
 void
-Simple::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Simple::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.h b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
index a0a6059ef09..d3dffbde564 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
@@ -26,7 +26,7 @@ public:
 
   // = The skeleton methods
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
index d01a1f9bc01..14da618907c 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
@@ -80,18 +80,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->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Factory_var factory =
-        Test::Factory::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test::Factory::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -117,7 +117,7 @@ main (int argc, char *argv[])
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
           references[i] =
-            factory->create_simple_object (TAO_ENV_SINGLE_ARG_PARAMETER);
+            factory->create_simple_object (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          references[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          references[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -160,7 +160,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          factory->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          factory->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
index 45be6a48f92..2a79b9ce374 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
@@ -72,11 +72,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -85,14 +85,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
           PortableServer::ServantBase_var owner_transfer(simple_impl);
 
           references[i] =
-            simple_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+            simple_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -143,7 +143,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          references[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          references[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -160,10 +160,10 @@ main (int argc, char *argv[])
       destruction.collect_basic_stats (destruction_stats);
       destruction_stats.dump_results ("Destruction", gsf);
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
index 97ae513f2e5..89252e82dbd 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
@@ -62,11 +62,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -75,11 +75,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -92,11 +92,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(factory_impl);
 
       Test::Factory_var factory =
-        factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (factory.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (factory.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -109,18 +109,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index ecb844d0187..a0c3544bc95 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -243,7 +243,7 @@ private:
 
 void
 child_poa_testing (PortableServer::POA_ptr root_poa
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   // Policies for the child POA.
   CORBA::PolicyList policies (1);
@@ -252,7 +252,7 @@ child_poa_testing (PortableServer::POA_ptr root_poa
   // Id Assignment Policy
   policies[0] =
     root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the child POA under the RootPOA.
@@ -260,7 +260,7 @@ child_poa_testing (PortableServer::POA_ptr root_poa
     root_poa->create_POA ("child POA",
                           PortableServer::POAManager::_nil (),
                           policies
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create an array of servants
@@ -299,7 +299,7 @@ child_poa_testing (PortableServer::POA_ptr root_poa
         objects[i] =
           child_poa->create_reference_with_id (object_ids[i].in (),
                                                "IDL:test:1.0"
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -314,7 +314,7 @@ child_poa_testing (PortableServer::POA_ptr root_poa
       {
         child_poa->activate_object_with_id (object_ids[i].in (),
                                             &servants[i]
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -328,7 +328,7 @@ child_poa_testing (PortableServer::POA_ptr root_poa
     for (i = 0; i < iterations; i++)
       {
         child_poa->deactivate_object (object_ids[i].in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -342,7 +342,7 @@ child_poa_testing (PortableServer::POA_ptr root_poa
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -350,7 +350,7 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -359,13 +359,13 @@ main (int argc, char **argv)
 
       // Obtain the RootPOA.
       CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"
-                                                               TAO_ENV_ARG_PARAMETER);
+                                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create an array of servants
@@ -395,7 +395,7 @@ main (int argc, char **argv)
 
         for (i = 0; i < iterations; i++)
           {
-            objects[i] = servants[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+            objects[i] = servants[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
       }
@@ -408,20 +408,20 @@ main (int argc, char **argv)
         for (i = 0; i < iterations; i++)
           {
             object_ids[i] = root_poa->servant_to_id (&servants[i]
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
       }
 
       // Create the child POA.
       child_poa_testing (root_poa.in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy RootPOA.
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Cleanup
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
index 060dcfb62f8..3f5332de63a 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -165,12 +165,12 @@ PP_Test_Client::parse_args (void)
 void
 PP_Test_Client::send_oneway (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_ONEWAY_START);
-      this->objref_->send_oneway (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->objref_->send_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->call_count_++;
     }
@@ -190,12 +190,12 @@ PP_Test_Client::send_oneway (void)
 void
 PP_Test_Client::send_void (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_VOID_START);
-      this->objref_->send_void (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->objref_->send_void (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->call_count_++;
     }
@@ -259,7 +259,7 @@ PP_Test_Client::run ()
 int
 PP_Test_Client::shutdown_server (int do_shutdown)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -268,7 +268,7 @@ PP_Test_Client::shutdown_server (int do_shutdown)
           ACE_DEBUG ((LM_DEBUG,
                       "shutdown on Pluggable_Test object\n"));
 
-          this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->objref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -290,7 +290,7 @@ PP_Test_Client::shutdown_server (int do_shutdown)
 int
 PP_Test_Client::run_oneway (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -312,7 +312,7 @@ PP_Test_Client::run_oneway (void)
 
           ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
 
-          this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->objref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
@@ -333,7 +333,7 @@ PP_Test_Client::run_oneway (void)
 int
 PP_Test_Client::run_void (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -355,7 +355,7 @@ PP_Test_Client::run_void (void)
 
           ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
 
-          this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->objref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
@@ -404,7 +404,7 @@ PP_Test_Client::init (int argc, char **argv)
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     "internet"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -422,12 +422,12 @@ PP_Test_Client::init (int argc, char **argv)
 
       CORBA::Object_var factory_object =
         this->orb_->string_to_object (this->factory_key_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->factory_ =
         Pluggable_Test_Factory::_narrow (factory_object.in()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->factory_.in ()))
@@ -444,7 +444,7 @@ PP_Test_Client::init (int argc, char **argv)
       // Now retrieve the Pluggable_Test obj ref corresponding to the key.
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_MAKE_PLUGGABLE_START);
 
-      this->objref_ = this->factory_->make_pluggable_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->objref_ = this->factory_->make_pluggable_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->objref_.in ()))
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index c52492bca10..a9cb9133e53 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -49,14 +49,14 @@ PP_Test_Server::parse_args (void)
 int
 PP_Test_Server::init (int argc,
                       char** argv
-                      TAO_ENV_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
+                      ACE_ENV_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
                                          "child_poa"
-                                         TAO_ENV_ARG_PARAMETER) == -1)
+                                         ACE_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -79,7 +79,7 @@ PP_Test_Server::init (int argc,
   this->factory_id_ =
     this->orb_manager_.activate_under_child_poa ("factory",
                                                  this->factory_impl_
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -99,9 +99,9 @@ PP_Test_Server::init (int argc,
 }
 
 int
-PP_Test_Server::run (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
+PP_Test_Server::run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER)
 {
-  int result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int result = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.h b/TAO/performance-tests/Pluggable/PP_Test_Server.h
index 4be6dcaf311..f655b98caf0 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.h
@@ -50,10 +50,10 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the server state - parsing arguments, etc.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.cpp b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
index 25664e6986d..ac057c96481 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
@@ -38,7 +38,7 @@ static const char *PP_Test_i_Timeprobe_Description[] =
 
 enum
 {
-  // Timeprobe description table start key 
+  // Timeprobe description table start key
   PP_TEST_I_SEND_ONEWAY_START = 10100,
   PP_TEST_I_SEND_ONEWAY_END,
 
@@ -72,11 +72,11 @@ Pluggable_Test_Factory_i::~Pluggable_Test_Factory_i (void)
 }
 
 Pluggable_Test_ptr
-Pluggable_Test_Factory_i::make_pluggable_test (TAO_ENV_SINGLE_ARG_DECL)
+Pluggable_Test_Factory_i::make_pluggable_test (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_MAKE_PLUGGABLE_START);
-  return my_pluggable_test_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return my_pluggable_test_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // Constructor
@@ -95,7 +95,7 @@ PP_Test_i::~PP_Test_i (void)
 // Oneway send
 
 void
-PP_Test_i::send_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+PP_Test_i::send_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_ONEWAY_START);
@@ -104,7 +104,7 @@ PP_Test_i::send_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 // Twoway send
 
 void
-PP_Test_i::send_void (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+PP_Test_i::send_void (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_VOID_START);
@@ -112,7 +112,7 @@ PP_Test_i::send_void (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 // Shutdown.
 
-void PP_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+void PP_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.h b/TAO/performance-tests/Pluggable/PP_Test_i.h
index 2c439e97528..1e866bb103b 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.h
@@ -34,15 +34,15 @@ public:
   ~PP_Test_i (void);
   // Destructor
 
-  virtual void send_oneway (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void send_oneway (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a oneway call.
 
-  virtual void send_void (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void send_void (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a twoway call.
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown routine.
 
@@ -65,7 +65,7 @@ public:
   ~Pluggable_Test_Factory_i (void);
   // Destructor.
 
-  virtual Pluggable_Test_ptr make_pluggable_test (TAO_ENV_SINGLE_ARG_DECL)
+  virtual Pluggable_Test_ptr make_pluggable_test (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Make a Pluggable Test object.
 
diff --git a/TAO/performance-tests/Pluggable/server.cpp b/TAO/performance-tests/Pluggable/server.cpp
index 99b513899e8..6d781f12420 100644
--- a/TAO/performance-tests/Pluggable/server.cpp
+++ b/TAO/performance-tests/Pluggable/server.cpp
@@ -15,13 +15,13 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tPluggable_Test: server\n\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       int status = pp_test_server.init (argc,
                                         argv
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == -1)
@@ -32,7 +32,7 @@ main (int argc, char *argv[])
         }
       else
         {
-          pp_test_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          pp_test_server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
index 3c40536d884..706289d63f9 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(Latency, test_i, "$Id$")
 
 void
 Test_i::test_method (CORBA::Long id
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -23,16 +23,16 @@ Test_i::test_method (CORBA::Long id
 
 void
 Test_i::shutdown (const char *orb_id
-                  TAO_ENV_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
+                  ACE_ENV_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int argc = 0;
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         0,
                                         orb_id
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  orb->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  orb->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
index a3d93fa6f2d..2a3de616b96 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
@@ -32,11 +32,11 @@ public:
 
   // = The Test methods.
   void test_method (CORBA::Long id
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void shutdown (const char *orb_id
-                 TAO_ENV_ARG_DECL_NOT_USED)
+                 ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index ab4e491160b..971444dd810 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       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)
@@ -150,12 +150,12 @@ main (int argc, char *argv[])
       // Obtain Priority Mapping used by the ORB.
       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 (CORBA::is_nil (mapping_manager.in ()))
@@ -260,11 +260,11 @@ Client::svc (void)
                        priorities[this->id_]);
 
       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 ()))
@@ -282,11 +282,11 @@ Client::svc (void)
         {
           /* CORBA::PolicyList_var pols;
           server->_validate_connection (pols.out ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
           */
 
           server->test_method (this->id_
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -301,7 +301,7 @@ Client::svc (void)
 
           // Invoke method.
           server->test_method (this->id_
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Grab timestamp again.
@@ -320,7 +320,7 @@ Client::svc (void)
 
       /* char orb_name[50];
       ACE_OS::sprintf (orb_name, "%d", priorities[this->id_]);
-      server->shutdown (orb_name TAO_ENV_ARG_PARAMETER);
+      server->shutdown (orb_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;*/
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
index 3ed70825ae0..2b54912aca0 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
       int argc_ = argc;
       for (int i = 0; i < argc; ++i)
         argv_[i] = argv[i];
-      orb = CORBA::ORB_init (argc_, argv_, "" TAO_ENV_ARG_PARAMETER);
+      orb = CORBA::ORB_init (argc_, argv_, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the arguments.
@@ -130,12 +130,12 @@ main (int argc, char *argv[])
       // Obtain Priority Mapping used by the ORB.
       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 (CORBA::is_nil (mapping_manager.in ()))
@@ -214,11 +214,11 @@ Server::svc (void)
       char orb_name[64];
       ACE_OS::sprintf (orb_name, "%d", this->priority_);
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc_, argv_, orb_name TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc_, argv_, orb_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -227,23 +227,23 @@ Server::svc (void)
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       PortableServer::ObjectId_var oid =
-        root_poa->activate_object (this->server_ TAO_ENV_ARG_PARAMETER);
+        root_poa->activate_object (this->server_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        root_poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER);
+        root_poa->id_to_reference (oid.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -266,10 +266,10 @@ Server::svc (void)
       ACE_OS::fclose (output_file);
 
       // Start 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;
 
     }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index febe0cde286..d128bcd1ae9 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -141,18 +141,18 @@ main (int argc, char *argv[])
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       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 ()))
@@ -165,12 +165,12 @@ main (int argc, char *argv[])
 
       // Obtain Priority Mapping used by the ORB.
       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 (CORBA::is_nil (mapping_manager.in ()))
@@ -222,7 +222,7 @@ main (int argc, char *argv[])
         }
       throughput.dump_results ("Aggregated", gsf);
 
-      server->shutdown ("" TAO_ENV_ARG_PARAMETER);
+      server->shutdown ("" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -286,11 +286,11 @@ Client::svc (void)
         {
           /*    CORBA::PolicyList_var pols;
           server_->_validate_connection (pols.out ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           */
 
           server_->test_method (this->id_
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -305,7 +305,7 @@ Client::svc (void)
 
           // Invoke method.
           server_->test_method (this->id_
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Grab timestamp again.
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
index 5a7a5f2aea7..7b623eadc7e 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
@@ -59,11 +59,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -72,11 +72,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -85,11 +85,11 @@ main (int argc, char *argv[])
       Test_i server_impl;
 
       Test_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -107,10 +107,10 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index 58b3e73585e..1f7ef7a756a 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -135,7 +135,7 @@ print_params (void)
 
 static void
 twoway_work_test (Test_ptr server
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
 #if defined (USING_TIMERS)
   ACE_Throughput_Stats latency;
@@ -156,7 +156,7 @@ twoway_work_test (Test_ptr server
 #endif /* USING_TIMERS */
 
       server->twoway_work_test (work
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
 #if defined (USING_TIMERS)
@@ -180,7 +180,7 @@ twoway_work_test (Test_ptr server
 
 static void
 oneway_work_test (Test_ptr server
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
 #if defined (USING_TIMERS)
   ACE_Throughput_Stats latency;
@@ -201,7 +201,7 @@ oneway_work_test (Test_ptr server
 #endif /* USING_TIMERS */
 
       server->oneway_work_test (work
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
 #if defined (USING_TIMERS)
@@ -225,7 +225,7 @@ oneway_work_test (Test_ptr server
 
 static void
 oneway_payload_test (Test_ptr server
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
 #if defined (USING_TIMERS)
   ACE_Throughput_Stats latency;
@@ -249,7 +249,7 @@ oneway_payload_test (Test_ptr server
 #endif /* USING_TIMERS */
 
       server->oneway_payload_test (the_data
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
 #if defined (USING_TIMERS)
@@ -432,7 +432,7 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the command line options.
@@ -445,30 +445,30 @@ main (int argc, char *argv[])
 
       CORBA::Object_var obj =
         orb->resolve_initial_references ("ORBPolicyManager"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
         CORBA::PolicyManager::_narrow (obj.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       obj = orb->resolve_initial_references ("PolicyCurrent"
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyCurrent_var policy_current =
         CORBA::PolicyCurrent::_narrow (obj.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       obj = orb->string_to_object (ior
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var server = Test::_narrow (obj.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print testing parameters.
@@ -478,7 +478,7 @@ main (int argc, char *argv[])
       if (test_twoway)
         {
           twoway_work_test (server.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -495,7 +495,7 @@ main (int argc, char *argv[])
           sync_scope_policy_list[0] =
             orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                                 sync_scope_any
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           switch (level)
@@ -504,7 +504,7 @@ main (int argc, char *argv[])
               // Set the sync scope policy at the ORB level.
               policy_manager->set_policy_overrides (sync_scope_policy_list,
                                                     CORBA::ADD_OVERRIDE
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
 
@@ -512,7 +512,7 @@ main (int argc, char *argv[])
               // Set the sync scope policy at the thread level.
               policy_current->set_policy_overrides (sync_scope_policy_list,
                                                     CORBA::ADD_OVERRIDE
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
 
@@ -520,12 +520,12 @@ main (int argc, char *argv[])
               // Set the sync scope policy at the object level.
               obj = server->_set_policy_overrides (sync_scope_policy_list,
                                                    CORBA::ADD_OVERRIDE
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Get the new object reference with the updated policy.
               server = Test::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
 
@@ -534,7 +534,7 @@ main (int argc, char *argv[])
           }
 
           // We are done with this policy.
-          sync_scope_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          sync_scope_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Are we buffering the oneway requests?
@@ -558,32 +558,32 @@ main (int argc, char *argv[])
               buffering_constraint_policy_list[0] =
                 orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
                                     buffering_constraint_any
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Set up the constraints (at the object level).
               obj = server->_set_policy_overrides (buffering_constraint_policy_list,
                                                    CORBA::ADD_OVERRIDE
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // We are done with this policy.
-              buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              buffering_constraint_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Get the new object reference with the updated policy.
               server = Test::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
           // Run the oneway test.
           if (payload_test)
             oneway_payload_test (server.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           else
             oneway_work_test (server.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -592,7 +592,7 @@ main (int argc, char *argv[])
           ACE_DEBUG ((LM_DEBUG,
                       "\nShutting down server\n"));
 
-          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -602,7 +602,7 @@ main (int argc, char *argv[])
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
index 89bc9f56bd4..b23da7d1bb9 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
@@ -95,7 +95,7 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the command line options.
@@ -108,27 +108,27 @@ main (int argc, char *argv[])
 
       CORBA::Object_var poa_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 (poa_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;
 
       Test_i server_impl (orb.in ());
 
       Test_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -149,17 +149,17 @@ main (int argc, char *argv[])
 
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
index 17c0cfa9726..3062b3b2402 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
@@ -11,7 +11,7 @@ ACE_RCSID(Reliable, test_i, "$Id$")
 
 void
 Test_i::oneway_work_test (CORBA::ULong work
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < work; i++)
@@ -25,14 +25,14 @@ Test_i::oneway_work_test (CORBA::ULong work
 
 void
 Test_i::oneway_payload_test (const Test::data &
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Test_i::twoway_work_test (CORBA::ULong work
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < work; i++)
@@ -45,9 +45,9 @@ Test_i::twoway_work_test (CORBA::ULong work
 }
 
 void
-Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
+Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED ACE_ENV_SINGLE_ARG_PARAMETER)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
index 2ef26b8c187..0359d3c1fa3 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
@@ -32,18 +32,18 @@ public:
 
   // = The Test methods.
   void oneway_payload_test (const Test::data &d
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void oneway_work_test (CORBA::ULong work
-                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void twoway_work_test (CORBA::ULong work
-                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index a45471a31a4..1c565863857 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -249,7 +249,7 @@ start_synchronization (test_ptr test,
         {
           test->method (work,
                         prime_number
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -358,7 +358,7 @@ max_throughput (test_ptr test,
   ACE_TRY_NEW_ENV
     {
       CORBA_priority =
-        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Boolean result =
@@ -387,7 +387,7 @@ max_throughput (test_ptr test,
 
           test->method (work,
                         prime_number
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ++calls_made;
@@ -430,9 +430,9 @@ public:
 
   int svc (void);
   ACE_hrtime_t deadline_for_current_call (CORBA::ULong i);
-  void reset_priority (TAO_ENV_SINGLE_ARG_DECL);
+  void reset_priority (ACE_ENV_SINGLE_ARG_DECL);
   void print_stats (ACE_hrtime_t test_end);
-  int setup (TAO_ENV_SINGLE_ARG_DECL);
+  int setup (ACE_ENV_SINGLE_ARG_DECL);
   void missed_start_deadline (CORBA::ULong invocation);
   void missed_end_deadline (CORBA::ULong invocation);
 
@@ -483,18 +483,18 @@ Paced_Worker::Paced_Worker (ACE_Thread_Manager &thread_manager,
 }
 
 void
-Paced_Worker::reset_priority (TAO_ENV_SINGLE_ARG_DECL)
+Paced_Worker::reset_priority (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (set_priority)
     {
       this->current_->the_priority (this->priority_
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->current_->the_priority (continuous_worker_priority
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -600,16 +600,16 @@ Paced_Worker::print_stats (ACE_hrtime_t test_end)
 }
 
 int
-Paced_Worker::setup (TAO_ENV_SINGLE_ARG_DECL)
+Paced_Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (priority_setting == AFTER_THREAD_CREATION)
     {
-      this->reset_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->reset_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
   this->CORBA_priority_ =
-    this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Boolean result =
@@ -647,7 +647,7 @@ Paced_Worker::svc (void)
   ACE_TRY_NEW_ENV
     {
       int result =
-        this->setup (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->setup (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -671,7 +671,7 @@ Paced_Worker::svc (void)
 
           this->test_->method (work,
                                prime_number
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t time_after_call =
@@ -725,7 +725,7 @@ public:
   int svc (void);
   void print_stats (ACE_Sample_History &history,
                     ACE_hrtime_t test_end);
-  int setup (TAO_ENV_SINGLE_ARG_DECL);
+  int setup (ACE_ENV_SINGLE_ARG_DECL);
   void print_collective_stats (void);
 
   test_var test_;
@@ -827,17 +827,17 @@ Continuous_Worker::print_collective_stats (void)
 }
 
 int
-Continuous_Worker::setup (TAO_ENV_SINGLE_ARG_DECL)
+Continuous_Worker::setup (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (priority_setting == AFTER_THREAD_CREATION)
     {
       this->current_->the_priority (continuous_worker_priority
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
   this->CORBA_priority_ =
-    this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Boolean result =
@@ -862,7 +862,7 @@ Continuous_Worker::svc (void)
       ACE_Sample_History history (this->iterations_);
 
       int result =
-        this->setup (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->setup (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -876,7 +876,7 @@ Continuous_Worker::svc (void)
 
           this->test_->method (work,
                                prime_number
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -911,7 +911,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 =
@@ -922,31 +922,31 @@ main (int argc, char *argv[])
       fudge_priorities (orb.in ());
 
       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;
 
       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;
 
       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 &priority_mapping =
@@ -1145,7 +1145,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/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
index ba0290feaa6..1521f88ee83 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
@@ -22,13 +22,13 @@ public:
 
   void method (CORBA::ULong work,
                CORBA::ULong prime_number
-               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));
 
-  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   CORBA::ORB_var orb_;
@@ -45,7 +45,7 @@ test_i::test_i (CORBA::ORB_ptr orb,
 void
 test_i::method (CORBA::ULong work,
                 CORBA::ULong prime_number
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -60,17 +60,17 @@ test_i::method (CORBA::ULong work,
 }
 
 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;
 }
 
@@ -170,11 +170,11 @@ int
 write_ior_to_file (const char *ior_file,
                    CORBA::ORB_ptr orb,
                    CORBA::Object_ptr object
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   CORBA::String_var ior =
     orb->object_to_string (object
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   FILE *output_file =
@@ -205,47 +205,47 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       fudge_priorities (orb.in ());
 
       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;
 
       default_thread_priority =
-        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -273,7 +273,7 @@ main (int argc, char *argv[])
                                              max_request_buffer_size,
                                              allow_borrowing,
                                              policies
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (ACE_OS::strcmp (lanes_file, "empty-file") != 0)
@@ -290,7 +290,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)
@@ -301,7 +301,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)
@@ -321,13 +321,13 @@ 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;
 
           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_TRY_CHECK;
 
           if (ACE_OS::strcmp (bands_file, "empty-file") != 0)
@@ -337,7 +337,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)
@@ -349,21 +349,21 @@ main (int argc, char *argv[])
       policies[policies.length () - 1] =
         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);
       policies[policies.length () - 1] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                               default_thread_priority
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
         root_poa->create_POA ("RT POA",
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_i *servant =
@@ -374,26 +374,26 @@ main (int argc, char *argv[])
       ACE_UNUSED_ARG (safe_servant);
 
       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 (ior_output_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;
 
-      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/performance-tests/Single_Threaded_Latency/Roundtrip.cpp b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp
new file mode 100644
index 00000000000..72f83576b44
--- /dev/null
+++ b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp
@@ -0,0 +1,26 @@
+//
+// $Id$
+//
+#include "Roundtrip.h"
+
+ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
+
+Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+Test::Timestamp
+Roundtrip::test_method (Test::Timestamp send_time
+                        ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return send_time;
+}
+
+void
+Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+}
diff --git a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h
new file mode 100644
index 00000000000..efef33dd7e6
--- /dev/null
+++ b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h
@@ -0,0 +1,46 @@
+//
+// $Id$
+//
+
+#ifndef ROUNDTRIP_H
+#define ROUNDTRIP_H
+#include "ace/pre.h"
+
+#include "TestS.h"
+
+#if defined (_MSC_VER)
+# if (_MSC_VER >= 1200)
+#  pragma warning(push)
+# endif /* _MSC_VER >= 1200 */
+# pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
+/// Implement the Test::Roundtrip interface
+class Roundtrip
+  : public virtual POA_Test::Roundtrip
+  , public virtual PortableServer::RefCountServantBase
+{
+public:
+  /// Constructor
+  Roundtrip (CORBA::ORB_ptr orb);
+
+  // = The skeleton methods
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include "ace/post.h"
+#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Single_Threaded_Latency/client.cpp b/TAO/performance-tests/Single_Threaded_Latency/client.cpp
new file mode 100644
index 00000000000..2d841b9909d
--- /dev/null
+++ b/TAO/performance-tests/Single_Threaded_Latency/client.cpp
@@ -0,0 +1,164 @@
+// $Id$
+
+#include "TestC.h"
+#include "ace/Get_Opt.h"
+#include "ace/High_Res_Timer.h"
+#include "ace/Sched_Params.h"
+#include "ace/Stats.h"
+#include "ace/Sample_History.h"
+
+#include "tao/Strategies/advanced_resource.h"
+
+ACE_RCSID(Single_Threaded_Latency, client, "$Id$")
+
+const char *ior = "file://test.ior";
+int niterations = 100;
+int do_dump_history = 0;
+int do_shutdown = 1;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'h':
+        do_dump_history = 1;
+        break;
+
+      case 'x':
+        do_shutdown = 0;
+        break;
+
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "-i <niterations> "
+                           "-x (disable shutdown) "
+                           "-h (dump history) "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "client (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "client (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        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 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      Test::Roundtrip_var roundtrip =
+        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (roundtrip.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Nil Test::Roundtrip reference <%s>\n",
+                             ior),
+                            1);
+        }
+
+      for (int j = 0; j < 100; ++j)
+        {
+          ACE_hrtime_t start = 0;
+          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+
+      ACE_Sample_History history (niterations);
+
+      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
+      for (int i = 0; i < niterations; ++i)
+        {
+          ACE_hrtime_t start = ACE_OS::gethrtime ();
+
+          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          ACE_hrtime_t now = ACE_OS::gethrtime ();
+          history.sample (now - start);
+        }
+
+      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
+
+      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
+
+      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
+      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_DEBUG ((LM_DEBUG, "done\n"));
+
+      if (do_dump_history)
+        {
+          history.dump_samples ("HISTORY", gsf);
+        }
+
+      ACE_Basic_Stats stats;
+      history.collect_basic_stats (stats);
+      stats.dump_results ("Total", gsf);
+
+      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
+                                             test_end - test_start,
+                                             stats.samples_count ());
+
+      if (do_shutdown)
+        {
+          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/Single_Threaded_Latency/server.cpp b/TAO/performance-tests/Single_Threaded_Latency/server.cpp
new file mode 100644
index 00000000000..e96f0ff595a
--- /dev/null
+++ b/TAO/performance-tests/Single_Threaded_Latency/server.cpp
@@ -0,0 +1,136 @@
+// $Id$
+
+#include "Roundtrip.h"
+#include "ace/Get_Opt.h"
+#include "ace/Sched_Params.h"
+
+#include "tao/Strategies/advanced_resource.h"
+
+ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
+
+const char *ior_output_file = "test.ior";
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "o:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
+                                                  priority);
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      Roundtrip *roundtrip_impl;
+      ACE_NEW_RETURN (roundtrip_impl,
+                      Roundtrip (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
+
+      Test::Roundtrip_var roundtrip =
+        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::String_var ior =
+        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // If the ior_output_file exists, output the ior to it
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           ior_output_file),
+                          1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp
new file mode 100644
index 00000000000..09d15331436
--- /dev/null
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp
@@ -0,0 +1,65 @@
+//
+// $Id$
+//
+#include "Client_Task.h"
+
+ACE_RCSID(Thread_Per_Connection_Latency, Client_Task, "$Id$")
+
+Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
+                          int niterations)
+  : roundtrip_ (Test::Roundtrip::_duplicate (roundtrip))
+  , niterations_ (niterations)
+{
+}
+
+int
+Client_Task::svc (void)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      for (int i = 0; i != this->niterations_; ++i)
+        {
+          CORBA::ULongLong start = ACE_OS::gethrtime ();
+
+          (void) this->roundtrip_->test_method (start ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          ACE_hrtime_t now = ACE_OS::gethrtime ();
+          this->latency_.sample (now - start);
+        }
+    }
+  ACE_CATCHANY
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+  return 0;
+}
+
+void
+Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
+                                  const char *msg,
+                                  ACE_UINT32 gsf)
+{
+  totals.accumulate (this->latency_);
+  this->latency_.dump_results (msg, gsf);
+}
+
+void
+Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+{
+  CORBA::ULongLong dummy = 0;
+  for (int i = 0; i != 100; ++i)
+    {
+      ACE_TRY
+        {
+          (void) this->roundtrip_->test_method (dummy ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY {} ACE_ENDTRY;
+    }
+}
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h
new file mode 100644
index 00000000000..ffc4e9d6b6a
--- /dev/null
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h
@@ -0,0 +1,46 @@
+//
+// $Id$
+//
+
+#ifndef CLIENT_TASK_H
+#define CLIENT_TASK_H
+#include "ace/pre.h"
+
+#include "TestC.h"
+#include "ace/Task.h"
+#include "ace/Basic_Stats.h"
+
+/// Implement the Test::Client_Task interface
+class Client_Task : public ACE_Task_Base
+{
+public:
+  /// Constructor
+  Client_Task (Test::Roundtrip_ptr roundtrip,
+               int niterations);
+
+  /// Add this thread results to the global numbers and print the
+  /// per-thread results.
+  void accumulate_and_dump (ACE_Basic_Stats &totals,
+                            const char *msg,
+                            ACE_UINT32 gsf);
+
+  /// The service method
+  virtual int svc (void);
+
+private:
+  /// Make sure that the current thread has a connection available.
+  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
+
+private:
+  /// The object reference used for this test
+  Test::Roundtrip_var roundtrip_;
+
+  /// The number of iterations
+  int niterations_;
+
+  /// Keep track of the latency (minimum, average, maximum and jitter)
+  ACE_Basic_Stats latency_;
+};
+
+#include "ace/post.h"
+#endif /* CLIENT_TASK_H */
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp
new file mode 100644
index 00000000000..2bc67948fd0
--- /dev/null
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp
@@ -0,0 +1,26 @@
+//
+// $Id$
+//
+#include "Roundtrip.h"
+
+ACE_RCSID(Single_Per_Connection_Latency, Roundtrip, "$Id$")
+
+Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+Test::Timestamp
+Roundtrip::test_method (Test::Timestamp send_time
+                        ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return send_time;
+}
+
+void
+Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+}
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h
new file mode 100644
index 00000000000..efef33dd7e6
--- /dev/null
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h
@@ -0,0 +1,46 @@
+//
+// $Id$
+//
+
+#ifndef ROUNDTRIP_H
+#define ROUNDTRIP_H
+#include "ace/pre.h"
+
+#include "TestS.h"
+
+#if defined (_MSC_VER)
+# if (_MSC_VER >= 1200)
+#  pragma warning(push)
+# endif /* _MSC_VER >= 1200 */
+# pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
+/// Implement the Test::Roundtrip interface
+class Roundtrip
+  : public virtual POA_Test::Roundtrip
+  , public virtual PortableServer::RefCountServantBase
+{
+public:
+  /// Constructor
+  Roundtrip (CORBA::ORB_ptr orb);
+
+  // = The skeleton methods
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include "ace/post.h"
+#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp
new file mode 100644
index 00000000000..69aac2b4ca5
--- /dev/null
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp
@@ -0,0 +1,149 @@
+// $Id$
+
+#include "Client_Task.h"
+#include "ace/Get_Opt.h"
+#include "ace/High_Res_Timer.h"
+#include "ace/Sched_Params.h"
+#include "ace/Stats.h"
+
+#include "tao/Strategies/advanced_resource.h"
+
+ACE_RCSID(Thread_Per_Connection_Latency, client, "$Id$")
+
+const char *ior = "file://test.ior";
+int niterations = 1000;
+int do_shutdown = 1;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "xk:i:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'x':
+        do_shutdown = 0;
+        break;
+
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "-i <niterations> "
+                           "-x (disable shutdown) "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "client (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "client (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        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 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      Test::Roundtrip_var roundtrip =
+        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (roundtrip.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Nil Test::Roundtrip reference <%s>\n",
+                             ior),
+                            1);
+        }
+
+      ACE_DEBUG ((LM_DEBUG, "Starting threads\n"));
+
+      Client_Task task0(roundtrip.in (), niterations);
+      Client_Task task1(roundtrip.in (), niterations);
+      Client_Task task2(roundtrip.in (), niterations);
+      Client_Task task3(roundtrip.in (), niterations);
+
+      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
+      task0.activate(THR_NEW_LWP | THR_JOINABLE);
+      task1.activate(THR_NEW_LWP | THR_JOINABLE);
+      task2.activate(THR_NEW_LWP | THR_JOINABLE);
+      task3.activate(THR_NEW_LWP | THR_JOINABLE);
+
+      task0.thr_mgr()->wait ();
+      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
+
+      ACE_DEBUG ((LM_DEBUG, "Threads finished\n"));
+
+      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
+      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_DEBUG ((LM_DEBUG, "done\n"));
+
+      ACE_Basic_Stats totals;
+      task0.accumulate_and_dump (totals, "Task[0]", gsf);
+      task1.accumulate_and_dump (totals, "Task[1]", gsf);
+      task2.accumulate_and_dump (totals, "Task[2]", gsf);
+      task3.accumulate_and_dump (totals, "Task[3]", gsf);
+
+      totals.dump_results ("Total", gsf);
+
+      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
+                                             test_end - test_start,
+                                             totals.samples_count ());
+
+      if (do_shutdown)
+        {
+          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp
new file mode 100644
index 00000000000..004ce70cebf
--- /dev/null
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp
@@ -0,0 +1,136 @@
+// $Id$
+
+#include "Roundtrip.h"
+#include "ace/Get_Opt.h"
+#include "ace/Sched_Params.h"
+
+#include "tao/Strategies/advanced_resource.h"
+
+ACE_RCSID(Thread_Per_Connection_Latency, server, "$Id$")
+
+const char *ior_output_file = "test.ior";
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "o:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
+                                                  priority);
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      Roundtrip *roundtrip_impl;
+      ACE_NEW_RETURN (roundtrip_impl,
+                      Roundtrip (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
+
+      Test::Roundtrip_var roundtrip =
+        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::String_var ior =
+        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // If the ior_output_file exists, output the ior to it
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           ior_output_file),
+                          1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp
new file mode 100644
index 00000000000..efb544633b2
--- /dev/null
+++ b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp
@@ -0,0 +1,65 @@
+//
+// $Id$
+//
+#include "Client_Task.h"
+
+ACE_RCSID(Thread_Pool_Latency, Client_Task, "$Id$")
+
+Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
+                          int niterations)
+  : roundtrip_ (Test::Roundtrip::_duplicate (roundtrip))
+  , niterations_ (niterations)
+{
+}
+
+int
+Client_Task::svc (void)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      for (int i = 0; i != this->niterations_; ++i)
+        {
+          CORBA::ULongLong start = ACE_OS::gethrtime ();
+
+          (void) this->roundtrip_->test_method (start ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          ACE_hrtime_t now = ACE_OS::gethrtime ();
+          this->latency_.sample (now - start);
+        }
+    }
+  ACE_CATCHANY
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+  return 0;
+}
+
+void
+Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
+                                  const char *msg,
+                                  ACE_UINT32 gsf)
+{
+  totals.accumulate (this->latency_);
+  this->latency_.dump_results (msg, gsf);
+}
+
+void
+Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
+{
+  CORBA::ULongLong dummy = 0;
+  for (int i = 0; i != 100; ++i)
+    {
+      ACE_TRY
+        {
+          (void) this->roundtrip_->test_method (dummy ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY {} ACE_ENDTRY;
+    }
+}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h
new file mode 100644
index 00000000000..ffc4e9d6b6a
--- /dev/null
+++ b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h
@@ -0,0 +1,46 @@
+//
+// $Id$
+//
+
+#ifndef CLIENT_TASK_H
+#define CLIENT_TASK_H
+#include "ace/pre.h"
+
+#include "TestC.h"
+#include "ace/Task.h"
+#include "ace/Basic_Stats.h"
+
+/// Implement the Test::Client_Task interface
+class Client_Task : public ACE_Task_Base
+{
+public:
+  /// Constructor
+  Client_Task (Test::Roundtrip_ptr roundtrip,
+               int niterations);
+
+  /// Add this thread results to the global numbers and print the
+  /// per-thread results.
+  void accumulate_and_dump (ACE_Basic_Stats &totals,
+                            const char *msg,
+                            ACE_UINT32 gsf);
+
+  /// The service method
+  virtual int svc (void);
+
+private:
+  /// Make sure that the current thread has a connection available.
+  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
+
+private:
+  /// The object reference used for this test
+  Test::Roundtrip_var roundtrip_;
+
+  /// The number of iterations
+  int niterations_;
+
+  /// Keep track of the latency (minimum, average, maximum and jitter)
+  ACE_Basic_Stats latency_;
+};
+
+#include "ace/post.h"
+#endif /* CLIENT_TASK_H */
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp
new file mode 100644
index 00000000000..6028512202c
--- /dev/null
+++ b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp
@@ -0,0 +1,26 @@
+//
+// $Id$
+//
+#include "Roundtrip.h"
+
+ACE_RCSID(Thread_Pool_Latency, Roundtrip, "$Id$")
+
+Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+Test::Timestamp
+Roundtrip::test_method (Test::Timestamp send_time
+                        ACE_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return send_time;
+}
+
+void
+Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h
new file mode 100644
index 00000000000..efef33dd7e6
--- /dev/null
+++ b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h
@@ -0,0 +1,46 @@
+//
+// $Id$
+//
+
+#ifndef ROUNDTRIP_H
+#define ROUNDTRIP_H
+#include "ace/pre.h"
+
+#include "TestS.h"
+
+#if defined (_MSC_VER)
+# if (_MSC_VER >= 1200)
+#  pragma warning(push)
+# endif /* _MSC_VER >= 1200 */
+# pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
+/// Implement the Test::Roundtrip interface
+class Roundtrip
+  : public virtual POA_Test::Roundtrip
+  , public virtual PortableServer::RefCountServantBase
+{
+public:
+  /// Constructor
+  Roundtrip (CORBA::ORB_ptr orb);
+
+  // = The skeleton methods
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+private:
+  /// Use an ORB reference to conver strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+# pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include "ace/post.h"
+#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp b/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp
new file mode 100644
index 00000000000..e485bb2b843
--- /dev/null
+++ b/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp
@@ -0,0 +1,24 @@
+//
+// $Id$
+//
+#include "Worker_Thread.h"
+
+ACE_RCSID(Thread_Pool_Latency, Worker_Thread, "$Id$")
+
+Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+int
+Worker_Thread::svc (void)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY {} ACE_ENDTRY;
+  return 0;
+}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/client.cpp b/TAO/performance-tests/Thread_Pool_Latency/client.cpp
new file mode 100644
index 00000000000..643f541a53f
--- /dev/null
+++ b/TAO/performance-tests/Thread_Pool_Latency/client.cpp
@@ -0,0 +1,149 @@
+// $Id$
+
+#include "Client_Task.h"
+#include "ace/Get_Opt.h"
+#include "ace/High_Res_Timer.h"
+#include "ace/Sched_Params.h"
+#include "ace/Stats.h"
+
+#include "tao/Strategies/advanced_resource.h"
+
+ACE_RCSID(Thread_Pool_Latency, client, "$Id$")
+
+const char *ior = "file://test.ior";
+int niterations = 1000;
+int do_shutdown = 1;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "xk:i:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'x':
+        do_shutdown = 0;
+        break;
+
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "-i <niterations> "
+                           "-x (disable shutdown) "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "client (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "client (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        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 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      Test::Roundtrip_var roundtrip =
+        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (roundtrip.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Nil Test::Roundtrip reference <%s>\n",
+                             ior),
+                            1);
+        }
+
+      ACE_DEBUG ((LM_DEBUG, "Starting threads\n"));
+
+      Client_Task task0(roundtrip.in (), niterations);
+      Client_Task task1(roundtrip.in (), niterations);
+      Client_Task task2(roundtrip.in (), niterations);
+      Client_Task task3(roundtrip.in (), niterations);
+
+      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
+      task0.activate(THR_NEW_LWP | THR_JOINABLE);
+      task1.activate(THR_NEW_LWP | THR_JOINABLE);
+      task2.activate(THR_NEW_LWP | THR_JOINABLE);
+      task3.activate(THR_NEW_LWP | THR_JOINABLE);
+
+      task0.thr_mgr()->wait ();
+      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
+
+      ACE_DEBUG ((LM_DEBUG, "Threads finished\n"));
+
+      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
+      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_DEBUG ((LM_DEBUG, "done\n"));
+
+      ACE_Basic_Stats totals;
+      task0.accumulate_and_dump (totals, "Task[0]", gsf);
+      task1.accumulate_and_dump (totals, "Task[1]", gsf);
+      task2.accumulate_and_dump (totals, "Task[2]", gsf);
+      task3.accumulate_and_dump (totals, "Task[3]", gsf);
+
+      totals.dump_results ("Total", gsf);
+
+      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
+                                             test_end - test_start,
+                                             totals.samples_count ());
+
+      if (do_shutdown)
+        {
+          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/server.cpp b/TAO/performance-tests/Thread_Pool_Latency/server.cpp
new file mode 100644
index 00000000000..bcacaf713c2
--- /dev/null
+++ b/TAO/performance-tests/Thread_Pool_Latency/server.cpp
@@ -0,0 +1,139 @@
+// $Id$
+
+#include "Roundtrip.h"
+#include "Worker_Thread.h"
+#include "ace/Get_Opt.h"
+#include "ace/Sched_Params.h"
+
+#include "tao/Strategies/advanced_resource.h"
+
+ACE_RCSID(Thread_Pool_Latency, server, "$Id$")
+
+const char *ior_output_file = "test.ior";
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "o:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int priority =
+    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
+     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
+  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
+                                                  priority);
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                              priority,
+                                              ACE_SCOPE_PROCESS)) != 0)
+    {
+      if (ACE_OS::last_error () == EPERM)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "server (%P|%t): user is not superuser, "
+                      "test runs in time-shared class\n"));
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "server (%P|%t): sched_params failed\n"));
+    }
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      Roundtrip *roundtrip_impl;
+      ACE_NEW_RETURN (roundtrip_impl,
+                      Roundtrip (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
+
+      Test::Roundtrip_var roundtrip =
+        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::String_var ior =
+        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // If the ior_output_file exists, output the ior to it
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           ior_output_file),
+                          1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      Worker_Thread worker (orb.in ());
+
+      worker.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1);
+      worker.thr_mgr ()->wait ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index 05b0fe9a001..79ac824f5d4 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -18,7 +18,7 @@ Receiver::Receiver (void)
 
 void
 Receiver::receive_data (const Test::Message &the_message
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -45,7 +45,7 @@ Receiver::receive_data (const Test::Message &the_message
 }
 
 void
-Receiver::done (TAO_ENV_SINGLE_ARG_DECL)
+Receiver::done (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->message_count_ == 0)
@@ -87,12 +87,12 @@ Receiver::done (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var oid =
-        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Throughput/Receiver.h b/TAO/performance-tests/Throughput/Receiver.h
index ab15144cacb..8217c7d6505 100644
--- a/TAO/performance-tests/Throughput/Receiver.h
+++ b/TAO/performance-tests/Throughput/Receiver.h
@@ -26,10 +26,10 @@ public:
 
   // = The skeleton methods
   virtual void receive_data (const Test::Message &message
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void done (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void done (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.cpp b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
index 059a7d3bd6b..c804588b9b6 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.cpp
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
@@ -12,7 +12,7 @@ Receiver_Factory::Receiver_Factory (CORBA::ORB_ptr orb)
 }
 
 Test::Receiver_ptr
-Receiver_Factory::create_receiver (TAO_ENV_SINGLE_ARG_DECL)
+Receiver_Factory::create_receiver (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Receiver *receiver_impl;
@@ -22,12 +22,12 @@ Receiver_Factory::create_receiver (TAO_ENV_SINGLE_ARG_DECL)
   ACE_CHECK_RETURN (Test::Receiver::_nil ());
   PortableServer::ServantBase_var transfer_ownership(receiver_impl);
 
-  return receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Receiver_Factory::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Receiver_Factory::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);
 }
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.h b/TAO/performance-tests/Throughput/Receiver_Factory.h
index 0b557ad4f09..05ef98836cb 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.h
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.h
@@ -25,10 +25,10 @@ public:
   Receiver_Factory (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Receiver_ptr create_receiver (TAO_ENV_SINGLE_ARG_DECL)
+  virtual Test::Receiver_ptr create_receiver (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp
index e5ffb8b70fa..9d879e772d0 100644
--- a/TAO/performance-tests/Throughput/client.cpp
+++ b/TAO/performance-tests/Throughput/client.cpp
@@ -64,18 +64,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 tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Receiver_Factory_var receiver_factory =
-        Test::Receiver_Factory::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Receiver_Factory::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (receiver_factory.in ()))
@@ -100,18 +100,18 @@ main (int argc, char *argv[])
           message.the_payload.length (message_size);
 
           Test::Receiver_var receiver =
-            receiver_factory->create_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
+            receiver_factory->create_receiver (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t start = ACE_OS::gethrtime ();
           for (int i = 0; i != message_count; ++i)
             {
               message.message_id = i;
-              receiver->receive_data (message TAO_ENV_ARG_PARAMETER);
+              receiver->receive_data (message ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
-          receiver->done (TAO_ENV_SINGLE_ARG_PARAMETER);
+          receiver->done (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_hrtime_t elapsed_time = ACE_OS::gethrtime () - start;
 
@@ -140,11 +140,11 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          receiver_factory->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          receiver_factory->shutdown (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/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp
index 467c3cbe003..68afc375a0d 100644
--- a/TAO/performance-tests/Throughput/server.cpp
+++ b/TAO/performance-tests/Throughput/server.cpp
@@ -39,11 +39,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -52,11 +52,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_factory_owner_transfer(receiver_factory_impl);
 
       Test::Receiver_Factory_var receiver_factory =
-        receiver_factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        receiver_factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (receiver_factory.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (receiver_factory.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -86,18 +86,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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 event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp
index 356d29da390..9a810548d4e 100644
--- a/TAO/tao/Abstract_Servant_Base.cpp
+++ b/TAO/tao/Abstract_Servant_Base.cpp
@@ -16,12 +16,12 @@ TAO_Abstract_ServantBase::~TAO_Abstract_ServantBase (void)
 
 
 void
-TAO_Abstract_ServantBase::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Abstract_ServantBase::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_Abstract_ServantBase::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Abstract_ServantBase::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
@@ -34,7 +34,7 @@ TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (const TAO_Abstract_ServantBa
 TAO_Abstract_ServantBase & TAO_Abstract_ServantBase::operator= (const TAO_Abstract_ServantBase&)
 {
   return *this;
-} 
+}
 
 
 
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index 9e7cf13aad7..760ffc1924c 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -37,27 +37,27 @@ public:
 
   /// Local implementation of the CORBA::Object::_is_a method.
   virtual CORBA::Boolean _is_a (const char* logical_type_id
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /// Default <_non_existent>: always returns false.
-  virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
+  virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /// Query the Interface Repository.
   virtual CORBA_InterfaceDef_ptr _get_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) = 0;
 
   //@{
   /// @name Reference counting hooks: no-ops by default.
-  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   //@}
 
   /// Get the correct vtable.
   virtual void *_downcast (const char *repository_id) = 0;
 
   /// This is an auxiliary method for _this() and _narrow().
-  virtual TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
 protected:
   /// Default constructor, only derived classes can be created.
@@ -78,12 +78,12 @@ protected:
    */
   virtual void _dispatch (TAO_ServerRequest &request,
                           void *servant_upcall
-                          TAO_ENV_ARG_DECL) = 0;
+                          ACE_ENV_ARG_DECL) = 0;
 
   virtual void synchronous_upcall_dispatch (TAO_ServerRequest &req,
                                             void *servant_upcall,
                                             void *derived_this
-                                            TAO_ENV_ARG_DECL) = 0;
+                                            ACE_ENV_ARG_DECL) = 0;
 
   /// Find an operation in the operation table.
   virtual int _find (const char *opname,
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp
index 164f766fe81..17c88a70769 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -107,7 +107,7 @@ int
 TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
                              ACE_Reactor *reactor,
                              int ignore_address
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // protocol_factories is in the following form
@@ -249,7 +249,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
                                          addrs,
                                          factory,
                                          ignore_address
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (-1);
 
               if (result != 0)
@@ -470,7 +470,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                                ACE_CString &addrs,
                                TAO_ProtocolFactorySetItor &factory,
                                int ignore_address
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   ACE_CString options_tmp;
   this->extract_endpoint_options (addrs,
diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h
index d1234078b4c..8f7e131aeca 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -66,7 +66,7 @@ public:
   int open (TAO_ORB_Core *orb_core,
             ACE_Reactor *reactor,
             int ignore_address
-            TAO_ENV_ARG_DECL)
+            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Close all open acceptors.
@@ -119,7 +119,7 @@ private:
               ACE_CString &address,
               TAO_ProtocolFactorySetItor &factory,
               int ignore_address
-              TAO_ENV_ARG_DECL);
+              ACE_ENV_ARG_DECL);
 
 private:
   // The acceptor registry should not be copied.
diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp
index 2af75966552..833c3696a60 100644
--- a/TAO/tao/Adapter.cpp
+++ b/TAO/tao/Adapter.cpp
@@ -44,29 +44,29 @@ TAO_Adapter_Registry::~TAO_Adapter_Registry (void)
 
 void
 TAO_Adapter_Registry::close (int wait_for_completion
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   for (size_t i = 0; i != this->adapters_count_; ++i)
     {
-      this->adapters_[i]->close (wait_for_completion TAO_ENV_ARG_PARAMETER);
+      this->adapters_[i]->close (wait_for_completion ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_Adapter_Registry::check_close (int wait_for_completion
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   for (size_t i = 0; i != this->adapters_count_; ++i)
     {
-      this->adapters_[i]->check_close (wait_for_completion TAO_ENV_ARG_PARAMETER);
+      this->adapters_[i]->check_close (wait_for_completion ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_Adapter_Registry::insert (TAO_Adapter *adapter
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   if (this->adapters_capacity_ == this->adapters_count_)
     {
@@ -106,7 +106,7 @@ void
 TAO_Adapter_Registry::dispatch (TAO_ObjectKey &key,
                                 TAO_ServerRequest &request,
                                 CORBA::Object_out forward_to
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (size_t i = 0; i != this->adapters_count_; ++i)
@@ -114,7 +114,7 @@ TAO_Adapter_Registry::dispatch (TAO_ObjectKey &key,
       int r = this->adapters_[i]->dispatch (key,
                                             request,
                                             forward_to
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (r != TAO_Adapter::DS_MISMATCHED_KEY)
diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h
index 599a6921fa3..57f2f70871d 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -41,17 +41,17 @@ public:
   virtual ~TAO_Adapter (void);
 
   /// Initialize the Adapter
-  virtual void open (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0;
+  virtual void open (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) = 0;
 
   /// The ORB is shutting down, destroy any resources attached to this
   /// adapter.
   virtual void close (int wait_for_completion
-                      TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                      ACE_ENV_ARG_DECL_NOT_USED) = 0;
 
   /// Check if the adapter can be closed in the current context, raise
   /// an exception if not.
   virtual void check_close (int wait_for_completion
-                            TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                            ACE_ENV_ARG_DECL_NOT_USED) = 0;
 
   /**
    * Return the priority assigned to this adapter.
@@ -64,7 +64,7 @@ public:
   virtual int dispatch (TAO_ObjectKey &key,
                         TAO_ServerRequest &request,
                         CORBA::Object_out forward_to
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   enum {
@@ -119,7 +119,7 @@ public:
    * POA while performing an upcall).
    */
   void close (int wait_for_completion
-              TAO_ENV_ARG_DECL);
+              ACE_ENV_ARG_DECL);
 
   /**
    * Verify if the close() call can be invoked in the current
@@ -127,11 +127,11 @@ public:
    * Raise the right exception if not.
    */
   void check_close (int wait_for_completion
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
 
   /// Insert a new adapter into the registry.
   void insert (TAO_Adapter *adapter
-               TAO_ENV_ARG_DECL);
+               ACE_ENV_ARG_DECL);
 
   /**
    * Dispatch the request to all the adapters.
@@ -141,7 +141,7 @@ public:
   void dispatch (TAO_ObjectKey &key,
                  TAO_ServerRequest &request,
                  CORBA::Object_out forward_to
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Create a collocated object using the given profile and stub.
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 557f76dc8c1..1f02334d573 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -31,10 +31,10 @@ CORBA_Any::type (void) const
 
 void
 CORBA_Any::type (CORBA::TypeCode_ptr tc
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean equiv = this->type_->equivalent (tc
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equiv)
@@ -279,7 +279,7 @@ CORBA_Any::free_value (void)
 void
 CORBA_Any::_tao_encode (TAO_OutputCDR &cdr,
                         TAO_ORB_Core *orb_core
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   // Always append the CDR stream, even when the value_.
   if (this->cdr_ == 0)
@@ -293,12 +293,12 @@ CORBA_Any::_tao_encode (TAO_OutputCDR &cdr,
   TAO_Marshal_Object::perform_append (this->type_.in (),
                                       &in,
                                       &cdr
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 void
 CORBA_Any::_tao_decode (TAO_InputCDR &cdr
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   // Just read into the CDR stream...
 
@@ -314,7 +314,7 @@ CORBA_Any::_tao_decode (TAO_InputCDR &cdr
   CORBA::TypeCode::traverse_status status =
     TAO_Marshal_Object::perform_skip (this->type_.in (),
                                       &cdr
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -522,12 +522,12 @@ CORBA_Any::operator<<= (CORBA::TypeCode_ptr tc)
 void
 CORBA_Any::operator<<= (const CORBA_Exception &exception)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       TAO_OutputCDR stream;
-      exception._tao_encode (stream TAO_ENV_ARG_PARAMETER);
+      exception._tao_encode (stream ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->_tao_replace (exception._type (),
@@ -548,12 +548,12 @@ CORBA_Any::operator<<= (const CORBA_Exception &exception)
 void
 CORBA_Any::operator<<= (CORBA_Exception *exception)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       TAO_OutputCDR stream;
-      exception->_tao_encode (stream TAO_ENV_ARG_PARAMETER);
+      exception->_tao_encode (stream ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->_tao_replace (exception->_type (),
@@ -717,13 +717,13 @@ CORBA_Any::operator<<= (from_wstring ws)
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Short &s) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_short
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -746,13 +746,13 @@ CORBA_Any::operator>>= (CORBA::Short &s) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::UShort &s) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_ushort
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -778,13 +778,13 @@ CORBA_Any::operator>>= (CORBA::UShort &s) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Long &l) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_long
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -810,13 +810,13 @@ CORBA_Any::operator>>= (CORBA::Long &l) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::ULong &l) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_ulong
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -842,13 +842,13 @@ CORBA_Any::operator>>= (CORBA::ULong &l) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::LongLong &l) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_longlong
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -874,13 +874,13 @@ CORBA_Any::operator>>= (CORBA::LongLong &l) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::ULongLong &l) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_ulonglong
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result)
@@ -915,13 +915,13 @@ CORBA_Any::operator>>= (CORBA::ULongLong &l) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Float &f) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_float
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -947,13 +947,13 @@ CORBA_Any::operator>>= (CORBA::Float &f) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Double &d) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_double
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -979,13 +979,13 @@ CORBA_Any::operator>>= (CORBA::Double &d) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::LongDouble &ld) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_longdouble
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1011,13 +1011,13 @@ CORBA_Any::operator>>= (CORBA::LongDouble &ld) const
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::Any &a) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_any
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1045,14 +1045,14 @@ CORBA_Any::operator>>= (CORBA::Any &a) const
 CORBA::Boolean
 CORBA_Any::operator>>= (const CORBA::Any *&a) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       a = 0;
       CORBA::Boolean equivalent =
         this->type_->equivalent (CORBA::_tc_any
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!equivalent)
@@ -1105,7 +1105,7 @@ CORBA_Any::operator>>= (const CORBA::Any *&a) const
 CORBA::Boolean
 CORBA_Any::operator>>= (const char *&s) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -1113,7 +1113,7 @@ CORBA_Any::operator>>= (const char *&s) const
 
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_string
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1172,7 +1172,7 @@ CORBA::Any::_tao_any_wstring_destructor (void *x)
 CORBA::Boolean
 CORBA_Any::operator>>= (const CORBA::WChar *&s) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -1180,7 +1180,7 @@ CORBA_Any::operator>>= (const CORBA::WChar *&s) const
 
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_wstring
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1232,13 +1232,13 @@ CORBA::Any::_tao_any_tc_destructor (void *x)
 CORBA::Boolean
 CORBA_Any::operator>>= (CORBA::TypeCode_ptr &tc) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_TypeCode
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1285,13 +1285,13 @@ CORBA_Any::operator>>= (CORBA::TypeCode_ptr &tc) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_boolean b) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_boolean
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1317,13 +1317,13 @@ CORBA_Any::operator>>= (to_boolean b) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_octet o) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_octet
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1349,13 +1349,13 @@ CORBA_Any::operator>>= (to_octet o) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_char c) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_char
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1381,13 +1381,13 @@ CORBA_Any::operator>>= (to_char c) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_wchar wc) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean result =
         this->type_->equivalent (CORBA::_tc_wchar
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -1413,12 +1413,12 @@ CORBA_Any::operator>>= (to_wchar wc) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_string s) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ULong kind =
-        this->type_->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::TypeCode_var tcvar =
@@ -1426,10 +1426,10 @@ CORBA_Any::operator>>= (to_string s) const
 
       while (kind == CORBA::tk_alias)
         {
-          tcvar = tcvar->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -1438,7 +1438,7 @@ CORBA_Any::operator>>= (to_string s) const
           return 0;
         }
 
-      CORBA::ULong bound = tcvar->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong bound = tcvar->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (s.bound_ != bound)
@@ -1483,12 +1483,12 @@ CORBA_Any::operator>>= (to_string s) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_wstring ws) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ULong kind =
-        this->type_->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::TypeCode_var tcvar =
@@ -1496,10 +1496,10 @@ CORBA_Any::operator>>= (to_wstring ws) const
 
       while (kind == CORBA::tk_alias)
         {
-          tcvar = tcvar->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -1508,7 +1508,7 @@ CORBA_Any::operator>>= (to_wstring ws) const
           return 0;
         }
 
-      CORBA::ULong bound = tcvar->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong bound = tcvar->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ws.bound_ != bound)
@@ -1553,12 +1553,12 @@ CORBA_Any::operator>>= (to_wstring ws) const
 CORBA::Boolean
 CORBA_Any::operator>>= (to_object obj) const
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ULong kind =
-        this->type_->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::TypeCode_var tcvar =
@@ -1566,10 +1566,10 @@ CORBA_Any::operator>>= (to_object obj) const
 
       while (kind == CORBA::tk_alias)
         {
-          tcvar = tcvar->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -1664,7 +1664,7 @@ operator<< (TAO_OutputCDR& cdr,
       TAO_Marshal_Object::perform_append (tc.in (),
                                           &input,
                                           &cdr
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA_Exception, ex)
@@ -1698,7 +1698,7 @@ operator>> (TAO_InputCDR &cdr,
 
       // Skip over the next aregument.
       CORBA::TypeCode::traverse_status status =
-        TAO_Marshal_Object::perform_skip (tc.in (), &cdr TAO_ENV_ARG_PARAMETER);
+        TAO_Marshal_Object::perform_skip (tc.in (), &cdr ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index 3d61cb26f42..5f745914290 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -283,7 +283,7 @@ public:
   /// For use along with <<= of a value of aliased type when the alias must
   /// be preserved.
   void type (CORBA::TypeCode_ptr type
-             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Returns 0 if the Any has not been assigned a value, following the
@@ -334,11 +334,11 @@ public:
   /// Encode the contents of the Any into <cdr>
   void _tao_encode (TAO_OutputCDR &cdr,
                     TAO_ORB_Core *orb_core
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
 
   /// Decode the <cdr> using the typecode in the Any object.
   void _tao_decode (TAO_InputCDR &cdr
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef CORBA_Any_ptr _ptr_type;
diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp
index 13b2c65c7bc..86c77c2bb38 100644
--- a/TAO/tao/Asynch_Invocation.cpp
+++ b/TAO/tao/Asynch_Invocation.cpp
@@ -55,19 +55,19 @@ TAO_GIOP_Asynch_Invocation::TAO_GIOP_Asynch_Invocation (void)
 }
 
 int
-TAO_GIOP_Asynch_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL)
+TAO_GIOP_Asynch_Invocation::invoke (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_ASYNCH_INVOCATION_INVOKE_START);
 
-  return this->invoke_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->invoke_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_GIOP_Asynch_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
+TAO_GIOP_Asynch_Invocation::start (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->target_spec_.target_specifier (this->profile_->object_key ());
@@ -78,7 +78,7 @@ TAO_GIOP_Asynch_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
 #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 
 int
-TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int retval = 0;
@@ -126,7 +126,7 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (TAO_ENV_SINGLE_ARG_DECL)
 
   // Just send the request, without trying to wait for the reply.
   retval = TAO_GIOP_Invocation::invoke (0
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (retval);
 
   if (retval != TAO_INVOKE_OK)
diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h
index f924ff1d28a..540b27ed5ba 100644
--- a/TAO/tao/Asynch_Invocation.h
+++ b/TAO/tao/Asynch_Invocation.h
@@ -55,18 +55,18 @@ public:
                               int byte_order = TAO_ENCAP_BYTE_ORDER);
 
   /// Send request, without blocking until any reply comes back.
-  virtual int invoke (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual int invoke (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Establishes a connection to the remote server, initializes
   /// headers etc.
-  void start (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
 
   /// Must be overridden.
-  virtual int invoke_i (TAO_ENV_SINGLE_ARG_DECL)
+  virtual int invoke_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   /// Reply dispatcher for the current asynchronous invocation.
@@ -104,7 +104,7 @@ protected:
 
   /// Implementation of the invoke() methods, handles the basic
   /// send/reply code and the system exceptions.
-  virtual int invoke_i (TAO_ENV_SINGLE_ARG_DECL)
+  virtual int invoke_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Asynch_Reply_Dispatcher.cpp
index a0401b63755..9c977ab9a2d 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Asynch_Reply_Dispatcher.cpp
@@ -166,7 +166,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (
           reply_handler_skel_ (this->reply_cdr_,
                                this->reply_handler_.in (),
                                reply_error
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -201,7 +201,7 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
 
       TAO_OutputCDR out_cdr;
 
-      comm_failure._tao_encode (out_cdr TAO_ENV_ARG_PARAMETER);
+      comm_failure._tao_encode (out_cdr ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -213,7 +213,7 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
           this->reply_handler_skel_ (cdr,
                                      this->reply_handler_.in (),
                                      TAO_AMI_REPLY_SYSTEM_EXCEPTION
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -247,7 +247,7 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
 
       TAO_OutputCDR out_cdr;
 
-      timeout_failure._tao_encode (out_cdr TAO_ENV_ARG_PARAMETER);
+      timeout_failure._tao_encode (out_cdr ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Turn into an output CDR
@@ -258,7 +258,7 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
           this->reply_handler_skel_ (cdr,
                                      this->reply_handler_.in (),
                                      TAO_AMI_REPLY_SYSTEM_EXCEPTION
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tao/BiDir_Adapter.h b/TAO/tao/BiDir_Adapter.h
index 2e07b15cd30..b36ec7baac9 100644
--- a/TAO/tao/BiDir_Adapter.h
+++ b/TAO/tao/BiDir_Adapter.h
@@ -43,7 +43,7 @@ public:
   virtual int activate (CORBA::ORB_ptr,
                         int argc,
                         char *argv []
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   virtual void load_policy_validators (TAO_Policy_Validator &validator)
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index 34d26bcce19..66639efcef2 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -23,7 +23,7 @@ int
 TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr orb,
                                 int,
                                 char *[]
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_DEF_GIOP_MINOR >= 2)
@@ -45,7 +45,7 @@ TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr orb,
       bidir_orb_initializer = tmp_orb_initializer;
 
       PortableInterceptor::register_orb_initializer (bidir_orb_initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       TAO_ORB_Core *orb_core =
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.h b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
index 216b91c4bf7..9b0400d70a8 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
@@ -47,7 +47,7 @@ public:
   virtual int activate (CORBA::ORB_ptr,
                         int argc,
                         char *argv []
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void load_policy_validators (TAO_Policy_Validator &validator)
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
index c5f5bace974..027209d88b8 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
@@ -195,10 +195,10 @@ BiDirPolicy::BidirectionalPolicy_var::tao_nil (void)
 ::BiDirPolicy::BidirectionalPolicy_ptr
 BiDirPolicy::BidirectionalPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::BiDirPolicy::BidirectionalPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::BiDirPolicy::BidirectionalPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -280,15 +280,15 @@ BiDirPolicy::BidirectionalPolicy::~BidirectionalPolicy (void)
 
 BiDirPolicy::BidirectionalPolicy_ptr BiDirPolicy::BidirectionalPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return BidirectionalPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return BidirectionalPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 BiDirPolicy::BidirectionalPolicy_ptr BiDirPolicy::BidirectionalPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
index 6c5944e6118..09a3f992801 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
@@ -109,7 +109,7 @@ TAO_NAMESPACE  BiDirPolicy
     static BidirectionalPolicy_ptr tao_duplicate (BidirectionalPolicy_ptr);
     static void tao_release (BidirectionalPolicy_ptr);
     static BidirectionalPolicy_ptr tao_nil (void);
-    static BidirectionalPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static BidirectionalPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -164,11 +164,11 @@ class TAO_BiDirGIOP_Export BidirectionalPolicy: public virtual CORBA::Policy
     static BidirectionalPolicy_ptr _duplicate (BidirectionalPolicy_ptr obj);
     static BidirectionalPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static BidirectionalPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static BidirectionalPolicy_ptr _nil (void)
       {
@@ -176,7 +176,7 @@ class TAO_BiDirGIOP_Export BidirectionalPolicy: public virtual CORBA::Policy
       }
 
     virtual BiDirPolicy::BidirectionalPolicyValue value (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
index 9eb9335f312..16eb07b83f2 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
@@ -50,10 +50,10 @@ tao_BiDirPolicy_BidirectionalPolicy_nil (
 ACE_INLINE BiDirPolicy::BidirectionalPolicy_ptr
 tao_BiDirPolicy_BidirectionalPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return BiDirPolicy::BidirectionalPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return BiDirPolicy::BidirectionalPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
index f014bc48b0a..de20f8d62f4 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
@@ -13,18 +13,18 @@ TAO_BiDirPolicy_Validator::TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core)
 
 void
 TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   CORBA::Policy_var policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP);
 
   BiDirPolicy::BidirectionalPolicy_var srp =
     BiDirPolicy::BidirectionalPolicy::_narrow (policy.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   BiDirPolicy::BidirectionalPolicyValue val =
-    srp->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+    srp->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Set the flag in the ORB_Core
@@ -34,7 +34,7 @@ TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies
 
 void
 TAO_BiDirPolicy_Validator::merge_policies_impl (TAO_Policy_Set & /*policies*/
-                                                TAO_ENV_ARG_DECL_NOT_USED)
+                                                ACE_ENV_ARG_DECL_NOT_USED)
 {
   return ;
 }
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
index 74835e15dac..a70b876a829 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
@@ -41,10 +41,10 @@ public:
   TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core);
 
   virtual void validate_impl (TAO_Policy_Set &policies
-                              TAO_ENV_ARG_DECL);
+                              ACE_ENV_ARG_DECL);
 
   virtual void merge_policies_impl (TAO_Policy_Set &policies
-                                    TAO_ENV_ARG_DECL);
+                                    ACE_ENV_ARG_DECL);
 
   virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type);
 
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
index e80e938dd88..6c62e7b8c6b 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
@@ -14,7 +14,7 @@ ACE_RCSID (BiDir_GIOP, BiDir_ORBInitializer, "$Id$")
 void
 TAO_BiDir_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //
@@ -23,18 +23,18 @@ TAO_BiDir_ORBInitializer::pre_init (
 void
 TAO_BiDir_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_BiDir_ORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   /// Register the BiDir policy factories.
   PortableInterceptor::PolicyFactory_ptr temp_factory =
@@ -62,7 +62,7 @@ TAO_BiDir_ORBInitializer::register_policy_factories (
   type = BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE;
   info->register_policy_factory (type,
                                  policy_factory.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
index 97f380ce266..bddb6879859 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h
@@ -42,11 +42,11 @@ class TAO_BiDirGIOP_Export TAO_BiDir_ORBInitializer :
 public:
 
   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));
 
 private:
@@ -54,7 +54,7 @@ private:
   ///< Register Messaging policy factories.
   void register_policy_factories (
          PortableInterceptor::ORBInitInfo_ptr info
-         TAO_ENV_ARG_DECL);
+         ACE_ENV_ARG_DECL);
 
 };
 
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
index c50d6828e66..d216a1f2398 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -15,7 +15,7 @@ CORBA::Policy_ptr
 TAO_BiDir_PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &value
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
index 209adf0a954..83af5766780 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h
@@ -42,7 +42,7 @@ public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                            const CORBA::Any & value
-                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
index aaf7015a77a..a263b0920b5 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
@@ -28,7 +28,7 @@ TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy
 
 
 CORBA::PolicyType
-TAO_BidirectionalPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_BidirectionalPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how this minimizes the
@@ -48,7 +48,7 @@ TAO_BidirectionalPolicy::clone (void) const
 }
 
 CORBA::Policy_ptr
-TAO_BidirectionalPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_BidirectionalPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how the following code is
@@ -64,7 +64,7 @@ TAO_BidirectionalPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_BidirectionalPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_BidirectionalPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -72,7 +72,7 @@ TAO_BidirectionalPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 BiDirPolicy::BidirectionalPolicyValue
 TAO_BidirectionalPolicy::value (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
       CORBA::SystemException))
 {
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
index 97462104694..f0525ea7fab 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
@@ -63,19 +63,19 @@ public:
 
   /// = The BiDir::BidirectionalPolicy methods
   virtual BiDirPolicy::BidirectionalPolicyValue value (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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 TAO_Cached_Policy_Type _tao_cached_type (void) const;
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
index b4f95769ba0..2867ef3270d 100644
--- a/TAO/tao/BoundsC.cpp
+++ b/TAO/tao/BoundsC.cpp
@@ -64,7 +64,7 @@ void CORBA_Bounds::_raise ()
 }
 
 void CORBA_Bounds::_tao_encode (TAO_OutputCDR &cdr
-                                TAO_ENV_ARG_DECL) const
+                                ACE_ENV_ARG_DECL) const
 {
   if (cdr << *this)
     return;
@@ -72,7 +72,7 @@ void CORBA_Bounds::_tao_encode (TAO_OutputCDR &cdr
 }
 
 void CORBA_Bounds::_tao_decode (TAO_InputCDR &cdr
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   if (cdr >> *this)
     return;
@@ -123,7 +123,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Bounds *&_tao_ele
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_Bounds TAO_ENV_ARG_PARAMETER)) return 0; // not equal
+    if (!type->equal (CORBA::_tc_Bounds ACE_ENV_ARG_PARAMETER)) return 0; // not equal
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h
index ee1e47f53a3..a0d1db7bd70 100644
--- a/TAO/tao/BoundsC.h
+++ b/TAO/tao/BoundsC.h
@@ -54,8 +54,8 @@
     virtual void _raise (void);
 
     virtual void _tao_encode (TAO_OutputCDR &cdr
-                              TAO_ENV_ARG_DECL_NOT_USED) const;
-    virtual void _tao_decode (TAO_InputCDR &cdr TAO_ENV_ARG_DECL_NOT_USED);
+                              ACE_ENV_ARG_DECL_NOT_USED) const;
+    virtual void _tao_decode (TAO_InputCDR &cdr ACE_ENV_ARG_DECL_NOT_USED);
 
     static CORBA_Bounds *_downcast (CORBA::Exception *);
     static void _tao_any_destructor (void*);
diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp
index f659a1cbbe8..25d3cc8d152 100644
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Buffering_Constraint_Policy.cpp
@@ -24,7 +24,7 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buff
 }
 
 CORBA::PolicyType
-TAO_Buffering_Constraint_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Buffering_Constraint_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE;
@@ -32,7 +32,7 @@ TAO_Buffering_Constraint_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Policy_ptr
 TAO_Buffering_Constraint_Policy::create (const CORBA::Any& val
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint *buffering_constraint;
   if ((val >>= buffering_constraint) == 0)
@@ -59,14 +59,14 @@ TAO_Buffering_Constraint_Policy::clone (void) const
 }
 
 TAO::BufferingConstraint
-TAO_Buffering_Constraint_Policy::buffering_constraint (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Buffering_Constraint_Policy::buffering_constraint (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->buffering_constraint_;
 }
 
 CORBA::Policy_ptr
-TAO_Buffering_Constraint_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Buffering_Constraint_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Buffering_Constraint_Policy* servant = 0;
@@ -79,7 +79,7 @@ TAO_Buffering_Constraint_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Buffering_Constraint_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Buffering_Constraint_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h
index 08a9b59bc26..4817fd448ee 100644
--- a/TAO/tao/Buffering_Constraint_Policy.h
+++ b/TAO/tao/Buffering_Constraint_Policy.h
@@ -53,24 +53,24 @@ public:
 
   /// Helper method for the implementation of CORBA::ORB::create_policy.
   static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Returns a copy of <this>.
   virtual TAO_Buffering_Constraint_Policy *clone (void) const;
 
   // = The TAO::Buffering_Constraint_Policy methods
 
-  virtual TAO::BufferingConstraint buffering_constraint (TAO_ENV_SINGLE_ARG_DECL)
+  virtual TAO::BufferingConstraint buffering_constraint (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   void get_buffering_constraint (TAO::BufferingConstraint &) const;
 
-  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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));
 
   // Return the cached policy type for this policy.
diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp
index 760922e4928..dd8fbd217e3 100644
--- a/TAO/tao/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CDR_Encaps_Codec.cpp
@@ -28,12 +28,12 @@ TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec (void)
 
 CORBA::OctetSeq *
 TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    IOP::Codec::InvalidTypeForEncoding))
 {
   this->check_type_for_encoding (data
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // ----------------------------------------------------------------
@@ -75,7 +75,7 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
 
 CORBA::Any *
 TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    IOP::Codec::FormatMismatch))
 {
@@ -117,12 +117,12 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
 
 CORBA::OctetSeq *
 TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    IOP::Codec::InvalidTypeForEncoding))
 {
   this->check_type_for_encoding (data
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // ----------------------------------------------------------------
@@ -138,7 +138,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
       TAO_Marshal_Object::perform_append (tc.in (),
                                           &input,
                                           &cdr
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // TAO extension: replace the contents of the octet sequence with
@@ -177,7 +177,7 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
 CORBA::Any *
 TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
                                     CORBA::TypeCode_ptr tc
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    IOP::Codec::FormatMismatch,
                    IOP::Codec::TypeMismatch))
@@ -215,7 +215,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
 
       // Skip over the next argument.
       CORBA::TypeCode::traverse_status status =
-        TAO_Marshal_Object::perform_skip (tc, &cdr TAO_ENV_ARG_PARAMETER);
+        TAO_Marshal_Object::perform_skip (tc, &cdr ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);  // @@ Should we throw a
                              //    IOP::Codec::TypeMismatch exception
                              //    here if this fails?
@@ -280,7 +280,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
 void
 TAO_CDR_Encaps_Codec::check_type_for_encoding (
   const CORBA::Any & data
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   // @@ TODO: Are there any other conditions we need to check?
 
diff --git a/TAO/tao/CDR_Encaps_Codec.h b/TAO/tao/CDR_Encaps_Codec.h
index 71ba100bce8..76d4c11c051 100644
--- a/TAO/tao/CDR_Encaps_Codec.h
+++ b/TAO/tao/CDR_Encaps_Codec.h
@@ -62,21 +62,21 @@ public:
   /// Encode the given data, including the TypeCode, into an octet
   /// sequence.
   virtual CORBA::OctetSeq * encode (const CORBA::Any & data
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::Codec::InvalidTypeForEncoding));
 
   /// Extract the TypeCode and the value from the octet sequence and
   /// place them into an Any.
   virtual CORBA::Any * decode (const CORBA::OctetSeq & data
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::Codec::FormatMismatch));
 
   /// Encode the given data, excluding the TypeCode, into an octet
   /// sequence.
   virtual CORBA::OctetSeq * encode_value (const CORBA::Any & data
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::Codec::InvalidTypeForEncoding));
 
@@ -84,7 +84,7 @@ public:
   /// TypeCode,  and place it into an Any.
   virtual CORBA::Any * decode_value (const CORBA::OctetSeq & data,
                                      CORBA::TypeCode_ptr tc
-                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::Codec::FormatMismatch,
                      IOP::Codec::TypeMismatch));
@@ -106,7 +106,7 @@ protected:
    * Codec.
    */
   void check_type_for_encoding (const CORBA::Any & data
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index 4852a839128..e4b780a43ff 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -321,7 +321,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetCompo
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
       type->equivalent (CONV_FRAME::_tc_CodeSetComponent
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -376,7 +376,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSe
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
       type->equivalent (CONV_FRAME::_tc_CodeSetComponent
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -456,7 +456,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetCompo
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
       type->equivalent (CONV_FRAME::_tc_CodeSetComponentInfo
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -511,7 +511,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSe
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
       type->equivalent (CONV_FRAME::_tc_CodeSetComponentInfo
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -590,7 +590,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetConte
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetContext TAO_ENV_ARG_PARAMETER);
+      type->equivalent (CONV_FRAME::_tc_CodeSetContext ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -644,7 +644,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CONV_FRAME::CodeSe
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CONV_FRAME::_tc_CodeSetContext TAO_ENV_ARG_PARAMETER);
+      type->equivalent (CONV_FRAME::_tc_CodeSetContext ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index fea85958f2b..1a0092b2f35 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -37,7 +37,7 @@ void
 TAO_CORBALOC_Parser::parse_string_count_helper (const char * s,
                                                 CORBA::ULong &addr_list_length,
                                                 CORBA::ULong &addr_count
-                                                TAO_ENV_ARG_DECL)
+                                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char object_key_delimiter = '/';
@@ -85,7 +85,7 @@ TAO_CORBALOC_Parser::assign_key_string (char *& cloc_name_ptr,
                                         &addr_list_length,
                                         CORBA::ORB_ptr orb,
                                         TAO_MProfile &mprofile
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var end_point;
@@ -203,7 +203,7 @@ TAO_CORBALOC_Parser::assign_key_string (char *& cloc_name_ptr,
   this->parse_string_mprofile_helper (end_point.in (),
                                       orb,
                                       mprofile
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -214,7 +214,7 @@ TAO_CORBALOC_Parser::parse_string_assign_helper (
     ACE_CString &cloc_name,
     CORBA::ORB_ptr orb,
     TAO_MProfile &mprofile
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *cloc_name_ptr = 0;
@@ -235,7 +235,7 @@ TAO_CORBALOC_Parser::parse_string_assign_helper (
                                addr_list_length,
                                orb,
                                mprofile
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Get the next token.
@@ -251,7 +251,7 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper (
     const char * end_point,
     CORBA::ORB_ptr orb,
     TAO_MProfile &mprofile
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_MProfile jth_mprofile;
@@ -260,7 +260,7 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper (
     orb->orb_core ()->connector_registry ()->make_mprofile (
       end_point,
       jth_mprofile
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (retv != 0)
@@ -287,13 +287,13 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper (
 CORBA::Object_ptr
 TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
                                               TAO_MProfile &mprofile
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create a TAO_Stub.
   TAO_Stub *data = orb->orb_core ()->create_stub ((const char *) 0,
                                                   mprofile
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   TAO_Stub_Auto_Ptr safe_data (data);
@@ -317,7 +317,7 @@ TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
 CORBA::Object_ptr
 TAO_CORBALOC_Parser::parse_string_rir_helper (const char *& corbaloc_name,
                                               CORBA::ORB_ptr orb
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -335,7 +335,7 @@ TAO_CORBALOC_Parser::parse_string_rir_helper (const char *& corbaloc_name,
 
   CORBA::Object_var rir_obj =
     orb->resolve_initial_references (key_string
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return rir_obj._retn ();
@@ -343,7 +343,7 @@ TAO_CORBALOC_Parser::parse_string_rir_helper (const char *& corbaloc_name,
 
 int
 TAO_CORBALOC_Parser::check_prefix (const char *end_point
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -403,7 +403,7 @@ TAO_CORBALOC_Parser::check_prefix (const char *end_point
 CORBA::Object_ptr
 TAO_CORBALOC_Parser::parse_string (const char * ior,
                                    CORBA::ORB_ptr orb
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// MProfile which consists of the profiles for each endpoint.
@@ -424,7 +424,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
 
   // If the protocol is not "rir:" and also is a valid protocol
   int check_prefix_result = this->check_prefix (corbaloc_name
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (check_prefix_result != 0)
@@ -434,7 +434,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
       this->parse_string_count_helper (corbaloc_name,
                                        addr_list_length,
                                        count_addr
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       // Convert corbaloc_name to an ACE_CString
@@ -458,14 +458,14 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
                                         cloc_name,
                                         orb,
                                         mprofile
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       // Create the stub for the mprofile and get the object reference
       // to it which is to be returned to the client application.
       object = this->make_stub_from_mprofile (orb,
                                               mprofile
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   else
@@ -473,7 +473,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
       // RIR case:
       object = this->parse_string_rir_helper (corbaloc_name,
                                               orb
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return object;
diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
index fe45acd9e67..91509409996 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -52,14 +52,14 @@ public:
   /// Parse the ior-string that is passed.
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
 
   /// Checks the prefix to see if it is RIR.
   virtual int check_prefix (const char *endpoint
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Helps count the length of the <obj_addr_list> and the number of
@@ -67,7 +67,7 @@ private:
   virtual void parse_string_count_helper (const char * corbaloc_name,
                                           CORBA::ULong &addr_list_length,
                                           CORBA::ULong &count_addr
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -79,7 +79,7 @@ private:
   virtual void parse_string_mprofile_helper (const char * end_point,
                                              CORBA::ORB_ptr orb,
                                              TAO_MProfile &mprofile
-                                             TAO_ENV_ARG_DECL_NOT_USED)
+                                             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -90,14 +90,14 @@ private:
   virtual CORBA::Object_ptr
     make_stub_from_mprofile (CORBA::ORB_ptr orb,
                              TAO_MProfile &mprofile
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Gets the pointer to the key_string when the protocol used is RIR
   virtual CORBA::Object_ptr
     parse_string_rir_helper (const char * &corbaloc_name,
                              CORBA::ORB_ptr orb
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Tokenizes the <obj_addr_list> using "," as the seperator. Assigns
@@ -107,7 +107,7 @@ private:
                                            ACE_CString &cloc_name,
                                            CORBA::ORB_ptr orb,
                                            TAO_MProfile &mprofile
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -121,7 +121,7 @@ private:
                       CORBA::ULong &addr_list_length,
                       CORBA::ORB_ptr orb,
                       TAO_MProfile &mprofile
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 980eedd38e8..a9cbe0039a8 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -29,7 +29,7 @@ CORBA::Object_ptr
 TAO_CORBANAME_Parser::
 parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
                                      ACE_CString &key_string
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
@@ -50,14 +50,14 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
 
   for (;;)
     {
-      _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
 
       _tao_call.prepare_header (
           ACE_static_cast (CORBA::Octet, _tao_response_flag)
-           TAO_ENV_ARG_PARAMETER
+           ACE_ENV_ARG_PARAMETER
         );
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
@@ -73,7 +73,7 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
       int _invoke_status = 0;
       ACE_TRY
         {
-          _invoke_status = _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+          _invoke_status = _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK (CORBA::Object::_nil ());
         }
       ACE_CATCH (CORBA::UNKNOWN, ex)
@@ -126,7 +126,7 @@ parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
 CORBA::Object_ptr
 TAO_CORBANAME_Parser::parse_string (const char *ior,
                                     CORBA::ORB_ptr orb
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -178,7 +178,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior,
       // Obtain a reference to the naming context
       CORBA::Object_var name_context =
         orb->string_to_object (corbaloc_addr.c_str ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check if the Object reference is nil.
@@ -189,7 +189,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior,
 
       CORBA::Boolean is_a =
         name_context->_is_a ("IDL:omg.org/CosNaming/NamingContextExt:1.0"
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!is_a)
@@ -203,7 +203,7 @@ TAO_CORBANAME_Parser::parse_string (const char *ior,
       // Make a dynamic request for resolve_str in this naming context
       obj = this->parse_string_dynamic_request_helper (name_context.in (),
                                                        key_string
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, ex)
diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h
index 816419ee07b..2806f1bbb8d 100644
--- a/TAO/tao/CORBANAME_Parser.h
+++ b/TAO/tao/CORBANAME_Parser.h
@@ -46,14 +46,14 @@ public:
   virtual int match_prefix (const char *ior_string) const;
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
   virtual CORBA::Object_ptr
     parse_string_dynamic_request_helper (CORBA::Object_ptr naming_context,
                                          ACE_CString &key_string
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/ClientInterceptorAdapter.cpp b/TAO/tao/ClientInterceptorAdapter.cpp
index a1ccb98465a..26d77f6fa8b 100644
--- a/TAO/tao/ClientInterceptorAdapter.cpp
+++ b/TAO/tao/ClientInterceptorAdapter.cpp
@@ -22,7 +22,7 @@ TAO_ClientRequestInterceptor_Adapter::
 void
 TAO_ClientRequestInterceptor_Adapter::
 send_request (TAO_ClientRequestInfo_i *ri
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   // This method implements one of the "starting" client side
   // interception point.
@@ -41,7 +41,7 @@ send_request (TAO_ClientRequestInfo_i *ri
       for (size_t i = 0 ; i < this->len_; ++i)
         {
           this->interceptors_[i]->send_request (this->info_
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // The starting interception point completed successfully.
@@ -51,7 +51,7 @@ send_request (TAO_ClientRequestInfo_i *ri
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
-      this->process_forward_request (ri, exc TAO_ENV_ARG_PARAMETER);
+      this->process_forward_request (ri, exc ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_ENDTRY;
@@ -61,7 +61,7 @@ send_request (TAO_ClientRequestInfo_i *ri
 void
 TAO_ClientRequestInterceptor_Adapter::
 receive_reply (TAO_ClientRequestInfo_i *ri
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   // This is an "ending" interception point so we only process the
   // interceptors pushed on to the flow stack.
@@ -84,7 +84,7 @@ receive_reply (TAO_ClientRequestInfo_i *ri
 
       this->interceptors_[this->stack_size_]->receive_reply (
         this->info_
-        TAO_ENV_ARG_PARAMETER);
+        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -96,7 +96,7 @@ receive_reply (TAO_ClientRequestInfo_i *ri
 void
 TAO_ClientRequestInterceptor_Adapter::
 receive_exception (TAO_ClientRequestInfo_i *ri
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   // This is an "ending" interception point so we only process the
   // interceptors pushed on to the flow stack.
@@ -121,13 +121,13 @@ receive_exception (TAO_ClientRequestInfo_i *ri
 
           this->interceptors_[this->stack_size_]->receive_exception (
             this->info_
-            TAO_ENV_ARG_PARAMETER);
+            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
-      this->process_forward_request (ri, exc TAO_ENV_ARG_PARAMETER);
+      this->process_forward_request (ri, exc ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -144,11 +144,11 @@ receive_exception (TAO_ClientRequestInfo_i *ri
 
       ri->exception (&ACE_ANY_EXCEPTION);
 
-      this->receive_exception (ri TAO_ENV_ARG_PARAMETER);
+      this->receive_exception (ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus status =
-        ri->reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Only re-throw the exception if it hasn't been transformed by
@@ -165,7 +165,7 @@ receive_exception (TAO_ClientRequestInfo_i *ri
 void
 TAO_ClientRequestInterceptor_Adapter::
 receive_other (TAO_ClientRequestInfo_i *ri
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   // This is an "ending" interception point so we only process the
   // interceptors pushed on to the flow stack.
@@ -190,13 +190,13 @@ receive_other (TAO_ClientRequestInfo_i *ri
 
           this->interceptors_[this->stack_size_]->receive_other (
             this->info_
-            TAO_ENV_ARG_PARAMETER);
+            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
-      this->process_forward_request (ri, exc TAO_ENV_ARG_PARAMETER);
+      this->process_forward_request (ri, exc ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_ENDTRY;
@@ -207,18 +207,18 @@ void
 TAO_ClientRequestInterceptor_Adapter::process_forward_request (
   TAO_ClientRequestInfo_i *ri,
   PortableInterceptor::ForwardRequest &exc
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   ri->forward_reference (exc);
 
   this->invoke_status_ =
     this->invocation_->location_forward (exc.forward.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // receive_other() is potentially invoked recursively.
   this->receive_other (ri
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tao/ClientInterceptorAdapter.h b/TAO/tao/ClientInterceptorAdapter.h
index 0fa9cb5f8ec..ee58a271dbb 100644
--- a/TAO/tao/ClientInterceptorAdapter.h
+++ b/TAO/tao/ClientInterceptorAdapter.h
@@ -74,22 +74,22 @@ public:
   /// This method implements one of the "starting" client side
   /// interception points.
   void send_request (TAO_ClientRequestInfo_i *ri
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
   /// This method implements one of the "ending" client side
   /// interception point.
   void receive_reply (TAO_ClientRequestInfo_i *ri
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
   /// This method implements one of the "ending" client side
   /// interception point.
   void receive_exception (TAO_ClientRequestInfo_i *ri
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
 
   /// This method implements one of the "ending" client side
   /// interception point.
   void receive_other (TAO_ClientRequestInfo_i *ri
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   //@}
 
 protected:
@@ -99,7 +99,7 @@ protected:
   /// to notifying the Invocation object of the LOCATION_FORWARD.
   void process_forward_request (TAO_ClientRequestInfo_i *ri,
                                 PortableInterceptor::ForwardRequest &exc
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp
index 08dedac5b24..0ea591e59a7 100644
--- a/TAO/tao/ClientRequestInfo.cpp
+++ b/TAO/tao/ClientRequestInfo.cpp
@@ -19,262 +19,262 @@ TAO_ClientRequestInfo::TAO_ClientRequestInfo (void)
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::target (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::target (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  return this->info_->target (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->target (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::effective_target (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::effective_target (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  return this->info_->effective_target (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->effective_target (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IOP::TaggedProfile *
-TAO_ClientRequestInfo::effective_profile (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::effective_profile (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->info_->effective_profile (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->effective_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // Use at own risk. There is no way currently of extracting an
 // exception from an Any. This method is in place just to be compliant
 // with the spec.
 CORBA::Any *
-TAO_ClientRequestInfo::received_exception (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::received_exception (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->info_->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
 TAO_ClientRequestInfo::received_exception_id (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->info_->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IOP::TaggedComponent *
 TAO_ClientRequestInfo::get_effective_component (
     IOP::ComponentId id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return this->info_->get_effective_component (id
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
 }
 
 IOP::TaggedComponentSeq *
 TAO_ClientRequestInfo::get_effective_components (
     IOP::ComponentId id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return this->info_->get_effective_components (id
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Policy_ptr
 TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return this->info_->get_request_policy (type
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ClientRequestInfo::add_request_service_context (
     const IOP::ServiceContext & service_context,
     CORBA::Boolean replace
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->info_->add_request_service_context (service_context,
                                             replace
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::ULong
-TAO_ClientRequestInfo::request_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->info_->request_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->request_id (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
-TAO_ClientRequestInfo::operation (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->info_->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->info_->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->info_->exceptions (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->exceptions (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 Dynamic::ContextList *
-TAO_ClientRequestInfo::contexts (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->info_->contexts (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->contexts (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 Dynamic::RequestContext *
-TAO_ClientRequestInfo::operation_context (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->info_->operation_context (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->operation_context (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Any *
-TAO_ClientRequestInfo::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->info_->result (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->result (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_ClientRequestInfo::response_expected (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->info_->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if TAO_HAS_CORBA_MESSAGING == 1
 CORBA::Short
-TAO_ClientRequestInfo::sync_scope (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->info_->sync_scope (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->sync_scope (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 #endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 PortableInterceptor::ReplyStatus
-TAO_ClientRequestInfo::reply_status (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableInterceptor::SYSTEM_EXCEPTION);
 
-  return this->info_->reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo::forward_reference (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  return this->info_->forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->info_->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Any *
 TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return this->info_->get_slot (id
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 IOP::ServiceContext *
 TAO_ClientRequestInfo::get_request_service_context (
     IOP::ServiceId id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return this->info_->get_request_service_context (id
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
 }
 
 IOP::ServiceContext *
 TAO_ClientRequestInfo::get_reply_service_context (
     IOP::ServiceId id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return this->info_->get_reply_service_context (id
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
 }
 
 
diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h
index dced994f33d..9246498235a 100644
--- a/TAO/tao/ClientRequestInfo.h
+++ b/TAO/tao/ClientRequestInfo.h
@@ -70,43 +70,43 @@ public:
   /// Return an ID unique to the current request.  This request ID may
   /// or may not be the same as the GIOP request ID.
   virtual CORBA::ULong request_id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the operation name for the current request.
   virtual char * operation (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the list of arguments passed to the current operation.
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the list of exceptions the current operation is capable
   /// of throwing.
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ContextList * contexts (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::RequestContext * operation_context (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the result of the current request.  If there is no return
   /// value then an Any with tk_void TypeCode is returned.  This is
   /// method is not valid for oneway operations.
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns true for a two-way operation, and false otherwise.
   virtual CORBA::Boolean response_expected (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
 #if TAO_HAS_CORBA_MESSAGING == 1
@@ -114,7 +114,7 @@ public:
   /// operation.  If the operation is not a one-way, a
   /// CORBA::BAD_INV_ORDER exception is thrown.
   virtual CORBA::Short sync_scope (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -123,19 +123,19 @@ public:
   /// USER_EXCEPTION, LOCATION_FORWARD, LOCATION_FORWARD_PERMANENT,
   /// TRANSPORT_RETRY.
   virtual PortableInterceptor::ReplyStatus reply_status (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
   /// PortableInterceptor::LOCATION_FORWARD_PERMANENT, return the
   /// object reference to which the request was forwarded.
   virtual CORBA::Object_ptr forward_reference (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
   virtual CORBA::Any * get_slot (
       PortableInterceptor::SlotId id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
@@ -143,30 +143,30 @@ public:
   /// from the request service context list.
   virtual IOP::ServiceContext * get_request_service_context (
       IOP::ServiceId id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the reply service context list.
   virtual IOP::ServiceContext * get_reply_service_context (
       IOP::ServiceId id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the (initial, non-forwarded, or permanently forwarded)
   /// object reference of the target.
   virtual CORBA::Object_ptr target (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the object reference for the current target.  The target
   /// may change in the even of a location forward.
   virtual CORBA::Object_ptr effective_target (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IOP::TaggedProfile * effective_profile (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return an Any containing the received exception, if any.
@@ -175,12 +175,12 @@ public:
    * @note There is no trivial way to extract the exception from an Any.
    */
   virtual CORBA::Any * received_exception (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the repository ID for the received exception.
   virtual char * received_exception_id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the first IOP::TaggedComponent that matches the given
@@ -188,7 +188,7 @@ public:
   /// target.
   virtual IOP::TaggedComponent * get_effective_component (
       IOP::ComponentId id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return all IOP::TaggedComponent(s) that match the given
@@ -196,14 +196,14 @@ public:
   /// target.
   virtual IOP::TaggedComponentSeq * get_effective_components (
       IOP::ComponentId id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the policy of the given type in effect for the current
   /// request.
   virtual CORBA::Policy_ptr get_request_policy (
       CORBA::PolicyType type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the IOP::ServiceContext to the request (outgoing)
@@ -211,7 +211,7 @@ public:
   virtual void add_request_service_context (
       const IOP::ServiceContext & service_context,
       CORBA::Boolean replace
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the ClientRequestInfo implementation which this class
@@ -226,7 +226,7 @@ private:
 
   /// Check if this ClientRequestInfo object is called within the
   /// context of a request.
-  void check_validity (TAO_ENV_SINGLE_ARG_DECL);
+  void check_validity (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
 
diff --git a/TAO/tao/ClientRequestInfo.inl b/TAO/tao/ClientRequestInfo.inl
index a7748316a4b..7c353070b9c 100644
--- a/TAO/tao/ClientRequestInfo.inl
+++ b/TAO/tao/ClientRequestInfo.inl
@@ -3,7 +3,7 @@
 // $Id$
 
 ACE_INLINE void
-TAO_ClientRequestInfo::check_validity (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->info_ == 0)
     ACE_THROW (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp
index 18c7271208c..1786f73a2cf 100644
--- a/TAO/tao/ClientRequestInfo_i.cpp
+++ b/TAO/tao/ClientRequestInfo_i.cpp
@@ -31,14 +31,14 @@ TAO_ClientRequestInfo_i::~TAO_ClientRequestInfo_i (void)
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo_i::target (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ClientRequestInfo_i::target (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::Object::_duplicate (this->target_);
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo_i::effective_target (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ClientRequestInfo_i::effective_target (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ == PortableInterceptor::LOCATION_FORWARD)
@@ -53,7 +53,7 @@ TAO_ClientRequestInfo_i::effective_target (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 IOP::TaggedProfile *
-TAO_ClientRequestInfo_i::effective_profile (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_i::effective_profile (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   IOP::TaggedProfile *tagged_profile = 0;
@@ -81,7 +81,7 @@ TAO_ClientRequestInfo_i::effective_profile (TAO_ENV_SINGLE_ARG_DECL)
 // exception from an Any. This method is in place just to be compliant
 // with the spec.
 CORBA::Any *
-TAO_ClientRequestInfo_i::received_exception (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_i::received_exception (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
@@ -116,7 +116,7 @@ TAO_ClientRequestInfo_i::received_exception (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ClientRequestInfo_i::received_exception_id (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
@@ -133,7 +133,7 @@ TAO_ClientRequestInfo_i::received_exception_id (
 IOP::TaggedComponent *
 TAO_ClientRequestInfo_i::get_effective_component (
     IOP::ComponentId id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Tagged_Components &ecs =
@@ -178,7 +178,7 @@ TAO_ClientRequestInfo_i::get_effective_component (
 IOP::TaggedComponentSeq *
 TAO_ClientRequestInfo_i::get_effective_components (
     IOP::ComponentId id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Tagged_Components &ecs =
@@ -232,14 +232,14 @@ TAO_ClientRequestInfo_i::get_effective_components (
 
 CORBA::Policy_ptr
 TAO_ClientRequestInfo_i::get_request_policy (CORBA::PolicyType type
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Do we need to look anywhere else for the request policies?
 
 #if TAO_HAS_CORBA_MESSAGING == 1
   return this->target_->_get_policy (type
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 #else
   ACE_UNUSED_ARG (type);
 
@@ -256,7 +256,7 @@ void
 TAO_ClientRequestInfo_i::add_request_service_context (
     const IOP::ServiceContext & service_context,
     CORBA::Boolean replace
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the service context from the list
@@ -271,7 +271,7 @@ TAO_ClientRequestInfo_i::add_request_service_context (
 }
 
 CORBA::ULong
-TAO_ClientRequestInfo_i::request_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_i::request_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @todo We may have to worry about AMI once we support interceptors
@@ -351,14 +351,14 @@ TAO_ClientRequestInfo_i::request_id (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO_ClientRequestInfo_i::operation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ClientRequestInfo_i::operation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->invocation_->operation ());
 }
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_i::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_i::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -367,7 +367,7 @@ TAO_ClientRequestInfo_i::arguments (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_i::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_i::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -376,7 +376,7 @@ TAO_ClientRequestInfo_i::exceptions (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ContextList *
-TAO_ClientRequestInfo_i::contexts (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_i::contexts (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -385,7 +385,7 @@ TAO_ClientRequestInfo_i::contexts (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::RequestContext *
-TAO_ClientRequestInfo_i::operation_context (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_i::operation_context (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -394,7 +394,7 @@ TAO_ClientRequestInfo_i::operation_context (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any *
-TAO_ClientRequestInfo_i::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_i::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -403,7 +403,7 @@ TAO_ClientRequestInfo_i::result (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Boolean
-TAO_ClientRequestInfo_i::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ClientRequestInfo_i::response_expected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->response_expected_;
@@ -411,7 +411,7 @@ TAO_ClientRequestInfo_i::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 # if TAO_HAS_CORBA_MESSAGING == 1
 CORBA::Short
-TAO_ClientRequestInfo_i::sync_scope (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_i::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_GIOP_Oneway_Invocation *inv =
@@ -434,7 +434,7 @@ TAO_ClientRequestInfo_i::sync_scope (TAO_ENV_SINGLE_ARG_DECL)
 #endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 PortableInterceptor::ReplyStatus
-TAO_ClientRequestInfo_i::reply_status (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_i::reply_status (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ == -1)
@@ -447,7 +447,7 @@ TAO_ClientRequestInfo_i::reply_status (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Object_ptr
-TAO_ClientRequestInfo_i::forward_reference (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_i::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD)
@@ -463,7 +463,7 @@ TAO_ClientRequestInfo_i::forward_reference (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Any *
 TAO_ClientRequestInfo_i::get_slot (PortableInterceptor::SlotId id
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -486,13 +486,13 @@ TAO_ClientRequestInfo_i::get_slot (PortableInterceptor::SlotId id
   // side.  No copying is necessary.
   return
     pi_current->get_slot (id
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 }
 
 IOP::ServiceContext *
 TAO_ClientRequestInfo_i::get_request_service_context (
     IOP::ServiceId id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the service context from the list
@@ -501,14 +501,14 @@ TAO_ClientRequestInfo_i::get_request_service_context (
 
   return this->get_service_context_i (service_context_list,
                                       id
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 
 IOP::ServiceContext *
 TAO_ClientRequestInfo_i::get_reply_service_context (
     IOP::ServiceId id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the service context from the list
@@ -517,14 +517,14 @@ TAO_ClientRequestInfo_i::get_reply_service_context (
 
   return this->get_service_context_i (service_context_list,
                                       id
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 IOP::ServiceContext *
 TAO_ClientRequestInfo_i::get_service_context_i (
     TAO_Service_Context &service_context_list,
     IOP::ServiceId id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create a new service context to be returned.  Assume
diff --git a/TAO/tao/ClientRequestInfo_i.h b/TAO/tao/ClientRequestInfo_i.h
index b1488d2f0f9..43245ee3431 100644
--- a/TAO/tao/ClientRequestInfo_i.h
+++ b/TAO/tao/ClientRequestInfo_i.h
@@ -53,46 +53,46 @@ public:
   /// Return an ID unique to the current request.  This request ID may
   /// or may not be the same as the GIOP request ID.
   CORBA::ULong request_id (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the operation name for the current request.
   char * operation (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the list of arguments passed to the current operation.
-  virtual Dynamic::ParameterList * arguments (TAO_ENV_SINGLE_ARG_DECL)
+  virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the list of exceptions the current operation is capable
   /// of throwing.
-  virtual Dynamic::ExceptionList * exceptions (TAO_ENV_SINGLE_ARG_DECL)
+  virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Dynamic::ContextList * contexts (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   Dynamic::RequestContext * operation_context (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the result of the current request.  If there is no return
   /// value then an Any with tk_void TypeCode is returned.  This is
   /// method is not valid for oneway operations.
-  virtual CORBA::Any * result (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns true for a two-way operation, and false otherwise.
-  CORBA::Boolean response_expected (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::Boolean response_expected (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
 #if TAO_HAS_CORBA_MESSAGING == 1
   /// Return the sync_scope policy value for the current one-way
   /// operation.  If the operation is not a one-way, a
   /// CORBA::BAD_INV_ORDER exception is thrown.
-  CORBA::Short sync_scope (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::Short sync_scope (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -101,19 +101,19 @@ public:
   /// USER_EXCEPTION, LOCATION_FORWARD, LOCATION_FORWARD_PERMANENT,
   /// TRANSPORT_RETRY.
   PortableInterceptor::ReplyStatus reply_status (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
   /// PortableInterceptor::LOCATION_FORWARD_PERMANENT, return the
   /// object reference to which the request was forwarded.
   CORBA::Object_ptr forward_reference (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
   CORBA::Any * get_slot (
       PortableInterceptor::SlotId id
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
@@ -121,30 +121,30 @@ public:
   /// from the request service context list.
   IOP::ServiceContext * get_request_service_context (
       IOP::ServiceId id
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the reply service context list.
   IOP::ServiceContext * get_reply_service_context (
       IOP::ServiceId id
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the (initial, non-forwarded, or permanently forwarded)
   /// object reference of the target.
   CORBA::Object_ptr target (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the object reference for the current target.  The target
   /// may change in the even of a location forward.
   CORBA::Object_ptr effective_target (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IOP::TaggedProfile * effective_profile (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return an Any containing the received exception, if any.
@@ -153,12 +153,12 @@ public:
    * @note There is no trivial way to extract the exception from an Any.
    */
   CORBA::Any * received_exception (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the repository ID for the received exception.
   char * received_exception_id (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the first IOP::TaggedComponent that matches the given
@@ -166,7 +166,7 @@ public:
   /// target.
   IOP::TaggedComponent * get_effective_component (
       IOP::ComponentId id
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return all IOP::TaggedComponent(s) that match the given
@@ -174,14 +174,14 @@ public:
   /// target.
   IOP::TaggedComponentSeq * get_effective_components (
       IOP::ComponentId id
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the policy of the given type in effect for the current
   /// request.
   CORBA::Policy_ptr get_request_policy (
       CORBA::PolicyType type
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the IOP::ServiceContext to the request (outgoing)
@@ -189,7 +189,7 @@ public:
   void add_request_service_context (
       const IOP::ServiceContext & service_context,
       CORBA::Boolean replace
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -223,7 +223,7 @@ protected:
   IOP::ServiceContext *get_service_context_i (
       TAO_Service_Context &service_context_list,
       IOP::ServiceId id
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tao/CodecFactory.cpp b/TAO/tao/CodecFactory.cpp
index 29e51369bf3..b1362059ef5 100644
--- a/TAO/tao/CodecFactory.cpp
+++ b/TAO/tao/CodecFactory.cpp
@@ -15,7 +15,7 @@ TAO_CodecFactory::TAO_CodecFactory (void)
 
 IOP::Codec_ptr
 TAO_CodecFactory::create_codec (const IOP::Encoding & enc
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    IOP::CodecFactory::UnknownEncoding))
 {
diff --git a/TAO/tao/CodecFactory.h b/TAO/tao/CodecFactory.h
index bd2b28fc4cb..fd3801ebce6 100644
--- a/TAO/tao/CodecFactory.h
+++ b/TAO/tao/CodecFactory.h
@@ -53,7 +53,7 @@ public:
 
   /// Create a Coder/Decoder for the given type of encoding.
   virtual IOP::Codec_ptr create_codec (const IOP::Encoding & enc
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::CodecFactory::UnknownEncoding));
 
diff --git a/TAO/tao/CodecFactory_ORBInitializer.cpp b/TAO/tao/CodecFactory_ORBInitializer.cpp
index fe134990c9e..bf2634b218d 100644
--- a/TAO/tao/CodecFactory_ORBInitializer.cpp
+++ b/TAO/tao/CodecFactory_ORBInitializer.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (TAO_CodecFactory,
 void
 TAO_CodecFactory_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The CodecFactory is stateless and reentrant, so share a single
@@ -34,14 +34,14 @@ TAO_CodecFactory_ORBInitializer::pre_init (
 
   info->register_initial_reference ("CodecFactory",
                                     this->codec_factory_.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_CodecFactory_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tao/CodecFactory_ORBInitializer.h b/TAO/tao/CodecFactory_ORBInitializer.h
index ac074a0a392..de6bd2e0d39 100644
--- a/TAO/tao/CodecFactory_ORBInitializer.h
+++ b/TAO/tao/CodecFactory_ORBInitializer.h
@@ -51,11 +51,11 @@ class TAO_Export TAO_CodecFactory_ORBInitializer
 public:
 
   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));
 
 private:
diff --git a/TAO/tao/Collocation_Resolver.h b/TAO/tao/Collocation_Resolver.h
index b17b58fd185..4a048eac6b8 100644
--- a/TAO/tao/Collocation_Resolver.h
+++ b/TAO/tao/Collocation_Resolver.h
@@ -39,7 +39,7 @@ public:
 
   /// Is <object> collocated?
   virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object
-                                        TAO_ENV_ARG_DECL) const = 0;
+                                        ACE_ENV_ARG_DECL) const = 0;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp
index 62fb33b84ff..c4d5496b556 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -266,7 +266,7 @@ TAO_Connector_Registry::preprocess_preconnects (TAO_ORB_Core *orb_core,
 int
 TAO_Connector_Registry::connect (TAO_GIOP_Invocation *invocation,
                                  TAO_Transport_Descriptor_Interface *desc
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   TAO_Endpoint *endpoint = desc->endpoint ();
   if (endpoint == 0)
@@ -281,13 +281,13 @@ TAO_Connector_Registry::connect (TAO_GIOP_Invocation *invocation,
 
   return connector->connect (invocation,
                              desc
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 int
 TAO_Connector_Registry::make_mprofile (const char *ior,
                                        TAO_MProfile &mprofile
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   if (!ior)
     // Failure: Null IOR string pointer
@@ -309,7 +309,7 @@ TAO_Connector_Registry::make_mprofile (const char *ior,
         {
           int mp_result = (*connector)->make_mprofile (ior,
                                                        mprofile
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (mp_result);
 
diff --git a/TAO/tao/Connector_Registry.h b/TAO/tao/Connector_Registry.h
index 28710b174be..74e961db243 100644
--- a/TAO/tao/Connector_Registry.h
+++ b/TAO/tao/Connector_Registry.h
@@ -84,13 +84,13 @@ public:
    */
   int connect (TAO_GIOP_Invocation *invocation,
                TAO_Transport_Descriptor_Interface *desc
-               TAO_ENV_ARG_DECL);
+               ACE_ENV_ARG_DECL);
 
   /// Parse a string containing a URL style IOR and return an
   /// MProfile.
   int make_mprofile (const char *ior,
                      TAO_MProfile &mprofile
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
   /// Create a profile based on the contents of <cdr>
   TAO_Profile* create_profile (TAO_InputCDR& cdr);
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index a59e33592bc..80e915709ed 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -59,10 +59,10 @@ tao_CORBA_Current_nil (
 CORBA_Current_ptr
 tao_CORBA_Current_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_Current::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -184,10 +184,10 @@ CORBA_Current_var::tao_nil (void)
 ::CORBA_Current_ptr
 CORBA_Current_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_Current::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -268,15 +268,15 @@ CORBA_Current::CORBA_Current (void)
 
   CORBA_Current_ptr CORBA_Current::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return CORBA_Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return CORBA_Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   CORBA_Current_ptr CORBA_Current::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index 7ddc4f055e2..be2ac03a544 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -95,7 +95,7 @@ public:
   static CORBA_Current_ptr tao_nil (void);
   static CORBA_Current_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -153,12 +153,12 @@ public:
 
   static CORBA_Current_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static CORBA_Current_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static CORBA_Current_ptr _nil (void)
diff --git a/TAO/tao/DLL_ORB.cpp b/TAO/tao/DLL_ORB.cpp
index 4c95981bc45..62ed79c9018 100644
--- a/TAO/tao/DLL_ORB.cpp
+++ b/TAO/tao/DLL_ORB.cpp
@@ -61,7 +61,7 @@ TAO_DLL_ORB::init (int /*argc*/, ACE_TCHAR *argv[])
       this->orb_ = CORBA::ORB_init (new_argc,
                                     new_argv.argv (),
                                     ""
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->orb_.in ()))
@@ -91,7 +91,7 @@ TAO_DLL_ORB::fini (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (TAO_Singleton_Manager::instance ()->fini () == -1)
@@ -115,7 +115,7 @@ TAO_DLL_ORB::svc (void)
   ACE_TRY_NEW_ENV
     {
       // Run the ORB event loop in its own thread.
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tao/DLL_Parser.cpp b/TAO/tao/DLL_Parser.cpp
index 231cc09084c..3dd8d974f3d 100644
--- a/TAO/tao/DLL_Parser.cpp
+++ b/TAO/tao/DLL_Parser.cpp
@@ -30,7 +30,7 @@ TAO_DLL_Parser::match_prefix (const char *ior_string) const
 CORBA::Object_ptr
 TAO_DLL_Parser::parse_string (const char *ior,
                               CORBA::ORB_ptr orb
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Skip the prefix, we know it is there because this method in only
@@ -52,7 +52,7 @@ TAO_DLL_Parser::parse_string (const char *ior,
          CORBA::Object::_nil ());
     }
 
-  return loader->create_object (orb, 0, 0 TAO_ENV_ARG_PARAMETER);
+  return loader->create_object (orb, 0, 0 ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_STATIC_SVC_DEFINE (TAO_DLL_Parser,
diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h
index 188528c222b..8858a364797 100644
--- a/TAO/tao/DLL_Parser.h
+++ b/TAO/tao/DLL_Parser.h
@@ -84,7 +84,7 @@ public:
   virtual int match_prefix (const char *ior_string) const;
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/Default_Collocation_Resolver.cpp b/TAO/tao/Default_Collocation_Resolver.cpp
index ef9c8569db2..fef0836a43e 100644
--- a/TAO/tao/Default_Collocation_Resolver.cpp
+++ b/TAO/tao/Default_Collocation_Resolver.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(tao, Default_Collocation_Resolver, "$Id$")
 
 CORBA::Boolean
 TAO_Default_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
-                                                 TAO_ENV_ARG_DECL_NOT_USED) const
+                                                 ACE_ENV_ARG_DECL_NOT_USED) const
 {
   return object->_is_collocated ();
 }
diff --git a/TAO/tao/Default_Collocation_Resolver.h b/TAO/tao/Default_Collocation_Resolver.h
index 8b35dfbf21e..c38d2be6ab6 100644
--- a/TAO/tao/Default_Collocation_Resolver.h
+++ b/TAO/tao/Default_Collocation_Resolver.h
@@ -37,7 +37,7 @@ public:
 
   /// Is <object> collocated?
   virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object
-                                        TAO_ENV_ARG_DECL) const;
+                                        ACE_ENV_ARG_DECL) const;
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Collocation_Resolver)
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.cpp b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
index a4a9967d201..784d1ae2aff 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
@@ -20,7 +20,7 @@ TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory (v
 
 TAO_Invocation_Endpoint_Selector *
 TAO_Default_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *
-                                             TAO_ENV_ARG_DECL_NOT_USED)
+                                             ACE_ENV_ARG_DECL_NOT_USED)
 {
   // Trivial endpoint selector.  Just return the default selector.
   return this->default_endpoint_selector_;
diff --git a/TAO/tao/Default_Endpoint_Selector_Factory.h b/TAO/tao/Default_Endpoint_Selector_Factory.h
index 2f878a7660f..d6b639a3472 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.h
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.h
@@ -61,7 +61,7 @@ public:
   /// initialize the endpoint selection state instance.
   virtual TAO_Invocation_Endpoint_Selector *get_selector (
                              TAO_GIOP_Invocation *invocation
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
 protected:
   /// The possible endpoint selector strategies that can be
diff --git a/TAO/tao/Default_Protocols_Hooks.cpp b/TAO/tao/Default_Protocols_Hooks.cpp
index cf6bb5600b8..2abb615e29a 100644
--- a/TAO/tao/Default_Protocols_Hooks.cpp
+++ b/TAO/tao/Default_Protocols_Hooks.cpp
@@ -19,7 +19,7 @@ TAO_Default_Protocols_Hooks::~TAO_Default_Protocols_Hooks (void)
 
 void
 TAO_Default_Protocols_Hooks::init_hooks (TAO_ORB_Core *
-                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -45,7 +45,7 @@ void
 TAO_Default_Protocols_Hooks::add_rt_service_context_hook (TAO_Service_Context &,
                                                           CORBA::Policy *,
                                                           CORBA::Short &
-                                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                                          ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -67,14 +67,14 @@ TAO_Default_Protocols_Hooks::get_selector_bands_policy_hook (CORBA::Policy *,
 
 int
 TAO_Default_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &
-                                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
 TAO_Default_Protocols_Hooks::get_thread_native_priority (CORBA::Short &
-                                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
@@ -82,34 +82,34 @@ TAO_Default_Protocols_Hooks::get_thread_native_priority (CORBA::Short &
 int
 TAO_Default_Protocols_Hooks::get_thread_CORBA_and_native_priority (CORBA::Short &,
                                                                    CORBA::Short &
-                                                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                                                   ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
 TAO_Default_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short
-                                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
 TAO_Default_Protocols_Hooks::set_thread_native_priority (CORBA::Short
-                                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
-TAO_Default_Protocols_Hooks::set_default_policies (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Default_Protocols_Hooks::set_default_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 int
 TAO_Default_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registry &
-                                                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
@@ -118,7 +118,7 @@ void
 TAO_Default_Protocols_Hooks::rt_service_context (TAO_Stub *,
                                                  TAO_Service_Context &,
                                                  CORBA::Boolean
-                                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h
index 86f06e61585..178777669e5 100644
--- a/TAO/tao/Default_Protocols_Hooks.h
+++ b/TAO/tao/Default_Protocols_Hooks.h
@@ -30,7 +30,7 @@ public:
   virtual ~TAO_Default_Protocols_Hooks (void);
 
   virtual void init_hooks (TAO_ORB_Core *orb_core
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
 
   virtual int call_client_protocols_hook (int &send_buffer_size,
                                           int &recv_buffer_size,
@@ -45,12 +45,12 @@ public:
   virtual void rt_service_context (TAO_Stub *stub,
                                    TAO_Service_Context &service_context,
                                    CORBA::Boolean restart
-                                   TAO_ENV_ARG_DECL);
+                                   ACE_ENV_ARG_DECL);
 
   virtual void add_rt_service_context_hook (TAO_Service_Context &service_context,
                                             CORBA::Policy *model_policy,
                                             CORBA::Short &client_priority
-                                            TAO_ENV_ARG_DECL);
+                                            ACE_ENV_ARG_DECL);
 
   virtual void get_selector_hook (CORBA::Policy *model_policy,
                                   CORBA::Boolean
@@ -64,25 +64,25 @@ public:
                                                int &in_range);
 
   virtual int get_thread_CORBA_priority (CORBA::Short &
-                                         TAO_ENV_ARG_DECL_NOT_USED);
+                                         ACE_ENV_ARG_DECL_NOT_USED);
 
   virtual int get_thread_native_priority (CORBA::Short &
-                                          TAO_ENV_ARG_DECL_NOT_USED);
+                                          ACE_ENV_ARG_DECL_NOT_USED);
 
   virtual int get_thread_CORBA_and_native_priority (CORBA::Short &,
                                                     CORBA::Short &
-                                                    TAO_ENV_ARG_DECL_NOT_USED);
+                                                    ACE_ENV_ARG_DECL_NOT_USED);
 
   virtual int set_thread_CORBA_priority (CORBA::Short
-                                         TAO_ENV_ARG_DECL_NOT_USED);
+                                         ACE_ENV_ARG_DECL_NOT_USED);
 
   virtual int set_thread_native_priority (CORBA::Short
-                                          TAO_ENV_ARG_DECL_NOT_USED);
+                                          ACE_ENV_ARG_DECL_NOT_USED);
 
-  virtual int set_default_policies (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int set_default_policies (ACE_ENV_SINGLE_ARG_DECL);
 
   virtual int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry
-                                                  TAO_ENV_ARG_DECL);
+                                                  ACE_ENV_ARG_DECL);
 
 };
 
diff --git a/TAO/tao/Default_Stub_Factory.cpp b/TAO/tao/Default_Stub_Factory.cpp
index 369ef406ade..21f5988080b 100644
--- a/TAO/tao/Default_Stub_Factory.cpp
+++ b/TAO/tao/Default_Stub_Factory.cpp
@@ -13,7 +13,7 @@ TAO_Stub *
 TAO_Default_Stub_Factory::create_stub (const char *repository_id,
                                const TAO_MProfile &profiles,
                                TAO_ORB_Core *orb_core
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   TAO_Stub *retval = 0;
 
diff --git a/TAO/tao/Default_Stub_Factory.h b/TAO/tao/Default_Stub_Factory.h
index ddad28d8717..4e706a64972 100644
--- a/TAO/tao/Default_Stub_Factory.h
+++ b/TAO/tao/Default_Stub_Factory.h
@@ -46,7 +46,7 @@ public:
   virtual TAO_Stub *create_stub (const char *repository_id,
                                  const TAO_MProfile &profiles,
                                  TAO_ORB_Core *orb_core
-                                 TAO_ENV_ARG_DECL);
+                                 ACE_ENV_ARG_DECL);
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Stub_Factory)
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
index 1c7052e675c..f0aa17c40dc 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.cpp
@@ -29,11 +29,11 @@ TAO_Default_Thread_Lane_Resources_Manager::~TAO_Default_Thread_Lane_Resources_Ma
 }
 
 int
-TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Default_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL)
 {
   int result =
     this->lane_resources_->open_acceptor_registry (0
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
diff --git a/TAO/tao/Default_Thread_Lane_Resources_Manager.h b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
index 6d6465e56db..8bc2a47f299 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
@@ -44,7 +44,7 @@ public:
   void finalize (void);
 
   /// Open default resources.
-  int open_default_resources (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int open_default_resources (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Shutdown reactor.
   void shutdown_reactor (void);
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index 3464929b539..9e1d83e7576 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -162,31 +162,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_DomainManager *tao_impl
     ,
     const CORBA::PolicyType & policy_type
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Policy_ptr result);
@@ -206,7 +206,7 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestIn
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_DomainManager *tao_impl,
     const CORBA::PolicyType & policy_type
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -214,12 +214,12 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestIn
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -235,25 +235,25 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (TAO_ENV_
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -265,7 +265,7 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::result (TAO_ENV_SIN
 
 char *
 TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -275,10 +275,10 @@ TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_most_derived
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -318,17 +318,17 @@ _TAO_DomainManager_Strategized_Proxy_Broker::~_TAO_DomainManager_Strategized_Pro
 _TAO_CORBA_DomainManager_Proxy_Impl&
 _TAO_DomainManager_Strategized_Proxy_Broker::select_proxy (
     ::CORBA::DomainManager *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -338,7 +338,7 @@ _TAO_DomainManager_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_DomainManager_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -409,7 +409,7 @@ _TAO_DomainManager_ThruPOA_Proxy_Impl::_TAO_DomainManager_ThruPOA_Proxy_Impl (vo
 CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy (
     CORBA::Object_ptr _collocated_tao_target_,
     CORBA::PolicyType policy_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -425,7 +425,7 @@ CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy (
       _collocated_tao_target_->_object_key (),
       "get_domain_policy",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -435,7 +435,7 @@ CORBA::Policy_ptr _TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy (
         )
     )->get_domain_policy (
         policy_type
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
@@ -463,7 +463,7 @@ void POA_CORBA_DomainManager::get_domain_policy_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -493,19 +493,19 @@ void POA_CORBA_DomainManager::get_domain_policy_skel (
       _tao_upcall,
       _tao_impl,
       policy_type
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->get_domain_policy (
           policy_type
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -514,7 +514,7 @@ void POA_CORBA_DomainManager::get_domain_policy_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -522,12 +522,12 @@ void POA_CORBA_DomainManager::get_domain_policy_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -554,7 +554,7 @@ void POA_CORBA_DomainManager::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -564,7 +564,7 @@ void POA_CORBA_DomainManager::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -577,11 +577,11 @@ void POA_CORBA_DomainManager::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -594,7 +594,7 @@ void POA_CORBA_DomainManager::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_DomainManager *_tao_impl = (POA_CORBA_DomainManager *) _tao_object_reference;
@@ -613,7 +613,7 @@ void POA_CORBA_DomainManager::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -640,10 +640,10 @@ void POA_CORBA_DomainManager::_interface_skel (
 
 CORBA::Boolean POA_CORBA_DomainManager::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -665,12 +665,12 @@ void* POA_CORBA_DomainManager::_downcast (
   return 0;
 }
 
-void POA_CORBA_DomainManager::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_DomainManager::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 const char* POA_CORBA_DomainManager::_interface_repository_id (void) const
@@ -679,9 +679,9 @@ const char* POA_CORBA_DomainManager::_interface_repository_id (void) const
 }
 
 CORBA::DomainManager*
-POA_CORBA_DomainManager::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -820,31 +820,31 @@ public:
     ,
     CORBA::InterfaceDef_ptr object_type,
     const CORBA::Boolean & constr_policy
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -865,7 +865,7 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRe
     POA_CORBA_ConstructionPolicy *tao_impl,
     CORBA::InterfaceDef_ptr object_type,
     const CORBA::Boolean & constr_policy
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -874,12 +874,12 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -898,25 +898,25 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (T
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -924,7 +924,7 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (TAO_
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -934,10 +934,10 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_most_
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -970,17 +970,17 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::~_TAO_ConstructionPolicy_Strat
 _TAO_CORBA_ConstructionPolicy_Proxy_Impl&
 _TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy (
     ::CORBA_ConstructionPolicy *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -990,7 +990,7 @@ _TAO_ConstructionPolicy_Strategized_Proxy_Broker::select_proxy (
 void
 _TAO_ConstructionPolicy_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -1062,7 +1062,7 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager (
     CORBA::Object_ptr _collocated_tao_target_,
     CORBA::InterfaceDef_ptr object_type,
     CORBA::Boolean constr_policy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1076,7 +1076,7 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager (
       _collocated_tao_target_->_object_key (),
       "make_domain_manager",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -1087,7 +1087,7 @@ void _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager (
     )->make_domain_manager (
         object_type,
         constr_policy
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -1117,7 +1117,7 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1150,12 +1150,12 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
       _tao_impl,
       object_type.in (),
       constr_policy
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -1163,13 +1163,13 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
       _tao_impl->make_domain_manager (
           object_type.in (),
           constr_policy
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1177,12 +1177,12 @@ void POA_CORBA_ConstructionPolicy::make_domain_manager_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1202,7 +1202,7 @@ void POA_CORBA_ConstructionPolicy::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1212,7 +1212,7 @@ void POA_CORBA_ConstructionPolicy::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1225,11 +1225,11 @@ void POA_CORBA_ConstructionPolicy::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1242,7 +1242,7 @@ void POA_CORBA_ConstructionPolicy::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstructionPolicy *_tao_impl = (POA_CORBA_ConstructionPolicy *) _tao_object_reference;
@@ -1261,7 +1261,7 @@ void POA_CORBA_ConstructionPolicy::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -1288,10 +1288,10 @@ void POA_CORBA_ConstructionPolicy::_interface_skel (
 
 CORBA::Boolean POA_CORBA_ConstructionPolicy::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -1316,12 +1316,12 @@ void* POA_CORBA_ConstructionPolicy::_downcast (
   return 0;
 }
 
-void POA_CORBA_ConstructionPolicy::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_ConstructionPolicy::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 const char* POA_CORBA_ConstructionPolicy::_interface_repository_id (void) const
@@ -1330,9 +1330,9 @@ const char* POA_CORBA_ConstructionPolicy::_interface_repository_id (void) const
 }
 
 CORBA_ConstructionPolicy*
-POA_CORBA_ConstructionPolicy::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index 6ac9df55722..5c039d1da46 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -67,7 +67,7 @@
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -78,38 +78,38 @@
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::DomainManager *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA::Policy_ptr get_domain_policy (
         CORBA::PolicyType policy_type
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -119,7 +119,7 @@
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
 
@@ -139,7 +139,7 @@
 
     virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy (
       ::CORBA::DomainManager *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -147,7 +147,7 @@
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
     // Caches the proxy implementations. The proxy implementation
@@ -187,7 +187,7 @@
     virtual CORBA::Policy_ptr get_domain_policy (
         CORBA::Object_ptr _collocated_tao_target_,
         CORBA::PolicyType policy_type
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -219,7 +219,7 @@
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -230,31 +230,31 @@
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     CORBA_ConstructionPolicy *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
@@ -262,7 +262,7 @@
     virtual void make_domain_manager (
         CORBA::InterfaceDef_ptr object_type,
         CORBA::Boolean constr_policy
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -272,28 +272,28 @@
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _get_policy_type_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void copy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static void destroy_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *context
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
@@ -313,7 +313,7 @@
 
     virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy (
       CORBA_ConstructionPolicy *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -321,7 +321,7 @@
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
     // Caches the proxy implementations. The proxy implementation
@@ -364,7 +364,7 @@
         CORBA::Object_ptr _collocated_tao_target_,
         CORBA::InterfaceDef_ptr object_type,
         CORBA::Boolean constr_policy
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/Domain/DomainS.i b/TAO/tao/Domain/DomainS.i
index e02dec11a7e..e3270650796 100644
--- a/TAO/tao/Domain/DomainS.i
+++ b/TAO/tao/Domain/DomainS.i
@@ -23,7 +23,7 @@ ACE_INLINE void POA_CORBA_ConstructionPolicy::_get_policy_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj;
@@ -31,14 +31,14 @@ ACE_INLINE void POA_CORBA_ConstructionPolicy::_get_policy_type_skel (
       req,
       (POA_CORBA_Policy_ptr) impl,
       context
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstructionPolicy::copy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj;
@@ -46,14 +46,14 @@ ACE_INLINE void POA_CORBA_ConstructionPolicy::copy_skel (
       req,
       (POA_CORBA_Policy_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstructionPolicy::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Policy_ptr impl = (POA_CORBA_ConstructionPolicy_ptr) obj;
@@ -61,6 +61,6 @@ ACE_INLINE void POA_CORBA_ConstructionPolicy::destroy_skel (
       req,
       (POA_CORBA_Policy_ptr) impl,
       context
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h
index 08cacb8d638..438a6e9a4ef 100644
--- a/TAO/tao/Domain/DomainS_T.h
+++ b/TAO/tao/Domain/DomainS_T.h
@@ -62,11 +62,11 @@
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::Policy_ptr get_domain_policy (
         CORBA::PolicyType policy_type
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -112,33 +112,33 @@
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     void make_domain_manager (
         CORBA::InterfaceDef_ptr object_type,
         CORBA::Boolean constr_policy
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     CORBA::PolicyType policy_type (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     CORBA::Policy_ptr copy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/Domain/DomainS_T.i b/TAO/tao/Domain/DomainS_T.i
index a31fb10cbd6..c48f6480cad 100644
--- a/TAO/tao/Domain/DomainS_T.i
+++ b/TAO/tao/Domain/DomainS_T.i
@@ -90,18 +90,18 @@ POA_CORBA_DomainManager_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_DomainManager_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_DomainManager_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_DomainManager::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_DomainManager::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Policy_ptr POA_CORBA_DomainManager_tie<T>::get_domain_policy  (
     CORBA::PolicyType policy_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -109,7 +109,7 @@ CORBA::Policy_ptr POA_CORBA_DomainManager_tie<T>::get_domain_policy  (
 {
   return this->ptr_->get_domain_policy (
 policy_type
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -182,19 +182,19 @@ POA_CORBA_ConstructionPolicy_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ConstructionPolicy_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_ConstructionPolicy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ConstructionPolicy::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_ConstructionPolicy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstructionPolicy_tie<T>::make_domain_manager  (
     CORBA::InterfaceDef_ptr object_type,
     CORBA::Boolean constr_policy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -203,46 +203,46 @@ void POA_CORBA_ConstructionPolicy_tie<T>::make_domain_manager  (
   this->ptr_->make_domain_manager (
 object_type,
     constr_policy
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA_ConstructionPolicy_tie<T>::policy_type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->policy_type (
-TAO_ENV_SINGLE_ARG_PARAMETER
+ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Policy_ptr POA_CORBA_ConstructionPolicy_tie<T>::copy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->copy (
-TAO_ENV_SINGLE_ARG_PARAMETER
+ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstructionPolicy_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-TAO_ENV_SINGLE_ARG_PARAMETER
+ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 9fd320eb250..8adea9e92ab 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -71,10 +71,10 @@ tao_CORBA_DomainManager_nil (
 CORBA_DomainManager_ptr
 tao_CORBA_DomainManager_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_DomainManager::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_DomainManager::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -196,10 +196,10 @@ CORBA_DomainManager_var::tao_nil (void)
 ::CORBA_DomainManager_ptr
 CORBA_DomainManager_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_DomainManager::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_DomainManager::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -278,21 +278,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::PolicyType & policy_type
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -310,19 +310,19 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestIn
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::PolicyType & policy_type
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     policy_type_ (policy_type)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -338,12 +338,12 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::arguments (TAO_ENV_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -351,13 +351,13 @@ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::exceptions (TAO_ENV
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -390,7 +390,7 @@ _TAO_CORBA_DomainManager_Remote_Proxy_Impl::_TAO_CORBA_DomainManager_Remote_Prox
 CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy (
     CORBA::Object_ptr _collocated_tao_target_,
     CORBA::PolicyType policy_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -434,7 +434,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
         &_tao_call,
         _collocated_tao_target_,
         policy_type
-         TAO_ENV_ARG_PARAMETER
+         ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -450,7 +450,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
         {
           _tao_vfr.send_request (
             &ri
-             TAO_ENV_ARG_PARAMETER
+             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -462,12 +462,12 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-               TAO_ENV_ARG_PARAMETER
+               ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -481,7 +481,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -498,7 +498,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                   TAO_ENV_ARG_PARAMETER
+                   ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -526,7 +526,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-             TAO_ENV_ARG_PARAMETER
+             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -536,12 +536,12 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-           TAO_ENV_ARG_PARAMETER
+           ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -552,7 +552,7 @@ CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -607,7 +607,7 @@ _TAO_CORBA_DomainManager_Remote_Proxy_Broker::~_TAO_CORBA_DomainManager_Remote_P
 _TAO_CORBA_DomainManager_Proxy_Impl&
 _TAO_CORBA_DomainManager_Remote_Proxy_Broker::select_proxy (
   ::CORBA_DomainManager *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -648,24 +648,24 @@ void CORBA_DomainManager::_tao_any_destructor (void *x)
 
 CORBA_DomainManager_ptr CORBA_DomainManager::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_DomainManager::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_DomainManager::_nil ());
       if (is_a == 0)
         return CORBA_DomainManager::_nil ();
     }
-  return CORBA_DomainManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_DomainManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -734,14 +734,14 @@ CORBA_DomainManager::_duplicate (CORBA_DomainManager_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_DomainManager::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_DomainManager::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_DomainManager::_tao_QueryInterface (ptr_arith_t type)
@@ -767,20 +767,20 @@ const char* CORBA_DomainManager::_interface_repository_id (void) const
 
 CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy (
     CORBA::PolicyType policy_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_DomainManager_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_DomainManager_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_DomainManager_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.get_domain_policy (
       this,
       policy_type
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -849,10 +849,10 @@ tao_CORBA_ConstructionPolicy_nil (
 CORBA_ConstructionPolicy_ptr
 tao_CORBA_ConstructionPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_ConstructionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -974,10 +974,10 @@ CORBA_ConstructionPolicy_var::tao_nil (void)
 ::CORBA_ConstructionPolicy_ptr
 CORBA_ConstructionPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ConstructionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_ConstructionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1057,21 +1057,21 @@ public:
       CORBA::Object_ptr _tao_target,
       CORBA_InterfaceDef_ptr object_type,
       const CORBA::Boolean & constr_policy
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1089,7 +1089,7 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRe
     CORBA::Object_ptr _tao_target,
     CORBA_InterfaceDef_ptr object_type,
     const CORBA::Boolean & constr_policy
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     object_type_ (object_type),
@@ -1097,12 +1097,12 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRe
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1129,12 +1129,12 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (T
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -1142,13 +1142,13 @@ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::exceptions (
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1172,7 +1172,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
     CORBA::Object_ptr _collocated_tao_target_,
     CORBA_InterfaceDef_ptr object_type,
     CORBA::Boolean constr_policy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1221,7 +1221,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
         _collocated_tao_target_,
         object_type,
         constr_policy
-         TAO_ENV_ARG_PARAMETER
+         ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -1237,7 +1237,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
         {
           _tao_vfr.send_request (
             &ri
-             TAO_ENV_ARG_PARAMETER
+             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1249,12 +1249,12 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-               TAO_ENV_ARG_PARAMETER
+               ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -1268,7 +1268,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1284,7 +1284,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                   TAO_ENV_ARG_PARAMETER
+                   ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1298,7 +1298,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-             TAO_ENV_ARG_PARAMETER
+             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1308,12 +1308,12 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-           TAO_ENV_ARG_PARAMETER
+           ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1324,7 +1324,7 @@ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::make_domain_manager (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1379,7 +1379,7 @@ _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker::~_TAO_CORBA_ConstructionPolic
 _TAO_CORBA_ConstructionPolicy_Proxy_Impl&
 _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ConstructionPolicy *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -1422,24 +1422,24 @@ void CORBA_ConstructionPolicy::_tao_any_destructor (void *x)
 
 CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ConstructionPolicy::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ConstructionPolicy::_nil ());
       if (is_a == 0)
         return CORBA_ConstructionPolicy::_nil ();
     }
-  return CORBA_ConstructionPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_ConstructionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1508,7 +1508,7 @@ CORBA_ConstructionPolicy::_duplicate (CORBA_ConstructionPolicy_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ConstructionPolicy::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_ConstructionPolicy::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) ||
@@ -1516,7 +1516,7 @@ CORBA::Boolean CORBA_ConstructionPolicy::_is_a (const CORBA::Char *value TAO_ENV
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ConstructionPolicy::_tao_QueryInterface (ptr_arith_t type)
@@ -1555,21 +1555,21 @@ const char* CORBA_ConstructionPolicy::_interface_repository_id (void) const
 void CORBA_ConstructionPolicy::make_domain_manager (
     CORBA_InterfaceDef_ptr object_type,
     CORBA::Boolean constr_policy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ConstructionPolicy_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ConstructionPolicy_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ConstructionPolicy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.make_domain_manager (
       this,
       object_type,
       constr_policy
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1681,11 +1681,11 @@ CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy =
   _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_downcast (
       void* target,
       CORBA_Object *src
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
     CORBA_DomainManager **tmp = ACE_static_cast (CORBA_DomainManager**, target);
-    *tmp = CORBA_DomainManager::_narrow (src TAO_ENV_ARG_PARAMETER);
+    *tmp = CORBA_DomainManager::_narrow (src ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -1828,7 +1828,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManager_ptr
     _tao_elem = CORBA_DomainManager::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManager TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManager ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -1889,7 +1889,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstructionPolicy
     _tao_elem = CORBA_ConstructionPolicy::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ConstructionPolicy TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (_tc_CORBA_ConstructionPolicy ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -1972,7 +1972,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_DomainManage
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManagerList TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (_tc_CORBA_DomainManagerList ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2041,7 +2041,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_DomainManager::_unchecked_narrow (
           obj.in ()
-           TAO_ENV_ARG_PARAMETER
+           ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -2077,7 +2077,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_ConstructionPolicy::_unchecked_narrow (
           obj.in ()
-           TAO_ENV_ARG_PARAMETER
+           ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 52f2ee42d37..3638d9e5a59 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -96,7 +96,7 @@ public:
   static CORBA_DomainManager_ptr tao_nil (void);
   static CORBA_DomainManager_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -159,11 +159,11 @@ public:
 
   static CORBA_DomainManager_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CORBA_DomainManager_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static CORBA_DomainManager_ptr _nil (void)
@@ -175,7 +175,7 @@ public:
 
   virtual CORBA::Policy_ptr get_domain_policy (
       CORBA::PolicyType policy_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -183,7 +183,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -233,7 +233,7 @@ private:
         virtual CORBA::Policy_ptr get_domain_policy (
         CORBA::Object_ptr _collocated_tao_target_,
         CORBA::PolicyType policy_type
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -265,7 +265,7 @@ public:
   virtual CORBA::Policy_ptr get_domain_policy (
       CORBA::Object_ptr _collocated_tao_target_,
       CORBA::PolicyType policy_type
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -293,7 +293,7 @@ public:
   virtual ~_TAO_CORBA_DomainManager_Proxy_Broker (void);
   virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy (
     CORBA_DomainManager *object
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   ) = 0;
 
 protected:
@@ -320,7 +320,7 @@ public:
 
   virtual _TAO_CORBA_DomainManager_Proxy_Impl &select_proxy (
     CORBA_DomainManager *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -383,7 +383,7 @@ public:
   static CORBA_ConstructionPolicy_ptr tao_nil (void);
   static CORBA_ConstructionPolicy_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -446,12 +446,12 @@ public:
 
   static CORBA_ConstructionPolicy_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static CORBA_ConstructionPolicy_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static CORBA_ConstructionPolicy_ptr _nil (void)
@@ -464,7 +464,7 @@ public:
   virtual void make_domain_manager (
       CORBA_InterfaceDef_ptr object_type,
       CORBA::Boolean constr_policy
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -472,7 +472,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -524,7 +524,7 @@ public:
     CORBA::Object_ptr _collocated_tao_target_,
     CORBA_InterfaceDef_ptr object_type,
     CORBA::Boolean constr_policy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -557,7 +557,7 @@ public:
       CORBA::Object_ptr _collocated_tao_target_,
       CORBA_InterfaceDef_ptr object_type,
       CORBA::Boolean constr_policy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -586,7 +586,7 @@ public:
   virtual ~_TAO_CORBA_ConstructionPolicy_Proxy_Broker (void);
   virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy (
     CORBA_ConstructionPolicy *object
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   ) = 0;
 
 protected:
@@ -612,7 +612,7 @@ public:
 
   virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl &select_proxy (
     CORBA_ConstructionPolicy *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -682,7 +682,7 @@ public:
   virtual void _downcast (
       void* target,
       CORBA_Object *src
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual CORBA_Object* _upcast (void *src) const;
 };
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.cpp b/TAO/tao/DynamicAny/DynAnyFactory.cpp
index 1c99f5619a4..58721933e8f 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -35,18 +35,18 @@ TAO_DynAnyFactory::TAO_DynAnyFactory (void)
 // to extract the TCKind of possibly aliased types.
 CORBA::TCKind
 TAO_DynAnyFactory::unalias (CORBA_TypeCode_ptr tc
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
-  CORBA::TCKind tck = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   while (tck == CORBA::tk_alias)
     {
-      CORBA_TypeCode_var temp = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA_TypeCode_var temp = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::tk_null);
 
       tck = TAO_DynAnyFactory::unalias (temp.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::tk_null);
     }
 
@@ -56,18 +56,18 @@ TAO_DynAnyFactory::unalias (CORBA_TypeCode_ptr tc
 // Same as above, but returns the type code.
 CORBA::TypeCode_ptr
 TAO_DynAnyFactory::strip_alias (CORBA_TypeCode_ptr tc
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   CORBA_TypeCode_var retval = CORBA::TypeCode::_duplicate (tc);
-  CORBA::TCKind tck = retval->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   while (tck == CORBA::tk_alias)
     {
-      retval = retval->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      retval = retval->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-      tck = retval->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      tck = retval->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
     }
 
@@ -77,36 +77,36 @@ TAO_DynAnyFactory::strip_alias (CORBA_TypeCode_ptr tc
 DynamicAny::DynAny_ptr
 TAO_DynAnyFactory::create_dyn_any (
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAnyFactory::InconsistentTypeCode
     ))
 {
-  return TAO_DynAnyFactory::make_dyn_any (value TAO_ENV_ARG_PARAMETER);
+  return TAO_DynAnyFactory::make_dyn_any (value ACE_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynAny_ptr
 TAO_DynAnyFactory::create_dyn_any_from_type_code (
       CORBA::TypeCode_ptr type
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAnyFactory::InconsistentTypeCode
     ))
 {
-  return TAO_DynAnyFactory::make_dyn_any (type TAO_ENV_ARG_PARAMETER);
+  return TAO_DynAnyFactory::make_dyn_any (type ACE_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynAny_ptr
 TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   switch (kind)
@@ -139,7 +139,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynAny_i> dp (p);
-          p->init (any TAO_ENV_ARG_PARAMETER);
+          p->init (any ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -155,7 +155,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynStruct_i> dp (p);
-          p->init (any TAO_ENV_ARG_PARAMETER);
+          p->init (any ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -170,7 +170,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynSequence_i> dp (p);
-          p->init (any TAO_ENV_ARG_PARAMETER);
+          p->init (any ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -185,7 +185,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynUnion_i> dp (p);
-          p->init (any TAO_ENV_ARG_PARAMETER);
+          p->init (any ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -200,7 +200,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynEnum_i> dp (p);
-          p->init (any TAO_ENV_ARG_PARAMETER);
+          p->init (any ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -215,7 +215,7 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynArray_i> dp (p);
-          p->init (any TAO_ENV_ARG_PARAMETER);
+          p->init (any ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -241,10 +241,10 @@ TAO_DynAnyFactory::make_dyn_any (const CORBA_Any &any
 
 DynamicAny::DynAny_ptr
 TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   CORBA::TCKind kind =
-    TAO_DynAnyFactory::unalias (tc TAO_ENV_ARG_PARAMETER);
+    TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   switch (kind)
@@ -277,7 +277,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynAny_i> dp (p);
-          p->init (tc TAO_ENV_ARG_PARAMETER);
+          p->init (tc ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -293,7 +293,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynStruct_i> dp (p);
-          p->init (tc TAO_ENV_ARG_PARAMETER);
+          p->init (tc ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -308,7 +308,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynSequence_i> dp (p);
-          p->init (tc TAO_ENV_ARG_PARAMETER);
+          p->init (tc ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -323,7 +323,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynUnion_i> dp (p);
-          p->init (tc TAO_ENV_ARG_PARAMETER);
+          p->init (tc ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -338,7 +338,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynEnum_i> dp (p);
-          p->init (tc TAO_ENV_ARG_PARAMETER);
+          p->init (tc ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
@@ -353,7 +353,7 @@ TAO_DynAnyFactory::make_dyn_any (CORBA::TypeCode_ptr tc
           ACE_CHECK_RETURN (0);
 
           ACE_Auto_Basic_Ptr<TAO_DynArray_i> dp (p);
-          p->init (tc TAO_ENV_ARG_PARAMETER);
+          p->init (tc ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return dp.release ();
diff --git a/TAO/tao/DynamicAny/DynAnyFactory.h b/TAO/tao/DynamicAny/DynAnyFactory.h
index 147550d503e..7e414a9d273 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -45,28 +45,28 @@ public:
   // Constructor.
 
   static CORBA::TCKind unalias (CORBA_TypeCode_ptr tc
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
   // Obtain the kind of object, after all aliasing has been removed.
 
   static CORBA_TypeCode_ptr strip_alias (CORBA_TypeCode_ptr tc
-                                         TAO_ENV_ARG_DECL);
+                                         ACE_ENV_ARG_DECL);
   // Same as above, but returns type code instead of TCKind. Caller
   // must release the return value.
 
   static DynamicAny::DynAny_ptr
      make_dyn_any (const CORBA_Any &any
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
   // Create the correct type of DynAny object for <any>.
 
   static DynamicAny::DynAny_ptr
      make_dyn_any (CORBA::TypeCode_ptr tc
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
   // Create the correct type of DynAny object for <tc>
 
   // = The DynamicAnyFactory methods.
   virtual DynamicAny::DynAny_ptr create_dyn_any (
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -75,7 +75,7 @@ public:
 
   virtual DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
       CORBA::TypeCode_ptr type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index a6226764fb7..dd921bcefcc 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -18,10 +18,10 @@ TAO_DynAny_i::~TAO_DynAny_i (void)
 
 void
 TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   // Check to see if it's a simple type.
-  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc TAO_ENV_ARG_PARAMETER);
+  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   switch (tk)
   {
@@ -52,9 +52,9 @@ TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc
 
 void
 TAO_DynAny_i::set_to_default_value (CORBA::TypeCode_ptr tc
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc TAO_ENV_ARG_PARAMETER);
+  CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   switch (tk)
   {
@@ -149,14 +149,14 @@ TAO_DynAny_i::init_common (void)
 
 void
 TAO_DynAny_i::init (CORBA_TypeCode_ptr tc
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   this->check_typecode (tc
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->set_to_default_value (tc
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->init_common ();
@@ -166,11 +166,11 @@ TAO_DynAny_i::init (CORBA_TypeCode_ptr tc
 
 void
 TAO_DynAny_i::init (const CORBA_Any& any
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   this->type_ = any.type ();
   this->check_typecode (this->type_.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->init_common ();
@@ -182,7 +182,7 @@ TAO_DynAny_i::init (const CORBA_Any& any
 
 TAO_DynAny_i *
 TAO_DynAny_i::_narrow (CORBA::Object_ptr obj
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -220,7 +220,7 @@ TAO_DynAny_i::_tao_QueryInterface (ptr_arith_t type)
 
 void
 TAO_DynAny_i::from_any (const CORBA_Any &any
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -236,7 +236,7 @@ TAO_DynAny_i::from_any (const CORBA_Any &any
 
   CORBA::Boolean equiv =
     this->type_->equivalent (any_tc.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!equiv)
@@ -252,7 +252,7 @@ TAO_DynAny_i::from_any (const CORBA_Any &any
 }
 
 CORBA::Any_ptr
-TAO_DynAny_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynAny_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -275,7 +275,7 @@ TAO_DynAny_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -287,7 +287,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
     }
 
   TAO_DynAny_i *rhs_n = TAO_DynAny_i::_narrow (rhs
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (rhs_n == 0)
@@ -296,7 +296,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
     }
 
   CORBA::Boolean equiv = this->type_->equivalent (rhs_n->type_.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!equiv)
@@ -417,22 +417,22 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
 
         DynamicAny::DynAny_var rhs_dyn =
           TAO_DynAnyFactory::make_dyn_any (rhs_v
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         DynamicAny::DynAny_var lhs_dyn =
           TAO_DynAnyFactory::make_dyn_any (lhs_v
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         CORBA::Boolean b = rhs_dyn->equal (lhs_dyn.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
-        rhs_dyn->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+        rhs_dyn->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
-        lhs_dyn->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+        lhs_dyn->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         return b;
@@ -445,7 +445,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
         this->any_ >>= lhs_v;
         // See CORBA 2.4.2 - must use equal() here.
         return lhs_v->equal (lhs_v
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_objref:
       {
@@ -454,16 +454,16 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
         CORBA::Object_ptr lhs_v;
         this->any_ >>= CORBA::Any::to_object (lhs_v);
         return lhs_v->_is_equivalent (lhs_v
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_string:
       {
         CORBA::TypeCode_var unaliased_tc =
           TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
-        CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+        CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         const char* rhs_v;
@@ -484,10 +484,10 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
       {
         CORBA::TypeCode_var unaliased_tc =
           TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
-        CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+        CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         CORBA::WChar * rhs_v;
@@ -506,7 +506,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
 }
 
 void
-TAO_DynAny_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynAny_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -524,7 +524,7 @@ TAO_DynAny_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
 
 
 DynamicAny::DynAny_ptr
-TAO_DynAny_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynAny_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h
index f11e447f0b6..b9158f79cd4 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -52,17 +52,17 @@ public:
   // Destructor.
 
   void init (CORBA_TypeCode_ptr tc
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize using just a TypeCode
 
   void init (const CORBA_Any& any
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize using an Any.
 
   // = LocalObject methods.
   static TAO_DynAny_i *_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -70,7 +70,7 @@ public:
 
   virtual void from_any (
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -79,7 +79,7 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -87,21 +87,21 @@ public:
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -111,11 +111,11 @@ public:
 private:
   // Check if the typecode is acceptable.
   void check_typecode (CORBA::TypeCode_ptr tc
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
 
   // Used when we are created from a typecode.
   void set_to_default_value (CORBA::TypeCode_ptr tc
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   // Called by both versions of init().
   void init_common (void);
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index 721ee0d64a6..6802ad3f5ac 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -30,12 +30,12 @@ TAO_DynArray_i::init_common (void)
 
 void
 TAO_DynArray_i::init (const CORBA_Any & any
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
 
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_array)
@@ -46,7 +46,7 @@ TAO_DynArray_i::init (const CORBA_Any & any
   this->type_ = tc;
 
   CORBA::ULong numfields = this->get_tc_length (tc.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   // Resize the array.
   this->da_members_.size (numfields);
@@ -60,7 +60,7 @@ TAO_DynArray_i::init (const CORBA_Any & any
                     any._tao_byte_order ());
 
   CORBA::TypeCode_var field_tc =
-    this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < numfields; i++)
@@ -75,23 +75,23 @@ TAO_DynArray_i::init (const CORBA_Any & any
       // based on the type of field_any.
       this->da_members_[i] =
         TAO_DynAnyFactory::make_dyn_any (field_any
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Move to the next field in the CDR stream.
       (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
                                                &cdr
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_DynArray_i::init (CORBA_TypeCode_ptr tc
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_array)
@@ -102,7 +102,7 @@ TAO_DynArray_i::init (CORBA_TypeCode_ptr tc
   this->type_ = CORBA::TypeCode::_duplicate (tc);
 
   CORBA::ULong numfields = this->get_tc_length (tc
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Resize the array.
@@ -110,39 +110,39 @@ TAO_DynArray_i::init (CORBA_TypeCode_ptr tc
 
   this->init_common ();
 
-  CORBA::TypeCode_var elemtype = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var elemtype = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < numfields; ++i)
     {
       // Recursively initialize each element.
       this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (elemtype.in ()
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 CORBA::TypeCode_ptr
-TAO_DynArray_i::get_element_type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynArray_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::TypeCode_var element_type =
     CORBA_TypeCode::_duplicate (this->type_.in ());
 
   // Strip away aliases (if any) on top of the outer type
-  CORBA::TCKind kind = element_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
 
   while (kind != CORBA::tk_array)
     {
-      element_type = element_type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      element_type = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
 
-      kind = element_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
     }
 
   // Return the content type.
-  CORBA_TypeCode_ptr retval = element_type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_TypeCode_ptr retval = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
 
   return retval;
@@ -151,21 +151,21 @@ TAO_DynArray_i::get_element_type (TAO_ENV_SINGLE_ARG_DECL)
 // Get the length from the (possibly aliased) typecode.
 CORBA::ULong
 TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tctmp = CORBA::TypeCode::_duplicate (tc);
-  CORBA::TCKind kind = tctmp->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = tctmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   while (kind == CORBA::tk_alias)
     {
-      tctmp = tctmp->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      tctmp = tctmp->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-      kind = tctmp->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      kind = tctmp->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
-  CORBA::ULong retval = tctmp->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong retval = tctmp->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return retval;
@@ -175,7 +175,7 @@ TAO_DynArray_i::get_tc_length (CORBA::TypeCode_ptr tc
 
 TAO_DynArray_i *
 TAO_DynArray_i::_narrow (CORBA::Object_ptr obj
-                         TAO_ENV_ARG_DECL_NOT_USED)
+                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -212,7 +212,7 @@ TAO_DynArray_i::_tao_QueryInterface (ptr_arith_t type)
 // ****************************************************************
 
 DynamicAny::AnySeq *
-TAO_DynArray_i::get_elements (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynArray_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -239,7 +239,7 @@ TAO_DynArray_i::get_elements (TAO_ENV_SINGLE_ARG_DECL)
   // Initialize each Any.
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      tmp = this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      tmp = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       safe_retval[i] = tmp.in ();
@@ -250,7 +250,7 @@ TAO_DynArray_i::get_elements (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -270,7 +270,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
     }
 
   CORBA::TypeCode_var value_tc;
-  CORBA::TypeCode_var element_type = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var element_type = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < length; i++)
@@ -278,17 +278,17 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
       // Check each arg element for type match.
       value_tc = value[i].type ();
       CORBA::Boolean equivalent = value_tc->equivalent (element_type.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (equivalent)
         {
-          this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           this->da_members_[i] =
             TAO_DynAnyFactory::make_dyn_any (value[i]
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -299,7 +299,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
 }
 
 DynamicAny::DynAnySeq *
-TAO_DynArray_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynArray_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -325,7 +325,7 @@ TAO_DynArray_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
       // Set the flag so the caller can't destroy.
       this->set_flag (this->da_members_[i].in (),
                       0
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       safe_retval[i] =
@@ -339,7 +339,7 @@ TAO_DynArray_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
 void
 TAO_DynArray_i::set_elements_as_dyn_any (
     const DynamicAny::DynAnySeq & values
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -359,7 +359,7 @@ TAO_DynArray_i::set_elements_as_dyn_any (
       ACE_THROW (DynamicAny::DynAny::InvalidValue ());
     }
 
-  CORBA::TypeCode_var element_type = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var element_type = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var val_type;
@@ -367,17 +367,17 @@ TAO_DynArray_i::set_elements_as_dyn_any (
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      val_type = values[i]->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      val_type = values[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       equivalent = val_type->equivalent (element_type.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 
       ACE_CHECK;
 
       if (equivalent)
         {
-          this->da_members_[i] = values[i]->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->da_members_[i] = values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -391,7 +391,7 @@ TAO_DynArray_i::set_elements_as_dyn_any (
 
 void
 TAO_DynArray_i::from_any (const CORBA_Any& any
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -405,7 +405,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any
 
   CORBA::TypeCode_var tc = any.type ();
   CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in ()
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equivalent)
@@ -417,7 +417,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any
 
       CORBA::ULong length = this->da_members_.size ();
       CORBA::ULong arg_length = this->get_tc_length (tc.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (length != arg_length)
@@ -425,7 +425,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any
           ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
         }
 
-      CORBA::TypeCode_var field_tc = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var field_tc = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       for (CORBA::ULong i = 0; i < arg_length; ++i)
@@ -436,18 +436,18 @@ TAO_DynArray_i::from_any (const CORBA_Any& any
                                cdr.byte_order (),
                                cdr.start ());
 
-          this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           this->da_members_[i] =
             TAO_DynAnyFactory::make_dyn_any (field_any
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Move to the next field in the CDR stream.
           (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
                                                    &cdr
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -460,7 +460,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any
 }
 
 CORBA::Any_ptr
-TAO_DynArray_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -471,7 +471,7 @@ TAO_DynArray_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
                         0);
     }
 
-  CORBA_TypeCode_var field_tc = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_TypeCode_var field_tc = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_OutputCDR out_cdr;
@@ -481,7 +481,7 @@ TAO_DynArray_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       // Recursive step.
-      field_any = this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      field_any = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_Message_Block* field_mb = field_any->_tao_get_cdr ();
@@ -492,7 +492,7 @@ TAO_DynArray_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
                                                  &field_cdr,
                                                  &out_cdr
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -512,7 +512,7 @@ TAO_DynArray_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -523,11 +523,11 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs
                         0);
     }
 
-  CORBA::TypeCode_var tc = rhs->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!equivalent)
@@ -542,15 +542,15 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs
     {
       rhs->seek (ACE_static_cast (CORBA::Long,
                                   i)
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      tmp = rhs->current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Recursive step.
       member_equal = tmp->equal (this->da_members_[i].in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (!member_equal)
@@ -563,7 +563,7 @@ TAO_DynArray_i::equal (DynamicAny::DynAny_ptr rhs
 }
 
 void
-TAO_DynArray_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynArray_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -580,10 +580,10 @@ TAO_DynArray_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
         {
           this->set_flag (da_members_[i].in (),
                           1
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -592,7 +592,7 @@ TAO_DynArray_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynArray_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynArray_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -614,7 +614,7 @@ TAO_DynArray_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
 
   this->set_flag (this->da_members_[index].in (),
                   0
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   return DynamicAny::DynAny::_duplicate (
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h
index 3f872d7aa00..083320ad336 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -53,24 +53,24 @@ public:
   // Destructor.
 
   void init (CORBA_TypeCode_ptr tc
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize using just a TypeCode.
 
   void init (const CORBA_Any& any
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize using an Any.
 
   // = LocalObject methods
   static TAO_DynArray_i *_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   // = Functions specific to DynArray.
 
   virtual DynamicAny::AnySeq * get_elements (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -78,7 +78,7 @@ public:
 
   virtual void set_elements (
       const DynamicAny::AnySeq & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -87,7 +87,7 @@ public:
       ));
 
   virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -95,7 +95,7 @@ public:
 
   virtual void set_elements_as_dyn_any (
       const DynamicAny::DynAnySeq & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -107,7 +107,7 @@ public:
 
   virtual void from_any (
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -116,7 +116,7 @@ public:
     ));
 
   virtual CORBA::Any * to_any (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -124,21 +124,21 @@ public:
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -147,11 +147,11 @@ public:
 
 private:
   // Returns the type of elements contained in the array.
-  CORBA::TypeCode_ptr get_element_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  CORBA::TypeCode_ptr get_element_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   // Gets the length of the array from the typecode.
   CORBA::ULong get_tc_length (CORBA::TypeCode_ptr tc
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // Called by both versions of init().
   void init_common (void);
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 7856a20e322..b809c617510 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -25,7 +25,7 @@ TAO_DynCommon::~TAO_DynCommon (void)
 // *****************************************************************
 
 CORBA::TypeCode_ptr
-TAO_DynCommon::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::type (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -41,7 +41,7 @@ TAO_DynCommon::type (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -52,20 +52,20 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
       ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
     }
 
-  CORBA_TypeCode_var tc = dyn_any->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_TypeCode_var tc = dyn_any->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in ()
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equivalent)
     {
-      CORBA_Any_var any = dyn_any->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA_Any_var any = dyn_any->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->from_any (any.in ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -76,7 +76,7 @@ TAO_DynCommon::assign (DynamicAny::DynAny_ptr dyn_any
 
 void
 TAO_DynCommon::insert_boolean (CORBA::Boolean value
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -90,17 +90,17 @@ TAO_DynCommon::insert_boolean (CORBA::Boolean value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_boolean (value
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_boolean
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= CORBA::Any::from_boolean (value);
@@ -109,7 +109,7 @@ TAO_DynCommon::insert_boolean (CORBA::Boolean value
 
 void
 TAO_DynCommon::insert_octet (CORBA::Octet value
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -123,17 +123,17 @@ TAO_DynCommon::insert_octet (CORBA::Octet value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_octet (value
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_octet
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= CORBA::Any::from_octet (value);
@@ -142,7 +142,7 @@ TAO_DynCommon::insert_octet (CORBA::Octet value
 
 void
 TAO_DynCommon::insert_char (CORBA::Char value
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -156,17 +156,17 @@ TAO_DynCommon::insert_char (CORBA::Char value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_char (value
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_char
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= CORBA::Any::from_char (value);
@@ -175,7 +175,7 @@ TAO_DynCommon::insert_char (CORBA::Char value
 
 void
 TAO_DynCommon::insert_short (CORBA::Short value
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -189,17 +189,17 @@ TAO_DynCommon::insert_short (CORBA::Short value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_short (value
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_short
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= value;
@@ -208,7 +208,7 @@ TAO_DynCommon::insert_short (CORBA::Short value
 
 void
 TAO_DynCommon::insert_ushort (CORBA::UShort value
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -222,17 +222,17 @@ TAO_DynCommon::insert_ushort (CORBA::UShort value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_ushort (value
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_ushort
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= value;
@@ -241,7 +241,7 @@ TAO_DynCommon::insert_ushort (CORBA::UShort value
 
 void
 TAO_DynCommon::insert_long (CORBA::Long value
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -255,17 +255,17 @@ TAO_DynCommon::insert_long (CORBA::Long value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_long (value
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_long
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= value;
@@ -274,7 +274,7 @@ TAO_DynCommon::insert_long (CORBA::Long value
 
 void
 TAO_DynCommon::insert_ulong (CORBA::ULong value
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -288,17 +288,17 @@ TAO_DynCommon::insert_ulong (CORBA::ULong value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_ulong (value
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_ulong
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= value;
@@ -307,7 +307,7 @@ TAO_DynCommon::insert_ulong (CORBA::ULong value
 
 void
 TAO_DynCommon::insert_float (CORBA::Float value
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -321,17 +321,17 @@ TAO_DynCommon::insert_float (CORBA::Float value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_float (value
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_float
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= value;
@@ -340,7 +340,7 @@ TAO_DynCommon::insert_float (CORBA::Float value
 
 void
 TAO_DynCommon::insert_double (CORBA::Double value
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -354,17 +354,17 @@ TAO_DynCommon::insert_double (CORBA::Double value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_double (value
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_double
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= value;
@@ -373,7 +373,7 @@ TAO_DynCommon::insert_double (CORBA::Double value
 
 void
 TAO_DynCommon::insert_string (const char * value
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -387,21 +387,21 @@ TAO_DynCommon::insert_string (const char * value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_string (value
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       CORBA::TypeCode_var unaliased_tc =
         TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::TCKind kind = unaliased_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind kind = unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (kind != CORBA::tk_string)
@@ -409,7 +409,7 @@ TAO_DynCommon::insert_string (const char * value
           ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
         }
 
-      CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (bound > 0 && bound < ACE_OS::strlen (value))
@@ -425,7 +425,7 @@ TAO_DynCommon::insert_string (const char * value
 
 void
 TAO_DynCommon::insert_reference (CORBA::Object_ptr value
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -439,18 +439,18 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_reference (value
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       CORBA::Boolean good_type = 1;
       CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (kind != CORBA::tk_objref)
@@ -463,13 +463,13 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
 
           if (ACE_OS::strcmp (value_id, "IDL:omg.org/CORBA/Object:1.0") != 0)
             {
-              const char *my_id = this->type_->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+              const char *my_id = this->type_->id (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               if (ACE_OS::strcmp (value_id, my_id) != 0)
                 {
                   good_type = value->_is_a (my_id
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
                   ACE_CHECK;
                 }
             }
@@ -492,7 +492,7 @@ TAO_DynCommon::insert_reference (CORBA::Object_ptr value
 
 void
 TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -506,17 +506,17 @@ TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_typecode (value
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_TypeCode
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= value;
@@ -525,7 +525,7 @@ TAO_DynCommon::insert_typecode (CORBA::TypeCode_ptr value
 
 void
 TAO_DynCommon::insert_longlong (CORBA::LongLong value
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -539,17 +539,17 @@ TAO_DynCommon::insert_longlong (CORBA::LongLong value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_longlong (value
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_longlong
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= value;
@@ -558,7 +558,7 @@ TAO_DynCommon::insert_longlong (CORBA::LongLong value
 
 void
 TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -572,17 +572,17 @@ TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_ulonglong (value
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_ulonglong
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= value;
@@ -591,7 +591,7 @@ TAO_DynCommon::insert_ulonglong (CORBA::ULongLong value
 
 void
 TAO_DynCommon::insert_longdouble (CORBA::LongDouble value
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -605,17 +605,17 @@ TAO_DynCommon::insert_longdouble (CORBA::LongDouble value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_longdouble (value
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_longdouble
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= value;
@@ -624,7 +624,7 @@ TAO_DynCommon::insert_longdouble (CORBA::LongDouble value
 
 void
 TAO_DynCommon::insert_wchar (CORBA::WChar value
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -638,17 +638,17 @@ TAO_DynCommon::insert_wchar (CORBA::WChar value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_wchar (value
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_wchar
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= CORBA::Any::from_wchar (value);
@@ -657,7 +657,7 @@ TAO_DynCommon::insert_wchar (CORBA::WChar value
 
 void
 TAO_DynCommon::insert_wstring (const CORBA::WChar * value
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -671,21 +671,21 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_wstring (value
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       CORBA::TypeCode_var unaliased_tc =
         this->check_type_and_unalias (CORBA::_tc_wstring
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (bound > 0 && bound < ACE_OS::wslen (value))
@@ -701,7 +701,7 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value
 
 void
 TAO_DynCommon::insert_any (const CORBA::Any &value
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -715,17 +715,17 @@ TAO_DynCommon::insert_any (const CORBA::Any &value
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       cc->insert_any (value
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
       this->check_type (CORBA::_tc_any
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->any_ <<= value;
@@ -736,7 +736,7 @@ TAO_DynCommon::insert_any (const CORBA::Any &value
 // have fewer Any/DynAny conversions than insert_any, not more.
 void
 TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -748,18 +748,18 @@ TAO_DynCommon::insert_dyn_any (DynamicAny::DynAny_ptr value
       ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
     }
 
-  CORBA_Any_var any = value->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_Any_var any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->insert_any (any.in ()
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 #ifdef TAO_HAS_VALUETYPE
 void
 TAO_DynCommon::insert_val (CORBA::ValueBase_ptr
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -773,7 +773,7 @@ TAO_DynCommon::insert_val (CORBA::ValueBase_ptr
 // ****************************************************************
 
 CORBA::Boolean
-TAO_DynCommon::get_boolean (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_boolean (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -788,10 +788,10 @@ TAO_DynCommon::get_boolean (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_boolean (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_boolean (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -808,7 +808,7 @@ TAO_DynCommon::get_boolean (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Octet
-TAO_DynCommon::get_octet (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_octet (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -823,10 +823,10 @@ TAO_DynCommon::get_octet (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_octet (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_octet (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -843,7 +843,7 @@ TAO_DynCommon::get_octet (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Char
-TAO_DynCommon::get_char (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_char (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -858,10 +858,10 @@ TAO_DynCommon::get_char (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_char (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_char (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -878,7 +878,7 @@ TAO_DynCommon::get_char (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Short
-TAO_DynCommon::get_short (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_short (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -893,10 +893,10 @@ TAO_DynCommon::get_short (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_short (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -913,7 +913,7 @@ TAO_DynCommon::get_short (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::UShort
-TAO_DynCommon::get_ushort (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_ushort (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -928,10 +928,10 @@ TAO_DynCommon::get_ushort (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_ushort (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_ushort (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -948,7 +948,7 @@ TAO_DynCommon::get_ushort (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Long
-TAO_DynCommon::get_long (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_long (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -963,10 +963,10 @@ TAO_DynCommon::get_long (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_long (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_long (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -983,7 +983,7 @@ TAO_DynCommon::get_long (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::ULong
-TAO_DynCommon::get_ulong (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_ulong (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -998,10 +998,10 @@ TAO_DynCommon::get_ulong (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_ulong (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_ulong (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1018,7 +1018,7 @@ TAO_DynCommon::get_ulong (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Float
-TAO_DynCommon::get_float (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_float (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1033,10 +1033,10 @@ TAO_DynCommon::get_float (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_float (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_float (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1053,7 +1053,7 @@ TAO_DynCommon::get_float (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Double
-TAO_DynCommon::get_double (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_double (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1068,10 +1068,10 @@ TAO_DynCommon::get_double (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_double (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_double (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1088,7 +1088,7 @@ TAO_DynCommon::get_double (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO_DynCommon::get_string (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_string (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1103,19 +1103,19 @@ TAO_DynCommon::get_string (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_string (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
       CORBA::TypeCode_var unaliased_tc =
         TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TCKind kind = unaliased_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind kind = unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (kind != CORBA::tk_string)
@@ -1126,7 +1126,7 @@ TAO_DynCommon::get_string (TAO_ENV_SINGLE_ARG_DECL)
 
       char *retval = 0;
 
-      CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // We will have caught a type mismatch above, so if this fails,
@@ -1142,7 +1142,7 @@ TAO_DynCommon::get_string (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Object_ptr
-TAO_DynCommon::get_reference (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_reference (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1157,10 +1157,10 @@ TAO_DynCommon::get_reference (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_reference (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1177,7 +1177,7 @@ TAO_DynCommon::get_reference (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TypeCode_ptr
-TAO_DynCommon::get_typecode (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_typecode (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1192,10 +1192,10 @@ TAO_DynCommon::get_typecode (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1212,7 +1212,7 @@ TAO_DynCommon::get_typecode (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::LongLong
-TAO_DynCommon::get_longlong (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_longlong (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1229,10 +1229,10 @@ TAO_DynCommon::get_longlong (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (retval);
 
-      return cc->get_longlong (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_longlong (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1247,7 +1247,7 @@ TAO_DynCommon::get_longlong (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::ULongLong
-TAO_DynCommon::get_ulonglong (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_ulonglong (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1264,10 +1264,10 @@ TAO_DynCommon::get_ulonglong (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (retval);
 
-      return cc->get_ulonglong (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_ulonglong (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1282,7 +1282,7 @@ TAO_DynCommon::get_ulonglong (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::LongDouble
-TAO_DynCommon::get_longdouble (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_longdouble (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1299,10 +1299,10 @@ TAO_DynCommon::get_longdouble (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (retval);
 
-      return cc->get_longdouble (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_longdouble (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1317,7 +1317,7 @@ TAO_DynCommon::get_longdouble (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::WChar
-TAO_DynCommon::get_wchar (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_wchar (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1332,10 +1332,10 @@ TAO_DynCommon::get_wchar (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_wchar (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_wchar (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1352,7 +1352,7 @@ TAO_DynCommon::get_wchar (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::WChar *
-TAO_DynCommon::get_wstring (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_wstring (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1367,10 +1367,10 @@ TAO_DynCommon::get_wstring (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_wstring (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_wstring (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1379,12 +1379,12 @@ TAO_DynCommon::get_wstring (TAO_ENV_SINGLE_ARG_DECL)
       // BadKind.
       CORBA::TypeCode_var unaliased_tc =
         this->check_type_and_unalias (CORBA::_tc_wstring
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CORBA::WChar *retval = 0;
 
-      CORBA::ULong bound = unaliased_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       (void) (this->any_ >>= CORBA::Any::to_wstring (retval,
@@ -1395,7 +1395,7 @@ TAO_DynCommon::get_wstring (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any_ptr
-TAO_DynCommon::get_any (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1410,10 +1410,10 @@ TAO_DynCommon::get_any (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->has_components_)
     {
-      DynamicAny::DynAny_var cc = this->check_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = this->check_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      return cc->get_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return cc->get_any (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     {
@@ -1439,7 +1439,7 @@ TAO_DynCommon::get_any (TAO_ENV_SINGLE_ARG_DECL)
 // @@@ (JP) TODO - optimize - this version was intended by the OMG to
 // have fewer Any/DynAny conversions than get_any, not more.
 DynamicAny::DynAny_ptr
-TAO_DynCommon::get_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1452,16 +1452,16 @@ TAO_DynCommon::get_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
                         0);
     }
 
-  CORBA_Any_var any = this->get_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_Any_var any = this->get_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return TAO_DynAnyFactory::make_dyn_any (any.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
 }
 
 #ifdef TAO_HAS_VALUETYPE
 CORBA::ValueBase_ptr
-TAO_DynCommon::get_val (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::get_val (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1477,7 +1477,7 @@ TAO_DynCommon::get_val (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_DynCommon::seek (CORBA::Long slot
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1508,7 +1508,7 @@ TAO_DynCommon::seek (CORBA::Long slot
 }
 
 void
-TAO_DynCommon::rewind (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::rewind (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1519,12 +1519,12 @@ TAO_DynCommon::rewind (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   (void) this->seek (0
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::Boolean
-TAO_DynCommon::next (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::next (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1552,7 +1552,7 @@ TAO_DynCommon::next (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynCommon::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1563,19 +1563,19 @@ TAO_DynCommon::copy (TAO_ENV_SINGLE_ARG_DECL)
                         DynamicAny::DynAny::_nil ());
     }
 
-  CORBA_Any_var any = this->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_Any_var any = this->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   DynamicAny::DynAny_ptr retval =
     TAO_DynAnyFactory::make_dyn_any (any.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   return retval;
 }
 
 CORBA::ULong
-TAO_DynCommon::component_count (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::component_count (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -1592,16 +1592,16 @@ TAO_DynCommon::component_count (TAO_ENV_SINGLE_ARG_DECL)
 void
 TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
                          CORBA::Boolean destroying
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  CORBA::TypeCode_var tc = component->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = component->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TCKind tk = TAO_DynAnyFactory::unalias (tc.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   switch (tk)
@@ -1609,7 +1609,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
     case CORBA::tk_array:
       {
         TAO_DynArray_i *tmp = TAO_DynArray_i::_narrow (component
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         if (destroying)
@@ -1627,7 +1627,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
     case CORBA::tk_enum:
       {
         TAO_DynEnum_i *tmp = TAO_DynEnum_i::_narrow (component
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         if (destroying)
@@ -1645,7 +1645,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
     case CORBA::tk_sequence:
       {
         TAO_DynSequence_i *tmp = TAO_DynSequence_i::_narrow (component
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         if (destroying)
@@ -1663,7 +1663,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
     case CORBA::tk_struct:
       {
         TAO_DynStruct_i *tmp = TAO_DynStruct_i::_narrow (component
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         if (destroying)
@@ -1681,7 +1681,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
     case CORBA::tk_union:
       {
         TAO_DynUnion_i *tmp = TAO_DynUnion_i::_narrow (component
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         if (destroying)
@@ -1703,7 +1703,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
     default:
       {
         TAO_DynAny_i *tmp = TAO_DynAny_i::_narrow (component
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         if (destroying)
@@ -1722,7 +1722,7 @@ TAO_DynCommon::set_flag (DynamicAny::DynAny_ptr component,
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynCommon::check_component (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynCommon::check_component (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -1735,14 +1735,14 @@ TAO_DynCommon::check_component (TAO_ENV_SINGLE_ARG_DECL)
                         DynamicAny::DynAny::_nil ());
     }
 
-  DynamicAny::DynAny_var cc = this->current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+  DynamicAny::DynAny_var cc = this->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
-  CORBA::TypeCode_var tc = cc->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = cc->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   // We are here because we are a component that is the target of
@@ -1765,14 +1765,14 @@ TAO_DynCommon::check_component (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
     ))
 {
   CORBA::Boolean equivalent = this->type_->equivalent (tc
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!equivalent)
@@ -1783,17 +1783,17 @@ TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc
 
 CORBA::TypeCode_ptr
 TAO_DynCommon::check_type_and_unalias (CORBA::TypeCode_ptr tc
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
     ))
 {
   this->check_type (tc
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return TAO_DynAnyFactory::strip_alias (tc
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 }
 
diff --git a/TAO/tao/DynamicAny/DynCommon.h b/TAO/tao/DynamicAny/DynCommon.h
index a5dd26af845..eaa75c8c3e9 100644
--- a/TAO/tao/DynamicAny/DynCommon.h
+++ b/TAO/tao/DynamicAny/DynCommon.h
@@ -50,7 +50,7 @@ public:
   // = Some functions common to all Dynamic Any types.
 
   virtual CORBA::TypeCode_ptr type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -58,7 +58,7 @@ public:
 
   virtual void assign (
       DynamicAny::DynAny_ptr dyn_any
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -67,7 +67,7 @@ public:
 
   virtual void insert_boolean (
       CORBA::Boolean value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -77,7 +77,7 @@ public:
 
   virtual void insert_octet (
       CORBA::Octet value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -87,7 +87,7 @@ public:
 
   virtual void insert_char (
       CORBA::Char value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -97,7 +97,7 @@ public:
 
   virtual void insert_short (
       CORBA::Short value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -107,7 +107,7 @@ public:
 
   virtual void insert_ushort (
       CORBA::UShort value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -117,7 +117,7 @@ public:
 
   virtual void insert_long (
       CORBA::Long value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -127,7 +127,7 @@ public:
 
   virtual void insert_ulong (
       CORBA::ULong value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -137,7 +137,7 @@ public:
 
   virtual void insert_float (
       CORBA::Float value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -147,7 +147,7 @@ public:
 
   virtual void insert_double (
       CORBA::Double value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -157,7 +157,7 @@ public:
 
   virtual void insert_string (
       const char * value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -167,7 +167,7 @@ public:
 
   virtual void insert_reference (
       CORBA::Object_ptr value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -177,7 +177,7 @@ public:
 
   virtual void insert_typecode (
       CORBA::TypeCode_ptr value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -187,7 +187,7 @@ public:
 
   virtual void insert_longlong (
       CORBA::LongLong value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -197,7 +197,7 @@ public:
 
   virtual void insert_ulonglong (
       CORBA::ULongLong value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -207,7 +207,7 @@ public:
 
   virtual void insert_longdouble (
       CORBA::LongDouble value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -217,7 +217,7 @@ public:
 
   virtual void insert_wchar (
       CORBA::WChar value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -227,7 +227,7 @@ public:
 
   virtual void insert_wstring (
       const CORBA::WChar * value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -237,7 +237,7 @@ public:
 
   virtual void insert_any (
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -247,7 +247,7 @@ public:
 
   virtual void insert_dyn_any (
       DynamicAny::DynAny_ptr value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -258,7 +258,7 @@ public:
 #ifdef TAO_HAS_VALUETYPE
   virtual void insert_val (
       CORBA::ValueBase_ptr value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -268,7 +268,7 @@ public:
 #endif /* TAO_HAS_VALUETYPE */
 
   virtual CORBA::Boolean get_boolean (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -277,7 +277,7 @@ public:
       ));
 
   virtual CORBA::Octet get_octet (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -286,7 +286,7 @@ public:
       ));
 
   virtual CORBA::Char get_char (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -295,7 +295,7 @@ public:
       ));
 
   virtual CORBA::Short get_short (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -304,7 +304,7 @@ public:
       ));
 
   virtual CORBA::UShort get_ushort (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -313,7 +313,7 @@ public:
       ));
 
   virtual CORBA::Long get_long (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -322,7 +322,7 @@ public:
       ));
 
   virtual CORBA::ULong get_ulong (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -331,7 +331,7 @@ public:
       ));
 
   virtual CORBA::Float get_float (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -340,7 +340,7 @@ public:
       ));
 
   virtual CORBA::Double get_double (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -349,7 +349,7 @@ public:
       ));
 
   virtual char * get_string (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -358,7 +358,7 @@ public:
       ));
 
   virtual CORBA::Object_ptr get_reference (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -367,7 +367,7 @@ public:
       ));
 
   virtual CORBA::TypeCode_ptr get_typecode (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -376,7 +376,7 @@ public:
       ));
 
   virtual CORBA::LongLong get_longlong (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -385,7 +385,7 @@ public:
       ));
 
   virtual CORBA::ULongLong get_ulonglong (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -394,7 +394,7 @@ public:
       ));
 
   virtual CORBA::LongDouble get_longdouble (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -403,7 +403,7 @@ public:
       ));
 
   virtual CORBA::WChar get_wchar (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -412,7 +412,7 @@ public:
       ));
 
   virtual CORBA::WChar * get_wstring (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -421,7 +421,7 @@ public:
       ));
 
   virtual CORBA::Any * get_any (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -430,7 +430,7 @@ public:
       ));
 
   virtual DynamicAny::DynAny_ptr get_dyn_any (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -440,7 +440,7 @@ public:
 
 #ifdef TAO_HAS_VALUETYPE
   virtual CORBA::ValueBase_ptr get_val (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -451,35 +451,35 @@ public:
 
   virtual CORBA::Boolean seek (
       CORBA::Long index
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void rewind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::Boolean next (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr copy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::ULong component_count (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -498,7 +498,7 @@ protected:
   void set_flag (
       DynamicAny::DynAny_ptr component,
       CORBA::Boolean destroying
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -533,7 +533,7 @@ protected:
 private:
   // Utility functions used by insert_* and get_*.
 
-  DynamicAny::DynAny_ptr check_component (TAO_ENV_SINGLE_ARG_DECL)
+  DynamicAny::DynAny_ptr check_component (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -541,14 +541,14 @@ private:
       ));
 
   void check_type (CORBA::TypeCode_ptr tc
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
       ));
 
   CORBA::TypeCode_ptr check_type_and_unalias (CORBA::TypeCode_ptr tc
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index b6872777472..b12ddf31c3c 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -29,13 +29,13 @@ TAO_DynEnum_i::init_common (void)
 
 void
 TAO_DynEnum_i::init (const CORBA_Any &any
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
 
   CORBA::TCKind kind =
     TAO_DynAnyFactory::unalias (tc.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_enum)
@@ -57,10 +57,10 @@ TAO_DynEnum_i::init (const CORBA_Any &any
 
 void
 TAO_DynEnum_i::init (CORBA_TypeCode_ptr tc
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_enum)
@@ -79,7 +79,7 @@ TAO_DynEnum_i::init (CORBA_TypeCode_ptr tc
 
 TAO_DynEnum_i *
 TAO_DynEnum_i::_narrow (CORBA::Object_ptr obj
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -116,13 +116,13 @@ TAO_DynEnum_i::_tao_QueryInterface (ptr_arith_t type)
 // ****************************************************************
 
 char *
-TAO_DynEnum_i::get_as_string (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynEnum_i::get_as_string (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
   const char *retval = this->type_.in ()->member_name (this->value_
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CORBA::string_dup (retval);
@@ -130,13 +130,13 @@ TAO_DynEnum_i::get_as_string (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_DynEnum_i::set_as_string (const char *value_as_string
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::ULong count = this->type_.in ()->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong count = this->type_.in ()->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong i;
@@ -145,7 +145,7 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string
   for (i = 0; i < count; ++i)
     {
       temp = this->type_.in ()->member_name (i
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!ACE_OS::strcmp (value_as_string,
@@ -166,7 +166,7 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string
 }
 
 CORBA::ULong
-TAO_DynEnum_i::get_as_ulong (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_DynEnum_i::get_as_ulong (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -176,13 +176,13 @@ TAO_DynEnum_i::get_as_ulong (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
     ))
 {
-  CORBA::ULong max = this->type_.in ()->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong max = this->type_.in ()->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (value_as_ulong < max)
@@ -199,7 +199,7 @@ TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong
 
 void
 TAO_DynEnum_i::from_any (const CORBA_Any& any
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -208,7 +208,7 @@ TAO_DynEnum_i::from_any (const CORBA_Any& any
 {
   CORBA::TypeCode_var tc = any.type ();
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind == CORBA::tk_enum)
@@ -228,7 +228,7 @@ TAO_DynEnum_i::from_any (const CORBA_Any& any
 }
 
 CORBA::Any_ptr
-TAO_DynEnum_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -250,16 +250,16 @@ TAO_DynEnum_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  CORBA::TypeCode_var tc = rhs->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!equivalent)
@@ -267,7 +267,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs
       return 0;
     }
 
-  CORBA_Any_var any = rhs->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_Any_var any = rhs->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_Message_Block *mb = any->_tao_get_cdr ();
@@ -282,7 +282,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs
 }
 
 void
-TAO_DynEnum_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynEnum_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -299,7 +299,7 @@ TAO_DynEnum_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynEnum_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynEnum_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
diff --git a/TAO/tao/DynamicAny/DynEnum_i.h b/TAO/tao/DynamicAny/DynEnum_i.h
index 44532527608..e22b014d863 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -53,24 +53,24 @@ public:
   // Destructor.
 
   void init (CORBA_TypeCode_ptr tc
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize using just a TypeCode.
 
   void init (const CORBA_Any& any
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize using an Any.
 
   // = LocalObject methods.
   static TAO_DynEnum_i *_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   // = Functions specific to DynEnum.
 
   virtual char * get_as_string (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -78,7 +78,7 @@ public:
 
   virtual void set_as_string (
       const char * value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -86,7 +86,7 @@ public:
       ));
 
   virtual CORBA::ULong get_as_ulong (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -94,7 +94,7 @@ public:
 
   virtual void set_as_ulong (
       CORBA::ULong value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -105,7 +105,7 @@ public:
 
   virtual void from_any (
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -114,7 +114,7 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -122,21 +122,21 @@ public:
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index 0e29f33f55f..731e6a98d16 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -30,13 +30,13 @@ TAO_DynSequence_i::init_common (void)
 
 void
 TAO_DynSequence_i::init (const CORBA::Any& any
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
 
   CORBA::TCKind kind =
     TAO_DynAnyFactory::unalias (tc.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_sequence)
@@ -65,7 +65,7 @@ TAO_DynSequence_i::init (const CORBA::Any& any
 
   // Get the type of the sequence elments.
   CORBA::TypeCode_var field_tc =
-    this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < length; ++i)
@@ -80,23 +80,23 @@ TAO_DynSequence_i::init (const CORBA::Any& any
       // based on the type of field_any.
       this->da_members_[i] =
         TAO_DynAnyFactory::make_dyn_any (field_any
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Move to the next field in the CDR stream.
       (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
                                                &cdr
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_DynSequence_i::init (CORBA_TypeCode_ptr tc
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_sequence)
@@ -116,7 +116,7 @@ TAO_DynSequence_i::init (CORBA_TypeCode_ptr tc
 
 TAO_DynSequence_i *
 TAO_DynSequence_i::_narrow (CORBA::Object_ptr obj
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -153,26 +153,26 @@ TAO_DynSequence_i::_tao_QueryInterface (ptr_arith_t type)
 // ****************************************************************
 
 CORBA::TypeCode_ptr
-TAO_DynSequence_i::get_element_type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::get_element_type (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::TypeCode_var element_type =
     CORBA::TypeCode::_duplicate (this->type_.in ());
 
   // Strip away aliases (if any) on top of the outer type.
-  CORBA::TCKind kind = element_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
 
   while (kind != CORBA::tk_sequence)
     {
-      element_type = element_type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      element_type = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
 
-      kind = element_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      kind = element_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
     }
 
   // Return the content type.
-  CORBA::TypeCode_ptr retval = element_type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_ptr retval = element_type->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_TypeCode::_nil ());
 
   return retval;
@@ -181,7 +181,7 @@ TAO_DynSequence_i::get_element_type (TAO_ENV_SINGLE_ARG_DECL)
 // = Functions specific to DynSequence.
 
 CORBA::ULong
-TAO_DynSequence_i::get_length (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::get_length (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -197,7 +197,7 @@ TAO_DynSequence_i::get_length (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_DynSequence_i::set_length (CORBA::ULong length
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
@@ -211,10 +211,10 @@ TAO_DynSequence_i::set_length (CORBA::ULong length
   // CORBA::TypeCode::length() does not accept aliased type codes.
   CORBA::TypeCode_var stripped_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong bound = stripped_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (bound > 0 && length > bound)
@@ -254,14 +254,14 @@ TAO_DynSequence_i::set_length (CORBA::ULong length
       this->da_members_.size (length);
 
       CORBA::TypeCode_var elemtype =
-        stripped_tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+        stripped_tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       for (CORBA::ULong i = this->component_count_; i < length; ++i)
         {
           this->da_members_[i] =
             TAO_DynAnyFactory::make_dyn_any (elemtype.in ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -270,7 +270,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length
       // Destroy any dangling members first, then shrink array.
       for (CORBA::ULong j = length; j < this->component_count_; ++j)
         {
-          this->da_members_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -282,7 +282,7 @@ TAO_DynSequence_i::set_length (CORBA::ULong length
 }
 
 DynamicAny::AnySeq *
-TAO_DynSequence_i::get_elements (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::get_elements (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -308,7 +308,7 @@ TAO_DynSequence_i::get_elements (TAO_ENV_SINGLE_ARG_DECL)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       CORBA::Any_var tmp =
-        this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_CHECK_RETURN (0);
 
@@ -320,7 +320,7 @@ TAO_DynSequence_i::get_elements (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -334,11 +334,11 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
 
   CORBA::TypeCode_var stripped_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = value.length ();
-  CORBA::ULong bound = stripped_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (bound > 0 && length > bound)
@@ -363,7 +363,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
     }
 
   CORBA::TypeCode_var element_type =
-    this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var value_tc;
@@ -374,7 +374,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
       value_tc = value[i].type ();
       CORBA::Boolean equivalent =
         value_tc->equivalent (element_type.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (equivalent)
@@ -382,13 +382,13 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
           // Destroy any existing members.
           if (i < this->component_count_)
             {
-              this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
             }
 
           this->da_members_[i] =
             TAO_DynAnyFactory::make_dyn_any (value[i]
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -400,7 +400,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
   // Destroy any dangling members.
   for (CORBA::ULong j = length; j < this->component_count_; ++j)
     {
-      this->da_members_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -415,7 +415,7 @@ TAO_DynSequence_i::set_elements (const DynamicAny::AnySeq & value
 }
 
 DynamicAny::DynAnySeq *
-TAO_DynSequence_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -441,7 +441,7 @@ TAO_DynSequence_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
       // Set the flag so the caller can't destroy.
       this->set_flag (this->da_members_[i].in (),
                       0
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       safe_retval[i] =
@@ -455,7 +455,7 @@ TAO_DynSequence_i::get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
 void
 TAO_DynSequence_i::set_elements_as_dyn_any (
     const DynamicAny::DynAnySeq & values
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -470,11 +470,11 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
 
   CORBA::TypeCode_var stripped_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = values.length ();
-  CORBA::ULong bound = stripped_tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong bound = stripped_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (bound > 0 && length > bound)
@@ -488,7 +488,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
       this->da_members_.size (length);
     }
 
-  CORBA::TypeCode_var element_type = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var element_type = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var val_type;
@@ -496,11 +496,11 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      val_type = values[i]->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      val_type = values[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       equivalent = val_type->equivalent (element_type.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 
       ACE_CHECK;
 
@@ -509,11 +509,11 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
           // Destroy any existing members.
           if (i < this->component_count_)
             {
-              this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
             }
 
-          this->da_members_[i] = values[i]->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->da_members_[i] = values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -525,7 +525,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
   // Destroy any dangling members.
   for (CORBA::ULong j = length; j < this->component_count_; ++j)
     {
-      this->da_members_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -543,7 +543,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
 
 void
 TAO_DynSequence_i::from_any (const CORBA::Any & any
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -557,7 +557,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
 
   CORBA::TypeCode_var tc = any.type ();
   CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in ()
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equivalent)
@@ -581,7 +581,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
         }
 
       CORBA::TypeCode_var field_tc =
-        this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       for (CORBA::ULong i = 0; i < arg_length; ++i)
@@ -594,26 +594,26 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
 
           if (i < this->component_count_)
             {
-              this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
             }
 
           this->da_members_[i] =
             TAO_DynAnyFactory::make_dyn_any (field_any
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Move to the next field in the CDR stream.
           (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
                                                    &cdr
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
       // Destroy any dangling members.
       for (CORBA::ULong j = arg_length; j < this->component_count_; ++j)
         {
-          this->da_members_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->da_members_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -635,7 +635,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
 }
 
 CORBA::Any_ptr
-TAO_DynSequence_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -650,14 +650,14 @@ TAO_DynSequence_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
 
   out_cdr.write_ulong (this->component_count_);
 
-  CORBA_TypeCode_var field_tc = this->get_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_TypeCode_var field_tc = this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
       // Recursive step
       CORBA::Any_var field_any =
-        this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_Message_Block *field_mb = field_any->_tao_get_cdr ();
@@ -668,7 +668,7 @@ TAO_DynSequence_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
                                                  &field_cdr,
                                                  &out_cdr
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -688,7 +688,7 @@ TAO_DynSequence_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -699,11 +699,11 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs
                         0);
     }
 
-  CORBA::TypeCode_var tc = rhs->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!equivalent)
@@ -718,15 +718,15 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs
     {
       rhs->seek (ACE_static_cast (CORBA::Long,
                                   i)
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      tmp = rhs->current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Recursive step.
       member_equal = tmp->equal (this->da_members_[i].in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (!member_equal)
@@ -739,7 +739,7 @@ TAO_DynSequence_i::equal (DynamicAny::DynAny_ptr rhs
 }
 
 void
-TAO_DynSequence_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -756,10 +756,10 @@ TAO_DynSequence_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
         {
           this->set_flag (da_members_[i].in (),
                           1
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -768,7 +768,7 @@ TAO_DynSequence_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynSequence_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynSequence_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -790,7 +790,7 @@ TAO_DynSequence_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
 
   this->set_flag (this->da_members_[index].in (),
                   0
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   return DynamicAny::DynAny::_duplicate (
diff --git a/TAO/tao/DynamicAny/DynSequence_i.h b/TAO/tao/DynamicAny/DynSequence_i.h
index 6e11f692347..98a2957fb78 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -53,24 +53,24 @@ public:
   // Destructor.
 
   void init (CORBA_TypeCode_ptr tc
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize using just a TypeCode.
 
   void init (const CORBA_Any& any
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize using an Any.
 
   // = LocalObject methods.
   static TAO_DynSequence_i *_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   // = Functions specific to DynSequence.
 
   virtual CORBA::ULong get_length (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -78,7 +78,7 @@ public:
 
   virtual void set_length (
       CORBA::ULong len
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -86,7 +86,7 @@ public:
       ));
 
   virtual DynamicAny::AnySeq * get_elements (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -94,7 +94,7 @@ public:
 
   virtual void set_elements (
       const DynamicAny::AnySeq & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -103,7 +103,7 @@ public:
       ));
 
   virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -111,7 +111,7 @@ public:
 
   virtual void set_elements_as_dyn_any (
       const DynamicAny::DynAnySeq & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -124,7 +124,7 @@ public:
 
   virtual void from_any (
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -133,7 +133,7 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -141,21 +141,21 @@ public:
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -164,7 +164,7 @@ public:
 
 private:
   // Utility, turns the type of elements contained in the sequence.
-  CORBA::TypeCode_ptr get_element_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  CORBA::TypeCode_ptr get_element_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   // Called by both versions of init().
   void init_common (void);
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index bef8529f9f1..c94557da2b7 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -19,10 +19,10 @@ TAO_DynStruct_i::~TAO_DynStruct_i (void)
 
 void
 TAO_DynStruct_i::check_typecode (CORBA::TypeCode_ptr tc
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind == CORBA::tk_struct || kind == CORBA::tk_except)
@@ -46,17 +46,17 @@ TAO_DynStruct_i::init_common (void)
 
 void
 TAO_DynStruct_i::init (const CORBA_Any& any
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
   this->check_typecode (tc.in ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->type_ = tc;
 
   // Member_count works with aliased type codes.
-  CORBA::ULong numfields = this->type_->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong numfields = this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Resize the array.
@@ -72,7 +72,7 @@ TAO_DynStruct_i::init (const CORBA_Any& any
 
   // If we have an exception type, unmarshal the repository ID.
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind == CORBA::tk_except)
@@ -84,14 +84,14 @@ TAO_DynStruct_i::init (const CORBA_Any& any
   // member_type() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < numfields; i++)
     {
       CORBA::TypeCode_var field_tc =
         unaliased_tc->member_type (i
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // This Any constructor is a TAO extension.
@@ -104,28 +104,28 @@ TAO_DynStruct_i::init (const CORBA_Any& any
       // based on the type of field_any.
       this->da_members_[i] =
         TAO_DynAnyFactory::make_dyn_any (field_any
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Move to the next field in the CDR stream.
       (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
                                                &cdr
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_DynStruct_i::init (CORBA_TypeCode_ptr tc
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   this->check_typecode (tc
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->type_ = CORBA::TypeCode::_duplicate (tc);
 
-  CORBA::ULong numfields = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong numfields = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Resize the array.
@@ -138,12 +138,12 @@ TAO_DynStruct_i::init (CORBA_TypeCode_ptr tc
   for (CORBA::ULong i = 0; i < numfields; i++)
     {
       mtype = tc->member_type (i
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Recursively initialize each member.
       this->da_members_[i] = TAO_DynAnyFactory::make_dyn_any (mtype.in ()
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -152,7 +152,7 @@ TAO_DynStruct_i::init (CORBA_TypeCode_ptr tc
 
 TAO_DynStruct_i *
 TAO_DynStruct_i::_narrow (CORBA::Object_ptr obj
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -189,7 +189,7 @@ TAO_DynStruct_i::_tao_QueryInterface (ptr_arith_t type)
 // ****************************************************************
 
 DynamicAny::FieldName
-TAO_DynStruct_i::current_member_name (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::current_member_name (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -218,7 +218,7 @@ TAO_DynStruct_i::current_member_name (TAO_ENV_SINGLE_ARG_DECL)
   // Member_name works with aliased type codes.
   const char *name =
     this->type_->member_name (this->current_position_
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CORBA::string_dup (name);
@@ -226,7 +226,7 @@ TAO_DynStruct_i::current_member_name (TAO_ENV_SINGLE_ARG_DECL)
 
 // Returns the unaliased TCKind.
 CORBA::TCKind
-TAO_DynStruct_i::current_member_kind (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::current_member_kind (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -254,18 +254,18 @@ TAO_DynStruct_i::current_member_kind (TAO_ENV_SINGLE_ARG_DECL)
 
   CORBA::TypeCode_var tc =
     this->type_.in ()->member_type (this->current_position_
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   return retval;
 }
 
 DynamicAny::NameValuePairSeq *
-TAO_DynStruct_i::get_members (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::get_members (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -294,7 +294,7 @@ TAO_DynStruct_i::get_members (TAO_ENV_SINGLE_ARG_DECL)
       safe_retval[i].id =
         CORBA::string_dup (this->type_.in ()->member_name (i));
 
-      temp = this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      temp = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       safe_retval[i].value = temp.in ();
@@ -305,7 +305,7 @@ TAO_DynStruct_i::get_members (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -332,20 +332,20 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values
   // member_type() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       // Check for type and name match.
       my_tc = unaliased_tc->member_type (i
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       value_tc = values[i].value.type ();
 
       equivalent = my_tc->equivalent (value_tc.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!equivalent)
@@ -353,12 +353,12 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values
           ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
         }
 
-      this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->da_members_[i] =
         TAO_DynAnyFactory::make_dyn_any (values[i].value
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -366,7 +366,7 @@ TAO_DynStruct_i::set_members (const DynamicAny::NameValuePairSeq & values
 }
 
 DynamicAny::NameDynAnyPairSeq *
-TAO_DynStruct_i::get_members_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::get_members_as_dyn_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -398,7 +398,7 @@ TAO_DynStruct_i::get_members_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
       // Set the flag so the caller can't destroy.
       this->set_flag (this->da_members_[i].in (),
                       0
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       safe_retval[i].value =
@@ -412,7 +412,7 @@ TAO_DynStruct_i::get_members_as_dyn_any (TAO_ENV_SINGLE_ARG_DECL)
 void
 TAO_DynStruct_i::set_members_as_dyn_any (
     const DynamicAny::NameDynAnyPairSeq & values
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -440,21 +440,21 @@ TAO_DynStruct_i::set_members_as_dyn_any (
   // member_type() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       // Check for type and name match.
       my_tc = unaliased_tc->member_type (i
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      value_tc = values[i].value->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      value_tc = values[i].value->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       equivalent = my_tc->equivalent (value_tc.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (!equivalent)
@@ -462,10 +462,10 @@ TAO_DynStruct_i::set_members_as_dyn_any (
           ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
         }
 
-      this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->da_members_[i] = values[i].value->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->da_members_[i] = values[i].value->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -476,7 +476,7 @@ TAO_DynStruct_i::set_members_as_dyn_any (
 
 void
 TAO_DynStruct_i::from_any (const CORBA_Any & any
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -490,7 +490,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any
 
   CORBA::TypeCode_var tc = any.type ();
   CORBA::Boolean equivalent = this->type_->equivalent (tc.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equivalent)
@@ -502,7 +502,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any
 
       // If we have an exception type, unmarshal the repository ID.
       CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (kind == CORBA::tk_except)
@@ -516,7 +516,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any
       for (CORBA::ULong i = 0; i < this->component_count_; ++i)
         {
           field_tc = this->type_.in ()->member_type (i
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // This Any constructor is a TAO extension.
@@ -525,18 +525,18 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any
                                cdr.byte_order (),
                                cdr.start ());
 
-          this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           this->da_members_[i] =
             TAO_DynAnyFactory::make_dyn_any (field_any
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           // Move to the next field in the CDR stream.
           (void) TAO_Marshal_Object::perform_skip (field_tc.in (),
                                                    &cdr
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -549,7 +549,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any & any
 }
 
 CORBA::Any_ptr
-TAO_DynStruct_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -564,7 +564,7 @@ TAO_DynStruct_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
 
   // If we have an exception type, marshal the repository ID.
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (this->type_.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (kind == CORBA::tk_except)
@@ -574,11 +574,11 @@ TAO_DynStruct_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
 
   for (CORBA::ULong i = 0; i < this->component_count_; ++i)
     {
-      CORBA_TypeCode_var field_tc = this->da_members_[i]->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA_TypeCode_var field_tc = this->da_members_[i]->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Recursive step.
-      CORBA_Any_var field_any = this->da_members_[i]->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA_Any_var field_any = this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_Message_Block *field_mb = field_any->_tao_get_cdr ();
@@ -589,7 +589,7 @@ TAO_DynStruct_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
       (void) TAO_Marshal_Object::perform_append (field_tc.in (),
                                                  &field_cdr,
                                                  &out_cdr
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -609,7 +609,7 @@ TAO_DynStruct_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -620,11 +620,11 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs
                         0);
     }
 
-  CORBA::TypeCode_var tc = rhs->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Boolean equivalent = tc->equivalent (this->type_.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!equivalent)
@@ -639,15 +639,15 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs
     {
       rhs->seek (ACE_static_cast (CORBA::Long,
                                   i)
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      tmp = rhs->current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      tmp = rhs->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Recursive step.
       member_equal = tmp->equal (this->da_members_[i].in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (!member_equal)
@@ -660,7 +660,7 @@ TAO_DynStruct_i::equal (DynamicAny::DynAny_ptr rhs
 }
 
 void
-TAO_DynStruct_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -677,10 +677,10 @@ TAO_DynStruct_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
         {
           this->set_flag (da_members_[i].in (),
                           1
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->da_members_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->da_members_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -689,7 +689,7 @@ TAO_DynStruct_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynStruct_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynStruct_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -718,7 +718,7 @@ TAO_DynStruct_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
 
   this->set_flag (this->da_members_[index].in (),
                   0
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   return DynamicAny::DynAny::_duplicate (
diff --git a/TAO/tao/DynamicAny/DynStruct_i.h b/TAO/tao/DynamicAny/DynStruct_i.h
index 8eec9567baa..d5354beb633 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -53,24 +53,24 @@ public:
   // Destructor.
 
   void init (CORBA_TypeCode_ptr tc
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize using just a TypeCode.
 
   void init (const CORBA_Any& any
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
   // Initialize using an Any.
 
   // = LocalObject methods.
   static TAO_DynStruct_i *_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   // = Functions specific to DynStruct.
 
   virtual DynamicAny::FieldName current_member_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -79,7 +79,7 @@ public:
       ));
 
   virtual CORBA::TCKind current_member_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -88,7 +88,7 @@ public:
       ));
 
   virtual DynamicAny::NameValuePairSeq *get_members (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -96,7 +96,7 @@ public:
 
   virtual void set_members (
       const DynamicAny::NameValuePairSeq& value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -105,7 +105,7 @@ public:
       ));
 
   virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -113,7 +113,7 @@ public:
 
   virtual void set_members_as_dyn_any (
       const DynamicAny::NameDynAnyPairSeq & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -125,7 +125,7 @@ public:
 
   virtual void from_any (
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -134,7 +134,7 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -142,21 +142,21 @@ public:
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -166,7 +166,7 @@ public:
 private:
   // Check if the typecode is acceptable.
   void check_typecode (CORBA::TypeCode_ptr tc
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
 
   // Called by both versions of init().
   void init_common (void);
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 7a5136e585f..f4983081d25 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -31,12 +31,12 @@ TAO_DynUnion_i::init_common (void)
 
 void
 TAO_DynUnion_i::init (const CORBA_Any& any
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = any.type ();
 
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_union)
@@ -53,16 +53,16 @@ TAO_DynUnion_i::init (const CORBA_Any& any
   // InconsistentTypeCode.
   this->set_from_any (any,
                       1
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_DynUnion_i::init (CORBA_TypeCode_ptr tc
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind != CORBA::tk_union)
@@ -76,22 +76,22 @@ TAO_DynUnion_i::init (CORBA_TypeCode_ptr tc
   this->init_common ();
 
   CORBA::Any_var first_label = tc->member_label (this->current_position_
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Initialize the discriminator to the label value of the first member.
   this->discriminator_ =
     TAO_DynAnyFactory::make_dyn_any (first_label.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var first_type = tc->member_type (this->current_position_
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Recursively initialize the member to its default value.
   this->member_ = TAO_DynAnyFactory::make_dyn_any (first_type.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -99,7 +99,7 @@ TAO_DynUnion_i::init (CORBA_TypeCode_ptr tc
 
 TAO_DynUnion_i *
 TAO_DynUnion_i::_narrow (CORBA::Object_ptr obj
-                         TAO_ENV_ARG_DECL_NOT_USED)
+                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -138,7 +138,7 @@ TAO_DynUnion_i::_tao_QueryInterface (ptr_arith_t type)
 void
 TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
                               CORBA::Boolean from_factory
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -153,7 +153,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
 
   CORBA::TypeCode_var tc = any.type ();
 
-  CORBA_TypeCode_var disc_tc = tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_TypeCode_var disc_tc = tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA_Any disc_any (disc_tc.in (),
@@ -164,22 +164,22 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
   // Need this here because we might have been called from init().
   if (!CORBA::is_nil (this->discriminator_.in ()))
     {
-      this->discriminator_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   // Set the discriminator.
   this->discriminator_ = TAO_DynAnyFactory::make_dyn_any (disc_any
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Move to the next field in the CDR stream.
   (void) TAO_Marshal_Object::perform_skip (disc_tc.in (),
                                            &cdr
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Boolean match = 0;
@@ -189,12 +189,12 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
   for (i = 0; i < count; ++i)
     {
       CORBA_Any_var label_any = tc->member_label (i
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       match = this->label_match (label_any.in (),
                                  disc_any
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (match)
@@ -206,14 +206,14 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
   // Need this here because we might have been called from init().
   if (!CORBA::is_nil (this->member_.in ()))
     {
-      this->member_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   if (match)
     {
       CORBA::TypeCode_var member_tc = tc->member_type (i
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA_Any member_any (member_tc.in (),
@@ -223,7 +223,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
 
       this->member_ =
         TAO_DynAnyFactory::make_dyn_any (member_any
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->member_slot_ = i;
@@ -236,10 +236,10 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
       // default_index() does not work with aliased type codes.
       CORBA::TypeCode_var unaliased_tc =
         TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::Long default_index = unaliased_tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Long default_index = unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (default_index == -1)
@@ -259,7 +259,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
                                                 default_index);
 
           CORBA::TypeCode_var default_tc = tc->member_type (index
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           CORBA_Any default_any (default_tc.in (),
@@ -269,7 +269,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
 
           this->member_ =
             TAO_DynAnyFactory::make_dyn_any (default_any
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           this->member_slot_ = index;
@@ -280,7 +280,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any & any,
 // ****************************************************************
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::get_discriminator (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::get_discriminator (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -295,14 +295,14 @@ TAO_DynUnion_i::get_discriminator (TAO_ENV_SINGLE_ARG_DECL)
   // Set the flag so the caller can't destroy.
   this->set_flag (this->discriminator_.in (),
                   0
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
 
   return DynamicAny::DynAny::_duplicate (this->discriminator_.in ());
 }
 
 void
 TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -313,14 +313,14 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
       ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
     }
 
-  CORBA::TypeCode_var tc = value->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc = value->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TypeCode_var disc_tc = this->discriminator_->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var disc_tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Boolean equivalent = disc_tc->equivalent (tc.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!equivalent)
@@ -328,10 +328,10 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
       ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
     }
 
-  CORBA_Any_var value_any = value->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_Any_var value_any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong length = this->type_->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong length = this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA_Any_var label_any;
@@ -340,7 +340,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
   // member_label() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Boolean match = 0;
@@ -348,12 +348,12 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
   for (i = 0; i < length; ++i)
     {
       label_any = unaliased_tc->member_label (i
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       match = this->label_match (label_any.in (),
                                  value_any.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (match)
@@ -373,21 +373,21 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
 
       // If we got a match, a named member will be active.
       this->discriminator_->from_any (label_any.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // member_type() does not work with aliased type codes.
       CORBA::TypeCode_var member_tc =
         unaliased_tc->member_type (i
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->member_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Initialize member to default value.
       this->member_ = TAO_DynAnyFactory::make_dyn_any (member_tc.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Named active member (CORBA 2.3.1).
@@ -401,23 +401,23 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
       // default_index() does not work with aliased type codes.
       CORBA::TypeCode_var unaliased_tc =
         TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // If no match, either the default member or no member is active.
-      CORBA::Long default_index = unaliased_tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Long default_index = unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (default_index == -1)
         {
           // This can't throw InvalidValue - if there's no default case
           // and all possible labels are used, we'd have had a match above.
-          this->set_to_no_active_member (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->set_to_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
         {
-          this->set_to_default_member (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->set_to_default_member (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           this->member_slot_ = ACE_static_cast (CORBA::ULong,
@@ -427,15 +427,15 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
 
   // If we get here, we update the discriminator no matter what.
   // Any value will correspond to one of the three cases above.
-  this->discriminator_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->discriminator_ = value->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->discriminator_ = value->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_DynUnion_i::set_to_default_member (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -449,10 +449,10 @@ TAO_DynUnion_i::set_to_default_member (TAO_ENV_SINGLE_ARG_DECL)
   // default_index() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Long default_index = unaliased_tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Long default_index = unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (default_index == -1)
@@ -467,14 +467,14 @@ TAO_DynUnion_i::set_to_default_member (TAO_ENV_SINGLE_ARG_DECL)
 
       CORBA::TypeCode_var default_tc =
         unaliased_tc->member_type (index
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->member_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->member_ = TAO_DynAnyFactory::make_dyn_any (default_tc.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Default member active (CORBA 2.3.1).
@@ -486,7 +486,7 @@ TAO_DynUnion_i::set_to_default_member (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_DynUnion_i::set_to_no_active_member (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::set_to_no_active_member (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -500,10 +500,10 @@ TAO_DynUnion_i::set_to_no_active_member (TAO_ENV_SINGLE_ARG_DECL)
   // default_index() does not work with aliased type codes.
   CORBA::TypeCode_var unaliased_tc =
     TAO_DynAnyFactory::strip_alias (this->type_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Long default_index = unaliased_tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Long default_index = unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Throw an exception is there is an explicit default case or if all
@@ -514,19 +514,19 @@ TAO_DynUnion_i::set_to_no_active_member (TAO_ENV_SINGLE_ARG_DECL)
     }
   else
     {
-      CORBA::TypeCode_var disc_tc = this->discriminator_->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var disc_tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::TCKind kind = TAO_DynAnyFactory::unalias (disc_tc.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (kind == CORBA::tk_enum)
         {
-          CORBA::ULong member_count = this->type_->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::ULong member_count = this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
-          CORBA::ULong label_count = disc_tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::ULong label_count = disc_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           if (member_count == label_count)
@@ -542,7 +542,7 @@ TAO_DynUnion_i::set_to_no_active_member (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Boolean
-TAO_DynUnion_i::has_no_active_member (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::has_no_active_member (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -559,7 +559,7 @@ TAO_DynUnion_i::has_no_active_member (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::TCKind
-TAO_DynUnion_i::discriminator_kind (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::discriminator_kind (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -570,18 +570,18 @@ TAO_DynUnion_i::discriminator_kind (TAO_ENV_SINGLE_ARG_DECL)
                         CORBA::tk_null);
     }
 
-  CORBA_TypeCode_var tc = this->discriminator_->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_TypeCode_var tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   return retval;
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::member (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::member (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
@@ -594,7 +594,7 @@ TAO_DynUnion_i::member (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Boolean has_no_active_member =
-    this->has_no_active_member (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   if (has_no_active_member)
@@ -607,14 +607,14 @@ TAO_DynUnion_i::member (TAO_ENV_SINGLE_ARG_DECL)
   // Set the flag so the caller can't destroy.
   this->set_flag (this->member_.in (),
                   0
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
   return DynamicAny::DynAny::_duplicate (this->member_.in ());
 }
 
 char *
-TAO_DynUnion_i::member_name (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::member_name (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
@@ -627,7 +627,7 @@ TAO_DynUnion_i::member_name (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Boolean has_no_active_member =
-    this->has_no_active_member (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (has_no_active_member)
@@ -637,14 +637,14 @@ TAO_DynUnion_i::member_name (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   const char *retval = this->type_->member_name (this->member_slot_
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return CORBA::string_dup (retval);
 }
 
 CORBA::TCKind
-TAO_DynUnion_i::member_kind (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::InvalidValue
@@ -657,7 +657,7 @@ TAO_DynUnion_i::member_kind (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Boolean has_no_active_member =
-    this->has_no_active_member (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->has_no_active_member (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   if (has_no_active_member)
@@ -666,11 +666,11 @@ TAO_DynUnion_i::member_kind (TAO_ENV_SINGLE_ARG_DECL)
                         CORBA::tk_null);
     }
 
-  CORBA_TypeCode_var tc = this->member_->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_TypeCode_var tc = this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   CORBA::TCKind retval = TAO_DynAnyFactory::unalias (tc.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
   return retval;
@@ -680,7 +680,7 @@ TAO_DynUnion_i::member_kind (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_DynUnion_i::from_any (const CORBA_Any& any
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch,
@@ -694,7 +694,7 @@ TAO_DynUnion_i::from_any (const CORBA_Any& any
 
   CORBA::TypeCode_var tc = any.type ();
   CORBA::Boolean equivalent = this->type_.in ()->equivalent (tc.in ()
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (equivalent)
@@ -709,7 +709,7 @@ TAO_DynUnion_i::from_any (const CORBA_Any& any
       // TypeMismatch.
       this->set_from_any (any,
                           0
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -719,7 +719,7 @@ TAO_DynUnion_i::from_any (const CORBA_Any& any
 }
 
 CORBA::Any_ptr
-TAO_DynUnion_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -734,10 +734,10 @@ TAO_DynUnion_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
 
   // Add the discriminator to the CDR stream.
 
-  CORBA_TypeCode_var disc_tc = this->discriminator_->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_TypeCode_var disc_tc = this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA_Any_var disc_any = this->discriminator_->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_Any_var disc_any = this->discriminator_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_Message_Block *disc_mb = disc_any->_tao_get_cdr ();
@@ -748,15 +748,15 @@ TAO_DynUnion_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
   (void) TAO_Marshal_Object::perform_append (disc_tc.in (),
                                              &disc_cdr,
                                              &out_cdr
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Add the member to the CDR stream.
 
-  CORBA_TypeCode_var member_tc = this->member_->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_TypeCode_var member_tc = this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA_Any_var member_any = this->member_->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_Any_var member_any = this->member_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_Message_Block *member_mb = member_any->_tao_get_cdr ();
@@ -767,7 +767,7 @@ TAO_DynUnion_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
   (void) TAO_Marshal_Object::perform_append (member_tc.in (),
                                              &member_cdr,
                                              &out_cdr
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Make the Any.
@@ -787,7 +787,7 @@ TAO_DynUnion_i::to_any (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -799,7 +799,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
     }
 
   TAO_DynUnion_i *impl = TAO_DynUnion_i::_narrow (rhs
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (impl == 0)
@@ -808,7 +808,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
     }
 
   CORBA::Boolean equivalent = this->type_->equivalent (impl->type_.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!equivalent)
@@ -817,12 +817,12 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
     }
 
   CORBA::Boolean member_equal = this->member_->equal (impl->member_.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Boolean disc_equal =
     this->discriminator_->equal (impl->discriminator_.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   impl->_remove_ref ();
@@ -831,7 +831,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
 }
 
 void
-TAO_DynUnion_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -847,18 +847,18 @@ TAO_DynUnion_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
 
       this->set_flag (this->member_.in (),
                       1
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->member_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->set_flag (this->discriminator_.in (),
                       1
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->discriminator_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->discriminator_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       this->destroyed_ = 1;
@@ -866,7 +866,7 @@ TAO_DynUnion_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 DynamicAny::DynAny_ptr
-TAO_DynUnion_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynUnion_i::current_component (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException,
       DynamicAny::DynAny::TypeMismatch
@@ -882,7 +882,7 @@ TAO_DynUnion_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
     {
       this->set_flag (this->member_.in (),
                       0
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
       return DynamicAny::DynAny::_duplicate (this->member_.in ());
@@ -891,7 +891,7 @@ TAO_DynUnion_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
     {
       this->set_flag (this->discriminator_.in (),
                       0
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (DynamicAny::DynAny::_nil ());
 
       return DynamicAny::DynAny::_duplicate (this->discriminator_.in ());
@@ -903,7 +903,7 @@ TAO_DynUnion_i::current_component (TAO_ENV_SINGLE_ARG_DECL)
 CORBA::Boolean
 TAO_DynUnion_i::label_match (const CORBA_Any &my_any,
                              const CORBA_Any &other_any
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
@@ -914,7 +914,7 @@ TAO_DynUnion_i::label_match (const CORBA_Any &my_any,
   CORBA::TypeCode_var tc = my_any.type ();
 
   CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // No need to do any type checking - it was done before this
diff --git a/TAO/tao/DynamicAny/DynUnion_i.h b/TAO/tao/DynamicAny/DynUnion_i.h
index 71824e6ce71..b5f5e412fd4 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -50,23 +50,23 @@ public:
   ~TAO_DynUnion_i (void);
   // Destructor.
 
-  void init (const CORBA_Any& any TAO_ENV_ARG_DECL);
+  void init (const CORBA_Any& any ACE_ENV_ARG_DECL);
   // Constructor taking an Any argument.
 
-  void init (CORBA_TypeCode_ptr tc TAO_ENV_ARG_DECL);
+  void init (CORBA_TypeCode_ptr tc ACE_ENV_ARG_DECL);
   // Constructor taking a typecode argument.
 
   // = LocalObject methods.
   static TAO_DynUnion_i *_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
   // = Functions specific to DynUnion.
 
   virtual DynamicAny::DynAny_ptr get_discriminator (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -74,7 +74,7 @@ public:
 
   virtual void set_discriminator (
       DynamicAny::DynAny_ptr d
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -82,7 +82,7 @@ public:
       ));
 
   virtual void set_to_default_member (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -90,7 +90,7 @@ public:
       ));
 
   virtual void set_to_no_active_member (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -98,21 +98,21 @@ public:
       ));
 
   virtual CORBA::Boolean has_no_active_member (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual CORBA::TCKind discriminator_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr member (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -120,7 +120,7 @@ public:
       ));
 
   virtual char * member_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -128,7 +128,7 @@ public:
       ));
 
   virtual CORBA::TCKind member_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -139,7 +139,7 @@ public:
 
   virtual void from_any (
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -148,7 +148,7 @@ public:
       ));
 
   virtual CORBA::Any * to_any (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -156,21 +156,21 @@ public:
 
   virtual CORBA::Boolean equal (
       DynamicAny::DynAny_ptr dyn_any
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
   virtual DynamicAny::DynAny_ptr current_component (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -182,7 +182,7 @@ private:
   // function from_any().
   void set_from_any (const CORBA_Any &any,
                      CORBA::Boolean from_factory
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
         CORBA::SystemException,
         DynamicAny::DynAny::TypeMismatch,
@@ -195,7 +195,7 @@ private:
   // Iterative check for label value match.
   CORBA::Boolean label_match (const CORBA_Any &my_any,
                               const CORBA_Any &other_any
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
diff --git a/TAO/tao/DynamicAny/DynamicAny.cpp b/TAO/tao/DynamicAny/DynamicAny.cpp
index 64713cc43a9..076f39a2992 100644
--- a/TAO/tao/DynamicAny/DynamicAny.cpp
+++ b/TAO/tao/DynamicAny/DynamicAny.cpp
@@ -27,7 +27,7 @@ CORBA::Object_ptr
 TAO_DynamicAny_Loader::create_object (CORBA::ORB_ptr,
                                       int,
                                       char *[]
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj;
diff --git a/TAO/tao/DynamicAny/DynamicAny.h b/TAO/tao/DynamicAny/DynamicAny.h
index 9c6075c1211..44f32355ecb 100644
--- a/TAO/tao/DynamicAny/DynamicAny.h
+++ b/TAO/tao/DynamicAny/DynamicAny.h
@@ -36,7 +36,7 @@ public:
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            char *argv []
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Creates a DynamicAny factory and returns it.
 
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index c30a98feecd..9f70f76273f 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -140,10 +140,10 @@ DynamicAny::DynAny_var::tao_nil (void)
 ::DynamicAny::DynAny_ptr
 DynamicAny::DynAny_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynAny::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::DynamicAny::DynAny::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -225,15 +225,15 @@ DynamicAny::DynAny::~DynAny (void)
 
 DynamicAny::DynAny_ptr DynamicAny::DynAny::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynAny::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return DynAny::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynAny_ptr DynamicAny::DynAny::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -328,7 +328,7 @@ void DynamicAny::DynAny::InvalidValue::_raise ()
 
 void DynamicAny::DynAny::InvalidValue::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -336,7 +336,7 @@ void DynamicAny::DynAny::InvalidValue::_tao_encode (
 
 void DynamicAny::DynAny::InvalidValue::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -396,7 +396,7 @@ void DynamicAny::DynAny::TypeMismatch::_raise ()
 
 void DynamicAny::DynAny::TypeMismatch::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -404,7 +404,7 @@ void DynamicAny::DynAny::TypeMismatch::_tao_encode (
 
 void DynamicAny::DynAny::TypeMismatch::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -529,10 +529,10 @@ DynamicAny::DynFixed_var::tao_nil (void)
 ::DynamicAny::DynFixed_ptr
 DynamicAny::DynFixed_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynFixed::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::DynamicAny::DynFixed::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -614,15 +614,15 @@ DynamicAny::DynFixed::~DynFixed (void)
 
 DynamicAny::DynFixed_ptr DynamicAny::DynFixed::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynFixed::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return DynFixed::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynFixed_ptr DynamicAny::DynFixed::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -794,10 +794,10 @@ DynamicAny::DynEnum_var::tao_nil (void)
 ::DynamicAny::DynEnum_ptr
 DynamicAny::DynEnum_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynEnum::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::DynamicAny::DynEnum::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -879,15 +879,15 @@ DynamicAny::DynEnum::~DynEnum (void)
 
 DynamicAny::DynEnum_ptr DynamicAny::DynEnum::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynEnum::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return DynEnum::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynEnum_ptr DynamicAny::DynEnum::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1435,10 +1435,10 @@ DynamicAny::DynStruct_var::tao_nil (void)
 ::DynamicAny::DynStruct_ptr
 DynamicAny::DynStruct_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynStruct::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::DynamicAny::DynStruct::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1520,15 +1520,15 @@ DynamicAny::DynStruct::~DynStruct (void)
 
 DynamicAny::DynStruct_ptr DynamicAny::DynStruct::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynStruct::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return DynStruct::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynStruct_ptr DynamicAny::DynStruct::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1700,10 +1700,10 @@ DynamicAny::DynUnion_var::tao_nil (void)
 ::DynamicAny::DynUnion_ptr
 DynamicAny::DynUnion_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynUnion::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::DynamicAny::DynUnion::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1785,15 +1785,15 @@ DynamicAny::DynUnion::~DynUnion (void)
 
 DynamicAny::DynUnion_ptr DynamicAny::DynUnion::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynUnion::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return DynUnion::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynUnion_ptr DynamicAny::DynUnion::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2060,11 +2060,11 @@ TAO_NAMESPACE_END
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_downcast (
       void* target,
       CORBA_Object *src
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
     DynamicAny::DynAny **tmp = ACE_static_cast (DynamicAny::DynAny**, target);
-    *tmp = DynamicAny::DynAny::_narrow (src TAO_ENV_ARG_PARAMETER);
+    *tmp = DynamicAny::DynAny::_narrow (src ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -2238,10 +2238,10 @@ DynamicAny::DynSequence_var::tao_nil (void)
 ::DynamicAny::DynSequence_ptr
 DynamicAny::DynSequence_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynSequence::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::DynamicAny::DynSequence::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2323,15 +2323,15 @@ DynamicAny::DynSequence::~DynSequence (void)
 
 DynamicAny::DynSequence_ptr DynamicAny::DynSequence::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynSequence::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return DynSequence::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynSequence_ptr DynamicAny::DynSequence::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2503,10 +2503,10 @@ DynamicAny::DynArray_var::tao_nil (void)
 ::DynamicAny::DynArray_ptr
 DynamicAny::DynArray_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynArray::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::DynamicAny::DynArray::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2588,15 +2588,15 @@ DynamicAny::DynArray::~DynArray (void)
 
 DynamicAny::DynArray_ptr DynamicAny::DynArray::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynArray::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return DynArray::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynArray_ptr DynamicAny::DynArray::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2768,10 +2768,10 @@ DynamicAny::DynValue_var::tao_nil (void)
 ::DynamicAny::DynValue_ptr
 DynamicAny::DynValue_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynValue::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::DynamicAny::DynValue::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2853,15 +2853,15 @@ DynamicAny::DynValue::~DynValue (void)
 
 DynamicAny::DynValue_ptr DynamicAny::DynValue::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynValue::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return DynValue::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynValue_ptr DynamicAny::DynValue::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3033,10 +3033,10 @@ DynamicAny::DynAnyFactory_var::tao_nil (void)
 ::DynamicAny::DynAnyFactory_ptr
 DynamicAny::DynAnyFactory_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::DynamicAny::DynAnyFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::DynamicAny::DynAnyFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3118,15 +3118,15 @@ DynamicAny::DynAnyFactory::~DynAnyFactory (void)
 
 DynamicAny::DynAnyFactory_ptr DynamicAny::DynAnyFactory::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynAnyFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return DynAnyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 DynamicAny::DynAnyFactory_ptr DynamicAny::DynAnyFactory::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3221,7 +3221,7 @@ void DynamicAny::DynAnyFactory::InconsistentTypeCode::_raise ()
 
 void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -3229,7 +3229,7 @@ void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_encode (
 
 void DynamicAny::DynAnyFactory::InconsistentTypeCode::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -3301,7 +3301,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameVa
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePair TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePair ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3392,7 +3392,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameVa
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePairSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePairSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3497,7 +3497,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::AnySeq
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_AnySeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_AnySeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 22ddf3456b7..e7ced264d57 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -99,7 +99,7 @@ TAO_NAMESPACE  DynamicAny
     static DynAny_ptr tao_duplicate (DynAny_ptr);
     static void tao_release (DynAny_ptr);
     static DynAny_ptr tao_nil (void);
-    static DynAny_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static DynAny_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -154,11 +154,11 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
     static DynAny_ptr _duplicate (DynAny_ptr obj);
     static DynAny_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynAny_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynAny_ptr _nil (void)
       {
@@ -188,12 +188,12 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static InvalidValue *_downcast (CORBA::Exception *);
@@ -229,12 +229,12 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static TypeMismatch *_downcast (CORBA::Exception *);
@@ -248,7 +248,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 #endif /* end #if !defined */
 
     virtual CORBA::TypeCode_ptr type (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -256,7 +256,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void assign (
         DynamicAny::DynAny_ptr dyn_any
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -265,7 +265,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void from_any (
         const CORBA::Any & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -274,7 +274,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Any * to_any (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -282,21 +282,21 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual CORBA::Boolean equal (
         DynamicAny::DynAny_ptr dyn_any
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual DynamicAny::DynAny_ptr copy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -304,7 +304,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_boolean (
         CORBA::Boolean value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -314,7 +314,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_octet (
         CORBA::Octet value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -324,7 +324,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_char (
         CORBA::Char value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -334,7 +334,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_short (
         CORBA::Short value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -344,7 +344,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_ushort (
         CORBA::UShort value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -354,7 +354,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_long (
         CORBA::Long value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -364,7 +364,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_ulong (
         CORBA::ULong value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -374,7 +374,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_float (
         CORBA::Float value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -384,7 +384,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_double (
         CORBA::Double value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -394,7 +394,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_string (
         const char * value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -404,7 +404,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_reference (
         CORBA::Object_ptr value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -414,7 +414,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_typecode (
         CORBA::TypeCode_ptr value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -424,7 +424,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_longlong (
         CORBA::LongLong value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -434,7 +434,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_ulonglong (
         CORBA::ULongLong value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -444,7 +444,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_longdouble (
         CORBA::LongDouble value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -454,7 +454,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_wchar (
         CORBA::WChar value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -464,7 +464,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_wstring (
         const CORBA::WChar * value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -474,7 +474,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_any (
         const CORBA::Any & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -484,7 +484,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_dyn_any (
         DynamicAny::DynAny_ptr value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -494,7 +494,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual void insert_val (
         CORBA::ValueBase_ptr value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -503,7 +503,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Boolean get_boolean (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -512,7 +512,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Octet get_octet (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -521,7 +521,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Char get_char (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -530,7 +530,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Short get_short (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -539,7 +539,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::UShort get_ushort (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -548,7 +548,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Long get_long (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -557,7 +557,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::ULong get_ulong (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -566,7 +566,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Float get_float (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -575,7 +575,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Double get_double (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -584,7 +584,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual char * get_string (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -593,7 +593,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Object_ptr get_reference (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -602,7 +602,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::TypeCode_ptr get_typecode (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -611,7 +611,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::LongLong get_longlong (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -620,7 +620,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::ULongLong get_ulonglong (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -629,7 +629,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::LongDouble get_longdouble (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -638,7 +638,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::WChar get_wchar (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -647,7 +647,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::WChar * get_wstring (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -656,7 +656,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Any * get_any (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -665,7 +665,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual DynamicAny::DynAny_ptr get_dyn_any (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -674,7 +674,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::ValueBase_ptr get_val (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -684,35 +684,35 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
 
     virtual CORBA::Boolean seek (
         CORBA::Long index
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void rewind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Boolean next (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::ULong component_count (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual DynamicAny::DynAny_ptr current_component (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -774,7 +774,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
     static DynFixed_ptr tao_duplicate (DynFixed_ptr);
     static void tao_release (DynFixed_ptr);
     static DynFixed_ptr tao_nil (void);
-    static DynFixed_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static DynFixed_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -829,11 +829,11 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny
     static DynFixed_ptr _duplicate (DynFixed_ptr obj);
     static DynFixed_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynFixed_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynFixed_ptr _nil (void)
       {
@@ -841,7 +841,7 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny
       }
 
     virtual char * get_value (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -849,7 +849,7 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny
 
     virtual CORBA::Boolean set_value (
         const char * val
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -912,7 +912,7 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny
     static DynEnum_ptr tao_duplicate (DynEnum_ptr);
     static void tao_release (DynEnum_ptr);
     static DynEnum_ptr tao_nil (void);
-    static DynEnum_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static DynEnum_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -967,11 +967,11 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     static DynEnum_ptr _duplicate (DynEnum_ptr obj);
     static DynEnum_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynEnum_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynEnum_ptr _nil (void)
       {
@@ -979,7 +979,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
       }
 
     virtual char * get_as_string (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -987,7 +987,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
 
     virtual void set_as_string (
         const char * value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -995,7 +995,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
       )) = 0;
 
     virtual CORBA::ULong get_as_ulong (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1003,7 +1003,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
 
     virtual void set_as_ulong (
         CORBA::ULong value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1498,7 +1498,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     static DynStruct_ptr tao_duplicate (DynStruct_ptr);
     static void tao_release (DynStruct_ptr);
     static DynStruct_ptr tao_nil (void);
-    static DynStruct_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static DynStruct_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1553,11 +1553,11 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
     static DynStruct_ptr _duplicate (DynStruct_ptr obj);
     static DynStruct_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynStruct_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynStruct_ptr _nil (void)
       {
@@ -1565,7 +1565,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
       }
 
     virtual char * current_member_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1574,7 +1574,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
       )) = 0;
 
     virtual CORBA::TCKind current_member_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1583,7 +1583,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
       )) = 0;
 
     virtual DynamicAny::NameValuePairSeq * get_members (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1591,7 +1591,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
 
     virtual void set_members (
         const DynamicAny::NameValuePairSeq & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1600,7 +1600,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
       )) = 0;
 
     virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1608,7 +1608,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
 
     virtual void set_members_as_dyn_any (
         const DynamicAny::NameDynAnyPairSeq & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1671,7 +1671,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
     static DynUnion_ptr tao_duplicate (DynUnion_ptr);
     static void tao_release (DynUnion_ptr);
     static DynUnion_ptr tao_nil (void);
-    static DynUnion_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static DynUnion_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1726,11 +1726,11 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
     static DynUnion_ptr _duplicate (DynUnion_ptr obj);
     static DynUnion_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynUnion_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynUnion_ptr _nil (void)
       {
@@ -1738,7 +1738,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
       }
 
     virtual DynamicAny::DynAny_ptr get_discriminator (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1746,7 +1746,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
 
     virtual void set_discriminator (
         DynamicAny::DynAny_ptr d
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1754,7 +1754,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
       )) = 0;
 
     virtual void set_to_default_member (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1762,7 +1762,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
       )) = 0;
 
     virtual void set_to_no_active_member (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1770,21 +1770,21 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
       )) = 0;
 
     virtual CORBA::Boolean has_no_active_member (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::TCKind discriminator_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual DynamicAny::DynAny_ptr member (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1792,7 +1792,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
       )) = 0;
 
     virtual char * member_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1800,7 +1800,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
       )) = 0;
 
     virtual CORBA::TCKind member_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2007,7 +2007,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
       virtual void _downcast (
           void* target,
           CORBA_Object *src
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
       virtual CORBA_Object* _upcast (void *src) const;
 
@@ -2163,7 +2163,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
     static DynSequence_ptr tao_duplicate (DynSequence_ptr);
     static void tao_release (DynSequence_ptr);
     static DynSequence_ptr tao_nil (void);
-    static DynSequence_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static DynSequence_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -2218,11 +2218,11 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
     static DynSequence_ptr _duplicate (DynSequence_ptr obj);
     static DynSequence_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynSequence_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynSequence_ptr _nil (void)
       {
@@ -2230,7 +2230,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
       }
 
     virtual CORBA::ULong get_length (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2238,7 +2238,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
 
     virtual void set_length (
         CORBA::ULong len
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2246,7 +2246,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
       )) = 0;
 
     virtual DynamicAny::AnySeq * get_elements (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2254,7 +2254,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
 
     virtual void set_elements (
         const DynamicAny::AnySeq & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2263,7 +2263,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
       )) = 0;
 
     virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2271,7 +2271,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
 
     virtual void set_elements_as_dyn_any (
         const DynamicAny::DynAnySeq & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2334,7 +2334,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
     static DynArray_ptr tao_duplicate (DynArray_ptr);
     static void tao_release (DynArray_ptr);
     static DynArray_ptr tao_nil (void);
-    static DynArray_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static DynArray_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -2389,11 +2389,11 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
     static DynArray_ptr _duplicate (DynArray_ptr obj);
     static DynArray_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynArray_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynArray_ptr _nil (void)
       {
@@ -2401,7 +2401,7 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
       }
 
     virtual DynamicAny::AnySeq * get_elements (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2409,7 +2409,7 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
 
     virtual void set_elements (
         const DynamicAny::AnySeq & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2418,7 +2418,7 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
       )) = 0;
 
     virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2426,7 +2426,7 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
 
     virtual void set_elements_as_dyn_any (
         const DynamicAny::DynAnySeq & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2489,7 +2489,7 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
     static DynValue_ptr tao_duplicate (DynValue_ptr);
     static void tao_release (DynValue_ptr);
     static DynValue_ptr tao_nil (void);
-    static DynValue_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static DynValue_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -2544,11 +2544,11 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
     static DynValue_ptr _duplicate (DynValue_ptr obj);
     static DynValue_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynValue_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynValue_ptr _nil (void)
       {
@@ -2556,7 +2556,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
       }
 
     virtual char * current_member_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2565,7 +2565,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
       )) = 0;
 
     virtual CORBA::TCKind current_member_kind (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2574,7 +2574,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
       )) = 0;
 
     virtual DynamicAny::NameValuePairSeq * get_members (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2582,7 +2582,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
 
     virtual void set_members (
         const DynamicAny::NameValuePairSeq & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2591,7 +2591,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
       )) = 0;
 
     virtual DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2599,7 +2599,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
 
     virtual void set_members_as_dyn_any (
         const DynamicAny::NameDynAnyPairSeq & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2662,7 +2662,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
     static DynAnyFactory_ptr tao_duplicate (DynAnyFactory_ptr);
     static void tao_release (DynAnyFactory_ptr);
     static DynAnyFactory_ptr tao_nil (void);
-    static DynAnyFactory_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static DynAnyFactory_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -2717,11 +2717,11 @@ class TAO_DynamicAny_Export DynAnyFactory : public virtual CORBA_Object
     static DynAnyFactory_ptr _duplicate (DynAnyFactory_ptr obj);
     static DynAnyFactory_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynAnyFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static DynAnyFactory_ptr _nil (void)
       {
@@ -2751,12 +2751,12 @@ class TAO_DynamicAny_Export DynAnyFactory : public virtual CORBA_Object
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static InconsistentTypeCode *_downcast (CORBA::Exception *);
@@ -2771,7 +2771,7 @@ class TAO_DynamicAny_Export DynAnyFactory : public virtual CORBA_Object
 
     virtual DynamicAny::DynAny_ptr create_dyn_any (
         const CORBA::Any & value
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2780,7 +2780,7 @@ class TAO_DynamicAny_Export DynAnyFactory : public virtual CORBA_Object
 
     virtual DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
         CORBA::TypeCode_ptr type
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.i b/TAO/tao/DynamicAny/DynamicAnyC.i
index 240bb96c9c9..7451357d1e2 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.i
+++ b/TAO/tao/DynamicAny/DynamicAnyC.i
@@ -58,10 +58,10 @@ tao_DynamicAny_DynAny_nil (
 ACE_INLINE DynamicAny::DynAny_ptr
 tao_DynamicAny_DynAny_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynAny::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return DynamicAny::DynAny::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -108,10 +108,10 @@ tao_DynamicAny_DynFixed_nil (
 ACE_INLINE DynamicAny::DynFixed_ptr
 tao_DynamicAny_DynFixed_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynFixed::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return DynamicAny::DynFixed::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -158,10 +158,10 @@ tao_DynamicAny_DynEnum_nil (
 ACE_INLINE DynamicAny::DynEnum_ptr
 tao_DynamicAny_DynEnum_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynEnum::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return DynamicAny::DynEnum::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1382,10 +1382,10 @@ tao_DynamicAny_DynStruct_nil (
 ACE_INLINE DynamicAny::DynStruct_ptr
 tao_DynamicAny_DynStruct_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynStruct::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return DynamicAny::DynStruct::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1432,10 +1432,10 @@ tao_DynamicAny_DynUnion_nil (
 ACE_INLINE DynamicAny::DynUnion_ptr
 tao_DynamicAny_DynUnion_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynUnion::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return DynamicAny::DynUnion::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -2250,10 +2250,10 @@ tao_DynamicAny_DynSequence_nil (
 ACE_INLINE DynamicAny::DynSequence_ptr
 tao_DynamicAny_DynSequence_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynSequence::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return DynamicAny::DynSequence::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -2300,10 +2300,10 @@ tao_DynamicAny_DynArray_nil (
 ACE_INLINE DynamicAny::DynArray_ptr
 tao_DynamicAny_DynArray_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynArray::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return DynamicAny::DynArray::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -2350,10 +2350,10 @@ tao_DynamicAny_DynValue_nil (
 ACE_INLINE DynamicAny::DynValue_ptr
 tao_DynamicAny_DynValue_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynValue::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return DynamicAny::DynValue::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -2404,10 +2404,10 @@ tao_DynamicAny_DynAnyFactory_nil (
 ACE_INLINE DynamicAny::DynAnyFactory_ptr
 tao_DynamicAny_DynAnyFactory_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return DynamicAny::DynAnyFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return DynamicAny::DynAnyFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
index aa1d1a9fc86..81ff11e648d 100644
--- a/TAO/tao/DynamicC.cpp
+++ b/TAO/tao/DynamicC.cpp
@@ -658,7 +658,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::Parameter
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Dynamic::_tc_Parameter TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (Dynamic::_tc_Parameter ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -749,7 +749,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::Parameter
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Dynamic::_tc_ParameterList TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (Dynamic::_tc_ParameterList ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -840,7 +840,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Dynamic::Exception
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Dynamic::_tc_ExceptionList TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (Dynamic::_tc_ExceptionList ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index 6a30a7ff6bb..2b84e02b54c 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -55,7 +55,7 @@ CORBA_Context::_decr_refcnt (void)
 }
 
 const char *
-CORBA_Context::context_name (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_Context::context_name (ACE_ENV_SINGLE_ARG_DECL) const
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                          CORBA::COMPLETED_NO),
@@ -63,7 +63,7 @@ CORBA_Context::context_name (TAO_ENV_SINGLE_ARG_DECL) const
 }
 
 CORBA_Context_ptr
-CORBA_Context::parent (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_Context::parent (ACE_ENV_SINGLE_ARG_DECL) const
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                          CORBA::COMPLETED_NO),
@@ -73,7 +73,7 @@ CORBA_Context::parent (TAO_ENV_SINGLE_ARG_DECL) const
 void
 CORBA_Context::create_child (const char * /* child_ctx_name */,
                              CORBA_Context_out /* child_ctx */
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                   CORBA::COMPLETED_NO));
@@ -82,7 +82,7 @@ CORBA_Context::create_child (const char * /* child_ctx_name */,
 void
 CORBA_Context::set_one_value (const char * /* propname */,
                               const CORBA_Any & /* propvalue */
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                   CORBA::COMPLETED_NO));
@@ -90,7 +90,7 @@ CORBA_Context::set_one_value (const char * /* propname */,
 
 void
 CORBA_Context::set_values (CORBA::NVList_ptr
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                   CORBA::COMPLETED_NO));
@@ -98,7 +98,7 @@ CORBA_Context::set_values (CORBA::NVList_ptr
 
 void
 CORBA_Context::delete_values (const char * /* propname */
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                   CORBA::COMPLETED_NO));
@@ -109,7 +109,7 @@ CORBA_Context::get_values (const char * /* start_scope */,
                            CORBA::Flags /* op_flags */,
                            const char * /* pattern */,
                            CORBA::NVList_ptr & /* values */
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                   CORBA::COMPLETED_NO));
@@ -154,7 +154,7 @@ CORBA_ContextList::add_consume (char *ctx)
 
 char *
 CORBA_ContextList::item (CORBA::ULong slot
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   char **ctx = 0;
 
@@ -171,7 +171,7 @@ CORBA_ContextList::item (CORBA::ULong slot
 
 void
 CORBA_ContextList::remove (CORBA::ULong
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
diff --git a/TAO/tao/DynamicInterface/Context.h b/TAO/tao/DynamicInterface/Context.h
index d91e03553f9..30420007698 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -63,29 +63,29 @@ public:
   // = All the spec-required functions below will just throw a
   //   CORBA::NO_IMPLEMENT exception and do nothing else.
 
-  const char *context_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  const char *context_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
-  CORBA_Context_ptr parent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  CORBA_Context_ptr parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   void create_child (const char *child_ctx_name,
                      CORBA_Context_out child_ctx
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void set_one_value (const char *propname,
                       const CORBA_Any &propvalue
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void set_values (CORBA::NVList_ptr values
-                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void delete_values (const char *propname
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void get_values (const char *start_scope,
                    CORBA::Flags op_flags,
                    const char *pattern,
                    CORBA::NVList_ptr &values
-                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef CORBA_Context_ptr _ptr_type;
@@ -206,11 +206,11 @@ public:
   // Add and consume a string to the list.
 
   char *item (CORBA::ULong slot
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Return the typecode at slot i. Raises the "Bounds" exception.
 
   void remove (CORBA::ULong slot
-               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Remove the typecode at slot i. Raises the "Bounds" exception.
 
   void _incr_refcnt (void);
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index ef3981b31a3..24aa5a7b225 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -17,11 +17,11 @@ ACE_RCSID(DynamicInterface, DII_Invocation, "$Id$")
 
 int
 TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UnknownUserException))
 {
   int retval = this->invoke_i (0
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (retval);
 
   // A TAO_INVOKE_EXCEPTION status, but no exception raised means that
@@ -52,10 +52,10 @@ TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions
            i++)
         {
           CORBA::TypeCode_ptr tcp = exceptions->item (i
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
-          const char *xid = tcp->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+          const char *xid = tcp->id (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
           if (ACE_OS::strcmp (buf.in (), xid) != 0)
@@ -95,15 +95,15 @@ TAO_GIOP_DII_Invocation::invoke (CORBA::ExceptionList_ptr exceptions
 //***************************************************************************
 
 int
-TAO_GIOP_DII_Deferred_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL)
+TAO_GIOP_DII_Deferred_Invocation::invoke (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->invoke_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->invoke_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
 int
-TAO_GIOP_DII_Deferred_Invocation::invoke_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_GIOP_DII_Deferred_Invocation::invoke_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Register a reply dispatcher for this Asynch_Invocation. Use the
@@ -123,7 +123,7 @@ TAO_GIOP_DII_Deferred_Invocation::invoke_i (TAO_ENV_SINGLE_ARG_DECL)
 
   // Just send the request, without trying to wait for the reply.
   retval = TAO_GIOP_Invocation::invoke (0
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (retval);
 
   if (retval != TAO_INVOKE_OK)
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h
index e1eb48df110..28deb8f2c8f 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation.h
@@ -55,7 +55,7 @@ public:
   // Constructor.
 
   int invoke (CORBA::ExceptionList_ptr exceptions
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException));
   // Send request, block until any reply comes back, and unmarshal
   // reply parameters as appropriate.
@@ -84,13 +84,13 @@ public:
                                     int byte_order = TAO_ENCAP_BYTE_ORDER);
   // Constructor.
 
-  int invoke (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  int invoke (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Send request, block until any reply comes back, and unmarshal
   // reply parameters as appropriate.
 
 private:
-  int invoke_i (TAO_ENV_SINGLE_ARG_DECL)
+  int invoke_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Implementation of the invoke() methods, handles the basic
   // send/reply code and the system exceptions.
diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
index c04d152b3aa..c2fc76d9ff8 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -85,7 +85,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply (
       // Call the Request back and send the reply data.
       this->req_->handle_response (this->reply_cdr_,
                                    this->reply_status_
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -117,7 +117,7 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void)
       TAO_OutputCDR out_cdr;
 
       comm_failure._tao_encode (out_cdr
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Turn into an output CDR
@@ -125,7 +125,7 @@ TAO_DII_Deferred_Reply_Dispatcher::connection_closed (void)
 
       this->req_->handle_response (cdr,
                                    TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
index 9259196a33e..1b787582d7f 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -28,7 +28,7 @@ TAO_Dynamic_Adapter_Impl::create_request (
     CORBA::ExceptionList_ptr exceptions,
     CORBA::Request_ptr &request,
     CORBA::Flags req_flags
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_NEW_THROW_EX (request,
@@ -39,7 +39,7 @@ TAO_Dynamic_Adapter_Impl::create_request (
                                     result,
                                     req_flags,
                                     exceptions
-                                    TAO_ENV_ARG_PARAMETER),
+                                    ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY (
                         CORBA_SystemException::_tao_minor_code (
                             TAO_DEFAULT_MINOR_CODE,
@@ -53,14 +53,14 @@ CORBA::Request_ptr
 TAO_Dynamic_Adapter_Impl::request (CORBA::Object_ptr obj,
                                    CORBA::ORB_ptr orb,
                                    const char *operation
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   CORBA::Request_ptr req = CORBA::Request::_nil ();
   ACE_NEW_THROW_EX (req,
                     CORBA::Request (obj,
                                     orb,
                                     operation
-                                    TAO_ENV_ARG_PARAMETER),
+                                    ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY (
                         CORBA_SystemException::_tao_minor_code (
                             TAO_DEFAULT_MINOR_CODE,
@@ -121,7 +121,7 @@ TAO_Dynamic_Adapter_Impl::server_request_release (CORBA::ServerRequest_ptr req)
 void
 TAO_Dynamic_Adapter_Impl::create_exception_list (
     CORBA::ExceptionList_ptr &list
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_NEW_THROW_EX (list,
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
index f391374ba95..b0c00db0c16 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
@@ -56,12 +56,12 @@ public:
                                CORBA::ExceptionList_ptr exceptions,
                                CORBA::Request_ptr &request,
                                CORBA::Flags req_flags
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual CORBA::Request_ptr request (CORBA::Object_ptr obj,
                                       CORBA::ORB_ptr orb,
                                       const char *op
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest.
 
@@ -80,7 +80,7 @@ public:
   // CORBA::ORB::create_exception_list.
 
   virtual void create_exception_list (CORBA::ExceptionList_ptr &list
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // Used to force the initialization of the ORB code.
   static int Initializer (void);
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index 4d0781d9804..72c13e14d15 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -11,13 +11,13 @@ ACE_RCSID(DynamicInterface, Dynamic_Implementation, "$Id$")
 #include "tao/PortableServer/Collocated_Object.h"
 
 CORBA::Object_ptr
-TAO_DynamicImplementation::_this (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynamicImplementation::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The _this() function returns a CORBA::Object_ptr for the target
   // object. Unlike _this() for static skeletons, its return type is
   // not interface-specific because a DSI servant may very well
   // incarnate multiple CORBA objects of different types.
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Create a object.
@@ -48,7 +48,7 @@ TAO_DynamicImplementation::_downcast (const char *repository_id)
 }
 
 TAO_Stub *
-TAO_DynamicImplementation::_create_stub (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DynamicImplementation::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
 {
   // If DynamicImplementation::_this() is invoked outside of the
   // context of a request invocation on a target object being served
@@ -65,30 +65,30 @@ TAO_DynamicImplementation::_create_stub (TAO_ENV_SINGLE_ARG_DECL)
                         0);
     }
 
-  PortableServer::POA_var poa = poa_current_impl->get_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = poa_current_impl->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::RepositoryId pinterface =
     this->_primary_interface (poa_current_impl->object_id (),
                               poa.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::PolicyList_var client_exposed_policies =
     poa_current_impl->poa ()->client_exposed_policies
-      (poa_current_impl->priority () TAO_ENV_ARG_PARAMETER);
+      (poa_current_impl->priority () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return poa_current_impl->poa ()->key_to_stub (poa_current_impl->object_key (),
                                                 pinterface,
                                                 poa_current_impl->priority ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
                                       void * /* context */
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   // No need to do any of this if the client isn't waiting.
   if (request.response_expected ())
@@ -121,13 +121,13 @@ TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
     {
       // Delegate to user.
       this->invoke (dsi_request
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Only if the client is waiting.
       if (request.response_expected () && !request.sync_with_server ())
         {
-          dsi_request->dsi_marshal (TAO_ENV_SINGLE_ARG_PARAMETER);
+          dsi_request->dsi_marshal (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index 751aedc1da3..a9199f2e455 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -42,7 +42,7 @@ class TAO_DynamicInterface_Export TAO_DynamicImplementation
   //    circumstances may lead to unpredictable results.
 public:
   virtual void invoke (CORBA::ServerRequest_ptr request
-                       TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                       ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
   // The invoke() method receives requests issued to any CORBA object
   // incarnated by the DSI servant and performs the processing
   // necessary to execute the request.
@@ -50,13 +50,13 @@ public:
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
       PortableServer::POA_ptr poa
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 
   // The _primary_interface() method receives an ObjectId value and a
   // POA_ptr as input parameters and returns a valid RepositoryId
   // representing the most-derived interface for that oid.
 
-  CORBA::Object_ptr _this (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  CORBA::Object_ptr _this (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Returns a CORBA::Object_ptr for the target object.
 
 protected:
@@ -67,12 +67,12 @@ protected:
   virtual void *_downcast (const char *repository_id);
   // Simply returns "this"
 
-  virtual TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // This is an auxiliary method for _this() and _narrow().
 
   virtual void _dispatch (TAO_ServerRequest &request,
                           void *context
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Turns around and calls invoke.
 };
 
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index d399a022e06..7167280aafd 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -50,7 +50,7 @@ CORBA_ExceptionList::add_consume (CORBA::TypeCode_ptr tc)
 
 CORBA::TypeCode_ptr
 CORBA_ExceptionList::item (CORBA::ULong slot
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_ptr *tc = 0;
 
@@ -67,7 +67,7 @@ CORBA_ExceptionList::item (CORBA::ULong slot
 
 void
 CORBA_ExceptionList::remove (CORBA::ULong
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
diff --git a/TAO/tao/DynamicInterface/ExceptionList.h b/TAO/tao/DynamicInterface/ExceptionList.h
index 9ec372f2b31..90cc3d737a2 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -76,11 +76,11 @@ public:
   // Add and consume a TypeCode to the list.
 
   CORBA::TypeCode_ptr item (CORBA::ULong slot
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Return the typecode at slot i. Raises the "Bounds" exception.
 
   void remove (CORBA::ULong slot
-               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Remove the typecode at slot i. Raises the "Bounds" exception.
 
   void  _incr_refcnt (void);
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index 4f4c740b39a..0060fa8fe11 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -65,7 +65,7 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
                               CORBA::NamedValue_ptr result,
                               CORBA::Flags flags,
                               CORBA::ExceptionList_ptr exceptions
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     args_ (CORBA::NVList::_duplicate (args)),
     result_ (CORBA::NamedValue::_duplicate (result)),
@@ -95,7 +95,7 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
 CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
                               CORBA::ORB_ptr orb,
                               const CORBA::Char *op
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     flags_ (0),
     // env_ (env),
@@ -141,7 +141,7 @@ CORBA_Request::~CORBA_Request (void)
 // flow in some exotic situations.
 
 void
-CORBA_Request::invoke (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_Request::invoke (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Boolean argument_flag = this->args_->_lazy_has_arguments ();
 
@@ -156,25 +156,25 @@ CORBA_Request::invoke (TAO_ENV_SINGLE_ARG_DECL)
   // Loop as needed for forwarding.
   for (;;)
     {
-      call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+      call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
 
       call.prepare_header (ACE_static_cast (CORBA::Octet,
                                             flag)
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->args_->_tao_encode (call.out_stream (),
                                 this->orb_->orb_core (),
                                 CORBA::ARG_IN | CORBA::ARG_INOUT
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Make the call ... blocking for the response.
       int status = call.invoke (this->exceptions_.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (status == TAO_INVOKE_RESTART)
@@ -217,18 +217,18 @@ CORBA_Request::invoke (TAO_ENV_SINGLE_ARG_DECL)
   if (this->result_ != 0)
     {
       this->result_->value ()->_tao_decode (call.inp_stream ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->args_->_tao_incoming_cdr (call.inp_stream (),
                                   CORBA::ARG_OUT | CORBA::ARG_INOUT,
                                   this->lazy_evaluation_
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 void
-CORBA_Request::send_oneway (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_Request::send_oneway (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Boolean argument_flag = this->args_->_lazy_has_arguments ();
 
@@ -242,23 +242,23 @@ CORBA_Request::send_oneway (TAO_ENV_SINGLE_ARG_DECL)
   // Loop as needed for forwarding.
   for (;;)
     {
-      call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+      call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Octet response_flag = ACE_static_cast (CORBA::Octet,
                                                     call.sync_scope ());
 
       call.prepare_header (response_flag
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->args_->_tao_encode (call.out_stream (),
                                 this->orb_->orb_core (),
                                 CORBA::ARG_IN | CORBA::ARG_INOUT
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      int status = call.invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+      int status = call.invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (status == TAO_INVOKE_RESTART)
@@ -288,7 +288,7 @@ CORBA_Request::send_oneway (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CORBA_Request::send_deferred (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_Request::send_deferred (ACE_ENV_SINGLE_ARG_DECL)
 {
   {
     ACE_GUARD (TAO_SYNCH_MUTEX,
@@ -309,23 +309,23 @@ CORBA_Request::send_deferred (TAO_ENV_SINGLE_ARG_DECL)
   // Loop as needed for forwarding.
   for (;;)
     {
-      call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+      call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
 
       call.prepare_header (ACE_static_cast (CORBA::Octet, flag)
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->args_->_tao_encode (call.out_stream (),
                                 this->orb_->orb_core (),
                                 CORBA::ARG_IN | CORBA::ARG_INOUT
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Make the call without blocking.
-      CORBA::ULong status = call.invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong status = call.invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (status == TAO_INVOKE_RESTART)
@@ -349,7 +349,7 @@ CORBA_Request::send_deferred (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CORBA_Request::get_response (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_Request::get_response (ACE_ENV_SINGLE_ARG_DECL)
 {
   while (!this->response_received_)
     {
@@ -358,13 +358,13 @@ CORBA_Request::get_response (TAO_ENV_SINGLE_ARG_DECL)
 
   if (this->lazy_evaluation_)
     {
-      this->args_->evaluate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->args_->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 CORBA::Boolean
-CORBA_Request::poll_response (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA_Request::poll_response (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     ace_mon,
@@ -377,7 +377,7 @@ CORBA_Request::poll_response (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 CORBA_Request::handle_response (TAO_InputCDR &incoming,
                                 CORBA::ULong reply_status
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   // If this request was created by a gateway, then result_
   // and/or args_ are shared by a CORBA::ServerRequest, whose
@@ -391,14 +391,14 @@ CORBA_Request::handle_response (TAO_InputCDR &incoming,
       if (this->result_ != 0)
         {
           this->result_->value ()->_tao_decode (incoming
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
       this->args_->_tao_incoming_cdr (incoming,
                                       CORBA::ARG_OUT | CORBA::ARG_INOUT,
                                       this->lazy_evaluation_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       {
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 444a4504224..f6f2142fcb7 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -99,7 +99,7 @@ public:
   CORBA_Any &return_value (void);
   // Returns reference to Any for extraction using >>=.
 
-  void invoke (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void invoke (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Perform method resolution and invoke an appropriate method. If
   // the method returns successfully, its result is placed in the
   // result argument specified on <create_request>. The behavior is
@@ -109,20 +109,20 @@ public:
   // A default argument is set, but please note that this not recommended
   // as the user may not be able to propagate the exceptions
 
-  void send_oneway (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void send_oneway (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Send a oneway request.
   // A default argument is set, but please note that this not recommended
   // as the user may not be able to propagate the exceptions.
 
   // The 'deferred synchronous' methods.
-  void send_deferred (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void get_response (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  CORBA::Boolean poll_response (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void send_deferred (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void get_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  CORBA::Boolean poll_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   // Callback method for deferred synchronous requests.
   void handle_response (TAO_InputCDR &incoming,
                         CORBA::ULong reply_status
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // Pseudo object methods.
   static CORBA_Request* _duplicate (CORBA_Request*);
@@ -166,12 +166,12 @@ private:
                  CORBA::NamedValue_ptr result,
                  CORBA::Flags flags,
                  CORBA::ExceptionList_ptr exceptions
-                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_Request (CORBA::Object_ptr obj,
                  CORBA::ORB_ptr orb,
                  const CORBA::Char *op
-                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   ~CORBA_Request (void);
 
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index d1bf04b3716..ad34953722a 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -66,42 +66,42 @@ ACE_INLINE CORBA_Any &
 CORBA_Request::add_in_arg (void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_IN TAO_ENV_ARG_PARAMETER)->any_;
+  return this->args_->add_element (CORBA::ARG_IN ACE_ENV_ARG_PARAMETER)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_in_arg (const CORBA::Char *name)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_IN TAO_ENV_ARG_PARAMETER)->any_;
+  return this->args_->add_item (name, CORBA::ARG_IN ACE_ENV_ARG_PARAMETER)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_inout_arg (void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_INOUT TAO_ENV_ARG_PARAMETER)->any_;
+  return this->args_->add_element (CORBA::ARG_INOUT ACE_ENV_ARG_PARAMETER)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_inout_arg (const CORBA::Char *name)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_INOUT TAO_ENV_ARG_PARAMETER)->any_;
+  return this->args_->add_item (name, CORBA::ARG_INOUT ACE_ENV_ARG_PARAMETER)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_out_arg (void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_OUT TAO_ENV_ARG_PARAMETER)->any_;
+  return this->args_->add_element (CORBA::ARG_OUT ACE_ENV_ARG_PARAMETER)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_out_arg (const CORBA::Char *name)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_OUT TAO_ENV_ARG_PARAMETER)->any_;
+  return this->args_->add_item (name, CORBA::ARG_OUT ACE_ENV_ARG_PARAMETER)->any_;
 }
 
 ACE_INLINE void
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index d214ee8e150..914ad1ad6cc 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -78,7 +78,7 @@ CORBA_ServerRequest::~CORBA_ServerRequest (void)
 // inout/out/return values later on.
 void
 CORBA_ServerRequest::arguments (CORBA::NVList_ptr &list
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   // arguments() must be called before either of these.
   if (this->params_ != 0 || this->exception_ != 0)
@@ -92,7 +92,7 @@ CORBA_ServerRequest::arguments (CORBA::NVList_ptr &list
   this->params_->_tao_incoming_cdr (this->orb_server_request_.incoming (),
                                     CORBA::ARG_IN | CORBA::ARG_INOUT,
                                     this->lazy_evaluation_
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
 
   // Pass this alignment back to the TAO_ServerRequest.
   this->orb_server_request_.dsi_nvlist_align (
@@ -105,7 +105,7 @@ CORBA_ServerRequest::arguments (CORBA::NVList_ptr &list
 // only after the parameter list has been provided (maybe empty).
 void
 CORBA_ServerRequest::set_result (const CORBA::Any &value
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   // Setting a result when another result already exists or if an exception
   // exists or before the args have been processeed is an error.
@@ -120,7 +120,7 @@ CORBA_ServerRequest::set_result (const CORBA::Any &value
   ACE_CHECK;
 }
 
-  // NOTE: if "TAO_ENV_SINGLE_ARG_PARAMETER" is set, there has been a system exception,
+  // NOTE: if "ACE_ENV_SINGLE_ARG_PARAMETER" is set, there has been a system exception,
   // and it will take precedence over exceptions reported using the
   // set_exception() mechanism of the ServerRequest, which we assume
   // the application writer will use to report only user exceptions.
@@ -130,7 +130,7 @@ CORBA_ServerRequest::set_result (const CORBA::Any &value
 // Store the exception value.
 void
 CORBA_ServerRequest::set_exception (const CORBA::Any &value
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var tc = value.type ();
 
@@ -152,7 +152,7 @@ CORBA_ServerRequest::set_exception (const CORBA::Any &value
 // This method will be utilized by the DSI servant to marshal outgoing
 // parameters.
 void
-CORBA_ServerRequest::dsi_marshal (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_ServerRequest::dsi_marshal (ACE_ENV_SINGLE_ARG_DECL)
 {
   // There was a user exception, no need to marshal any parameters.
   if (this->sent_gateway_exception_)
@@ -176,7 +176,7 @@ CORBA_ServerRequest::dsi_marshal (TAO_ENV_SINGLE_ARG_DECL)
           this->retval_->_tao_encode (
                              this->orb_server_request_.outgoing (),
                              this->orb_server_request_.orb_core ()
-                             TAO_ENV_ARG_PARAMETER
+                             ACE_ENV_ARG_PARAMETER
                            );
           ACE_CHECK;
         }
@@ -188,7 +188,7 @@ CORBA_ServerRequest::dsi_marshal (TAO_ENV_SINGLE_ARG_DECL)
                              this->orb_server_request_.outgoing (),
                              this->orb_server_request_.orb_core (),
                              CORBA::ARG_INOUT | CORBA::ARG_OUT
-                             TAO_ENV_ARG_PARAMETER
+                             ACE_ENV_ARG_PARAMETER
                            );
           ACE_CHECK;
         }
@@ -204,7 +204,7 @@ CORBA_ServerRequest::dsi_marshal (TAO_ENV_SINGLE_ARG_DECL)
       this->exception_->_tao_encode (
                             this->orb_server_request_.outgoing (),
                             this->orb_server_request_.orb_core ()
-                            TAO_ENV_ARG_PARAMETER
+                            ACE_ENV_ARG_PARAMETER
                           );
       ACE_CHECK;
     }
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
index a356d8abc15..41baee8661a 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -53,13 +53,13 @@ public:
   // Destructor.
 
   void arguments (CORBA::NVList_ptr &list
-                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Implementation uses this to provide the ORB with the operation's
   // parameter list ... on return, their values are available; the
   // list fed in has typecodes and (perhap) memory assigned.
 
   void set_result (const CORBA::Any &value
-                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Implementation uses this to provide the operation result
   // ... illegal if exception() was called or params() was not called.
   //
@@ -67,7 +67,7 @@ public:
   // sent when this returns, and reclaim memory it allocated.
 
   void set_exception (const CORBA::Any &value
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Implementation uses this to provide the exception value which is
   // the only result of this particular invocation.
   //
@@ -83,7 +83,7 @@ public:
   // this stuff is a catastrophic error since this is all part of the
   // basic CORBA Object Model.
 
-  void dsi_marshal (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void dsi_marshal (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Marshal outgoing parameters.
 
   CORBA::Context_ptr ctx (void) const;
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index ddbb5fbec54..7ba4063eb33 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -69,7 +69,7 @@ CORBA_UnknownUserException::_raise (void)
 void
 CORBA_UnknownUserException::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -77,7 +77,7 @@ CORBA_UnknownUserException::_tao_encode (
 
 void
 CORBA_UnknownUserException::_tao_decode (TAO_InputCDR &
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
index dd9585ba144..8d2a8cd7c0f 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
@@ -74,9 +74,9 @@ public:
   virtual void _raise (void);
 
   virtual void _tao_encode (TAO_OutputCDR &cdr
-                            TAO_ENV_ARG_DECL) const;
+                            ACE_ENV_ARG_DECL) const;
   virtual void _tao_decode (TAO_InputCDR &cdr
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
   /// Narrow to an UnknowUserException.
   static CORBA_UnknownUserException *_downcast (CORBA_Exception *ex);
diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp
index b7840508950..41fc84598b1 100644
--- a/TAO/tao/Dynamic_Adapter.cpp
+++ b/TAO/tao/Dynamic_Adapter.cpp
@@ -22,7 +22,7 @@ TAO_Dynamic_Adapter::create_request (
     CORBA::ExceptionList_ptr /* exceptions */,
     CORBA::Request_ptr & /* request */,
     CORBA::Flags /* req_flags */
-    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
+    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
   )
 {
 }
@@ -31,7 +31,7 @@ CORBA::Request_ptr
 TAO_Dynamic_Adapter::request (CORBA::Object_ptr /* obj */,
                               CORBA::ORB_ptr /* orb */,
                               const char * /* op */
-                              TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+                              ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
 {
   return 0;
 }
@@ -71,7 +71,7 @@ TAO_Dynamic_Adapter::server_request_release (CORBA::ServerRequest_ptr)
 
 void
 TAO_Dynamic_Adapter::create_exception_list (CORBA::ExceptionList_ptr &
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
diff --git a/TAO/tao/Dynamic_Adapter.h b/TAO/tao/Dynamic_Adapter.h
index 957a46aa579..d8a61b93d2f 100644
--- a/TAO/tao/Dynamic_Adapter.h
+++ b/TAO/tao/Dynamic_Adapter.h
@@ -50,12 +50,12 @@ public:
                                CORBA::ExceptionList_ptr exceptions,
                                CORBA::Request_ptr &request,
                                CORBA::Flags req_flags
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual CORBA::Request_ptr request (CORBA::Object_ptr obj,
                                       CORBA::ORB_ptr orb,
                                       const char *op
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // CORBA::is_nil and CORBA::release for Context, Request, and ServerRequest.
 
@@ -73,7 +73,7 @@ public:
 
   // CORBA::ORB::create_exception_list.
   virtual void create_exception_list (CORBA::ExceptionList_ptr &
-                                      TAO_ENV_ARG_DECL_NOT_USED);
+                                      ACE_ENV_ARG_DECL_NOT_USED);
 };
 
 #include "ace/post.h"
diff --git a/TAO/tao/Endpoint_Selector_Factory.h b/TAO/tao/Endpoint_Selector_Factory.h
index 933b87bc233..c25f2585e3d 100644
--- a/TAO/tao/Endpoint_Selector_Factory.h
+++ b/TAO/tao/Endpoint_Selector_Factory.h
@@ -58,7 +58,7 @@ public:
   /// initialize the endpoint selection state instance.
   virtual TAO_Invocation_Endpoint_Selector *get_selector (
                              TAO_GIOP_Invocation *invocation
-                             TAO_ENV_ARG_DECL) = 0;
+                             ACE_ENV_ARG_DECL) = 0;
 };
 
 #include "ace/post.h"
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index d347c310b45..902a399b26f 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -286,7 +286,7 @@ CORBA_SystemException::_downcast (CORBA_Exception* exception)
 
 void
 CORBA_SystemException::_tao_encode (TAO_OutputCDR &cdr
-                                    TAO_ENV_ARG_DECL) const
+                                    ACE_ENV_ARG_DECL) const
 {
   if (cdr.write_string (this->_id ())
       && cdr.write_ulong (this->minor ())
@@ -297,7 +297,7 @@ CORBA_SystemException::_tao_encode (TAO_OutputCDR &cdr
 
 void
 CORBA_SystemException::_tao_decode (TAO_InputCDR &cdr
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   // The string is read by the caller, to determine the exact type of
   // the exception.  We just decode the fields...
@@ -826,7 +826,7 @@ CORBA_SystemException::_tao_get_omg_exception_description (
 
 void
 TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
 {
   // Create the TypeCode for the CORBA_UnknownUserException.
 
@@ -882,7 +882,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
                                         const char *name,
                                         char *buffer,
                                         size_t buflen
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   // This function must only be called ONCE, and with a global lock
   // held!  The <CORBA::ORB_init> method is responsible for ensuring
@@ -1032,7 +1032,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
 #undef TAO_TC_BUF_LEN
 
 void
-TAO_Exceptions::init (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_DECL)
 {
   // This routine should only be called once.
 
@@ -1052,18 +1052,18 @@ TAO_Exceptions::init (TAO_ENV_SINGLE_ARG_DECL)
                                           #name, \
                                           (char*)tc_buf_##name, \
                                           sizeof(tc_buf_##name) \
-                                           TAO_ENV_ARG_PARAMETER); \
+                                           ACE_ENV_ARG_PARAMETER); \
   ACE_CHECK;
   STANDARD_EXCEPTION_LIST
 #undef  TAO_SYSTEM_EXCEPTION
 
   TAO_Exceptions::make_unknown_user_typecode (CORBA::_tc_UnknownUserException
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_SystemException *
 TAO_Exceptions::create_system_exception (const char *id
-                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
 #define TAO_SYSTEM_EXCEPTION(name) \
   { \
@@ -1159,11 +1159,11 @@ tao_insert_for_insertion_system_exception (CORBA::Any &any,
                                            const CORBA::SystemException &ex,
                                            const char *msg)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       TAO_OutputCDR stream;
-      ex._tao_encode (stream TAO_ENV_ARG_PARAMETER);
+      ex._tao_encode (stream ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       any._tao_replace (ex._type (),
                         TAO_ENCAP_BYTE_ORDER,
@@ -1195,11 +1195,11 @@ tao_insert_system_exception (CORBA::Any &any,
                              CORBA::Any::_tao_destructor destructor,
                              const char *msg)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       TAO_OutputCDR stream;
-      ex->_tao_encode (stream TAO_ENV_ARG_PARAMETER);
+      ex->_tao_encode (stream ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       any._tao_replace (ex->_type (),
                         TAO_ENCAP_BYTE_ORDER,
@@ -1249,12 +1249,12 @@ tao_insert_in_extractor_system_exception (
         const char *compare_IR_Id,
         const char *msg)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::TypeCode_var type = any.type ();
       CORBA::Boolean equiv =
-        type->equivalent (tc_name TAO_ENV_ARG_PARAMETER);
+        type->equivalent (tc_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (!equiv)
         return 0;
@@ -1276,7 +1276,7 @@ tao_insert_in_extractor_system_exception (
                                      compare_IR_Id))
             return 0;
           CORBA::SystemException *tmp = allocator ();
-          tmp->_tao_decode (stream TAO_ENV_ARG_PARAMETER);
+          tmp->_tao_decode (stream ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ((CORBA::Any *)&any)->_tao_replace (
               tc_name,
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 4e243bba2cb..3dce5909d54 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -93,9 +93,9 @@ public:
   virtual ACE_CString _info (void) const = 0;
 
   virtual void _tao_encode (TAO_OutputCDR &cdr
-                            TAO_ENV_ARG_DECL_NOT_USED) const = 0;
+                            ACE_ENV_ARG_DECL_NOT_USED) const = 0;
   virtual void _tao_decode (TAO_InputCDR &cdr
-                            TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                            ACE_ENV_ARG_DECL_NOT_USED) = 0;
 
   /// Used in the non-copying Any insertion operator.
   static void _tao_any_destructor (void *);
@@ -227,9 +227,9 @@ public:
   virtual ACE_CString _info (void) const;
 
   virtual void _tao_encode (TAO_OutputCDR &cdr
-                            TAO_ENV_ARG_DECL_NOT_USED) const;
+                            ACE_ENV_ARG_DECL_NOT_USED) const;
   virtual void _tao_decode (TAO_InputCDR &cdr
-                            TAO_ENV_ARG_DECL_NOT_USED);
+                            ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Helper to create a minor status value.
   static CORBA::ULong _tao_minor_code (u_int location,
@@ -343,16 +343,16 @@ public:
                                       const char *name,
                                       char *buf,
                                       size_t buflen
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Make the TypeCode for the CORBA::UnknownUserException standard
   /// exception.
   static void make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Runtime initialization of all standard exception typecodes.
   /// Called from <CORBA::ORB_init>.
-  static void init (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  static void init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Runtime finalization of all standard exception typecodes.
   static void fini (void);
@@ -360,7 +360,7 @@ public:
   /// Create a CORBA::SystemException given the interface repository ID.
   static CORBA_SystemException *create_system_exception (
       const char *id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   /**
diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp
index 8ddad3a1661..c4f5a9ecc13 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -31,7 +31,7 @@ TAO_FILE_Parser::match_prefix (const char *ior_string) const
 CORBA::Object_ptr
 TAO_FILE_Parser::parse_string (const char *ior,
                                CORBA::ORB_ptr orb
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Skip the prefix, we know it is there because this method in only
@@ -54,7 +54,7 @@ TAO_FILE_Parser::parse_string (const char *ior,
   CORBA::Object_ptr object = CORBA::Object::_nil ();
   ACE_TRY
     {
-      object = orb->string_to_object (string TAO_ENV_ARG_PARAMETER);
+      object = orb->string_to_object (string ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       reader.alloc ()->free (string);
diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h
index 17729ceca1b..1eefc4d865f 100644
--- a/TAO/tao/FILE_Parser.h
+++ b/TAO/tao/FILE_Parser.h
@@ -45,7 +45,7 @@ public:
   virtual int match_prefix (const char *ior_string) const;
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index 99d04588f7c..73dbf1111fa 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -402,7 +402,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, GIOP::IORAddressingInfo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (GIOP::_tc_IORAddressingInfo TAO_ENV_ARG_PARAMETER);
+      type->equivalent (GIOP::_tc_IORAddressingInfo ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -506,7 +506,7 @@ CORBA::Boolean operator>>= (
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (GIOP::_tc_TargetAddress TAO_ENV_ARG_PARAMETER);
+      type->equivalent (GIOP::_tc_TargetAddress ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 33348b40e39..589f8f80633 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -133,14 +133,14 @@ TAO_GIOP_Message_Base::generate_reply_header (
                            -1);
     }
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Now call the implementation for the rest of the header
       int result =
         this->generator_parser_->write_reply_header (cdr,
                                                      params
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!result)
@@ -700,14 +700,14 @@ TAO_GIOP_Message_Base::generate_exception_reply (
 {
   // A new try/catch block, but if something goes wrong now we have no
   // hope, just abort.
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Make the GIOP & reply header.
       this->generate_reply_header (cdr,
                                    params);
-      x._tao_encode (cdr TAO_ENV_ARG_PARAMETER);
+      x._tao_encode (cdr ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA_Exception, ex)
@@ -780,7 +780,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
 
   int parse_error = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       parse_error =
@@ -801,7 +801,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
           this->orb_core_,
           request,
           forward_to
-          TAO_ENV_ARG_PARAMETER);
+          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (forward_to.in ()))
@@ -967,7 +967,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
 
   CORBA::Boolean response_required = 1;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       int parse_error =
@@ -1014,7 +1014,7 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
           this->orb_core_,
           server_request,
           forward_to
-           TAO_ENV_ARG_PARAMETER);
+           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (forward_to.in ()))
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h
index c7c814d18a9..56112d3c178 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser.h
@@ -68,7 +68,7 @@ public:
   virtual int write_reply_header (
       TAO_OutputCDR &output,
       TAO_Pluggable_Reply_Params_Base &reply
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   /// Writes the locate _reply message in to the <output>
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index b822e7751ab..8a9d0e3e67c 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -117,14 +117,14 @@ int
 TAO_GIOP_Message_Generator_Parser_10::write_reply_header (
     TAO_OutputCDR &output,
     TAO_Pluggable_Reply_Params_Base &reply
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Write the service context list.
 #if (TAO_HAS_MINIMUM_CORBA == 1)
   output << reply.service_context_notowned ();
-  TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
+  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 #else
   if (reply.is_dsi_ == 0)
     {
@@ -321,7 +321,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header (
   // the reference count on the CDR message block, because this key
   // will not outlive the request (or the message block).
 
-  hdr_status = 
+  hdr_status =
     hdr_status && request.profile ().unmarshall_object_key (input);
 
   if (input.char_translator () == 0)
@@ -397,7 +397,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_locate_header (
   request.request_id (req_id);
 
   // Get the object key
-  hdr_status = 
+  hdr_status =
     hdr_status && request.profile ().unmarshall_object_key (msg);
 
   return hdr_status ? 0 : -1;
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h
index d762c6de367..ba384b63a53 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h
@@ -59,7 +59,7 @@ public:
   virtual int write_reply_header (
       TAO_OutputCDR &output,
       TAO_Pluggable_Reply_Params_Base &reply
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index cad821c58b6..6408411efc7 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -131,7 +131,7 @@ int
 TAO_GIOP_Message_Generator_Parser_12::write_reply_header (
     TAO_OutputCDR & output,
     TAO_Pluggable_Reply_Params_Base &reply
-    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
+    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -288,7 +288,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header (
   input.skip_bytes (3);
 
   // Unmarshal the target address field.
-  hdr_status = 
+  hdr_status =
     hdr_status && request.profile ().unmarshall_target_address(input);
 
   if (input.char_translator () == 0)
@@ -371,7 +371,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_locate_header (
   request.request_id (req_id);
 
   // Unmarshal the target address field.
-  hdr_status = 
+  hdr_status =
     hdr_status && request.profile ().unmarshall_target_address(msg);
 
   // Reset the pointer to an 8-byte bouns]dary
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h
index 9795ae822d4..75ac2479121 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h
@@ -61,7 +61,7 @@ public:
   virtual int write_reply_header (
       TAO_OutputCDR &output,
       TAO_Pluggable_Reply_Params_Base &reply
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index c2f0875b45a..e16f1a8632e 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -627,14 +627,14 @@ TAO_GIOP_Message_Lite::generate_exception_reply (
 {
   // A new try/catch block, but if something goes wrong now we have no
   // hope, just abort.
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Make the GIOP & reply header. They are version specific.
       this->write_reply_header (cdr,
                                 params);
-      x._tao_encode (cdr TAO_ENV_ARG_PARAMETER);
+      x._tao_encode (cdr ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA_Exception, ex)
@@ -701,7 +701,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
 
   int parse_error = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       parse_error =
@@ -721,7 +721,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
       this->orb_core_->adapter_registry ()->dispatch (request.object_key (),
                                                       request,
                                                       forward_to
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (forward_to.in ()))
@@ -886,7 +886,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
 
   CORBA::Boolean response_required = 1;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       int parse_error =
@@ -939,7 +939,7 @@ TAO_GIOP_Message_Lite::process_locate_request (TAO_Transport *transport,
       this->orb_core_->adapter_registry ()->dispatch (server_request.object_key (),
                                                       server_request,
                                                       forward_to
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (forward_to.in ()))
@@ -1120,7 +1120,7 @@ int
 TAO_GIOP_Message_Lite::write_reply_header (
     TAO_OutputCDR &output,
     TAO_Pluggable_Reply_Params_Base &reply
-    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
+    ACE_ENV_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1407,7 +1407,7 @@ TAO_GIOP_Message_Lite::send_reply_exception (
 
   // A new try/catch block, but if something goes wrong now we have no
   // hope, just abort.
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -1424,7 +1424,7 @@ TAO_GIOP_Message_Lite::send_reply_exception (
                                 reply_params);
 
 
-      x->_tao_encode (output TAO_ENV_ARG_PARAMETER);
+      x->_tao_encode (output ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA_Exception, ex)
diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h
index 4bab59806be..601f899822e 100644
--- a/TAO/tao/GIOP_Message_Lite.h
+++ b/TAO/tao/GIOP_Message_Lite.h
@@ -214,7 +214,7 @@ private:
   int write_reply_header (
       TAO_OutputCDR &output,
       TAO_Pluggable_Reply_Params_Base &reply
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Writes the locate _reply message in to the <output>
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index 569302e85fa..c9f3c876a99 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -64,10 +64,10 @@ tao_CORBA_IRObject_nil (
 CORBA_IRObject_ptr
 tao_CORBA_IRObject_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_IRObject::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_IRObject::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -191,10 +191,10 @@ CORBA_IRObject_var::tao_nil (void)
 ::CORBA_IRObject_ptr
 CORBA_IRObject_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_IRObject::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_IRObject::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -272,21 +272,21 @@ public:
   TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -302,30 +302,30 @@ private:
 TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -333,13 +333,13 @@ TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -361,21 +361,21 @@ public:
   TAO_ClientRequestInfo_CORBA_IRObject_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -389,30 +389,30 @@ private:
 TAO_ClientRequestInfo_CORBA_IRObject_destroy::TAO_ClientRequestInfo_CORBA_IRObject_destroy (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_IRObject_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_IRObject_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -420,13 +420,13 @@ TAO_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (TAO_ENV_SINGLE_ARG_DEC
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -448,7 +448,7 @@ _TAO_CORBA_IRObject_Remote_Proxy_Impl::_TAO_CORBA_IRObject_Remote_Proxy_Impl (vo
 
 CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -490,7 +490,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
       TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -506,7 +506,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -518,17 +518,17 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -545,7 +545,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -572,7 +572,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -582,12 +582,12 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -598,7 +598,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -614,7 +614,7 @@ return _tao_retval;
 
 void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -656,7 +656,7 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
       TAO_ClientRequestInfo_CORBA_IRObject_destroy ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -672,7 +672,7 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -684,17 +684,17 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -710,7 +710,7 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -724,7 +724,7 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -734,12 +734,12 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -750,7 +750,7 @@ void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -805,7 +805,7 @@ _TAO_CORBA_IRObject_Remote_Proxy_Broker::~_TAO_CORBA_IRObject_Remote_Proxy_Broke
 _TAO_CORBA_IRObject_Proxy_Impl&
 _TAO_CORBA_IRObject_Remote_Proxy_Broker::select_proxy (
   ::CORBA_IRObject *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -846,24 +846,24 @@ void CORBA_IRObject::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_IRObject_ptr CORBA_IRObject::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_IRObject::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_IRObject::_nil ());
       if (is_a == 0)
         return CORBA_IRObject::_nil ();
     }
-  return CORBA_IRObject::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_IRObject::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_IRObject_ptr CORBA_IRObject::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -918,14 +918,14 @@ CORBA_IRObject::_duplicate (CORBA_IRObject_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_IRObject::_tao_QueryInterface (ptr_arith_t type)
@@ -950,36 +950,36 @@ const char* CORBA_IRObject::_interface_repository_id (void) const
 }
 
 CORBA::DefinitionKind CORBA_IRObject::def_kind (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_IRObject_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ((CORBA::DefinitionKind)0);
 
   return proxy.def_kind (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_IRObject::destroy (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_IRObject_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.destroy (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1010,10 +1010,10 @@ tao_CORBA_Contained_nil (
 CORBA_Contained_ptr
 tao_CORBA_Contained_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_Contained::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_Contained::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1137,10 +1137,10 @@ CORBA_Contained_var::tao_nil (void)
 ::CORBA_Contained_ptr
 CORBA_Contained_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_Contained::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_Contained::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1218,21 +1218,21 @@ public:
   TAO_ClientRequestInfo_CORBA_Contained_id_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1248,30 +1248,30 @@ private:
 TAO_ClientRequestInfo_CORBA_Contained_id_get::TAO_ClientRequestInfo_CORBA_Contained_id_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_id_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_id_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_id_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_id_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -1279,13 +1279,13 @@ TAO_ClientRequestInfo_CORBA_Contained_id_get::exceptions (TAO_ENV_SINGLE_ARG_DEC
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Contained_id_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_id_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1308,21 +1308,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1338,19 +1338,19 @@ TAO_ClientRequestInfo_CORBA_Contained_id_set::TAO_ClientRequestInfo_CORBA_Contai
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * id
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_id_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_id_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1366,12 +1366,12 @@ TAO_ClientRequestInfo_CORBA_Contained_id_set::arguments (TAO_ENV_SINGLE_ARG_DECL
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_id_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_id_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -1379,13 +1379,13 @@ TAO_ClientRequestInfo_CORBA_Contained_id_set::exceptions (TAO_ENV_SINGLE_ARG_DEC
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Contained_id_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_id_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1397,21 +1397,21 @@ public:
   TAO_ClientRequestInfo_CORBA_Contained_name_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1427,30 +1427,30 @@ private:
 TAO_ClientRequestInfo_CORBA_Contained_name_get::TAO_ClientRequestInfo_CORBA_Contained_name_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_name_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_name_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -1458,13 +1458,13 @@ TAO_ClientRequestInfo_CORBA_Contained_name_get::exceptions (TAO_ENV_SINGLE_ARG_D
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Contained_name_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_name_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1487,21 +1487,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1517,19 +1517,19 @@ TAO_ClientRequestInfo_CORBA_Contained_name_set::TAO_ClientRequestInfo_CORBA_Cont
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * name
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     name_ (name)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_name_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_name_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1545,12 +1545,12 @@ TAO_ClientRequestInfo_CORBA_Contained_name_set::arguments (TAO_ENV_SINGLE_ARG_DE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_name_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_name_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -1558,13 +1558,13 @@ TAO_ClientRequestInfo_CORBA_Contained_name_set::exceptions (TAO_ENV_SINGLE_ARG_D
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Contained_name_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_name_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1576,21 +1576,21 @@ public:
   TAO_ClientRequestInfo_CORBA_Contained_version_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1606,30 +1606,30 @@ private:
 TAO_ClientRequestInfo_CORBA_Contained_version_get::TAO_ClientRequestInfo_CORBA_Contained_version_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_version_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_version_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_version_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_version_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -1637,13 +1637,13 @@ TAO_ClientRequestInfo_CORBA_Contained_version_get::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Contained_version_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_version_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1666,21 +1666,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1696,19 +1696,19 @@ TAO_ClientRequestInfo_CORBA_Contained_version_set::TAO_ClientRequestInfo_CORBA_C
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * version
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     version_ (version)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_version_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_version_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1724,12 +1724,12 @@ TAO_ClientRequestInfo_CORBA_Contained_version_set::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_version_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_version_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -1737,13 +1737,13 @@ TAO_ClientRequestInfo_CORBA_Contained_version_set::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Contained_version_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_version_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1755,21 +1755,21 @@ public:
   TAO_ClientRequestInfo_CORBA_Contained_defined_in_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1785,30 +1785,30 @@ private:
 TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::TAO_ClientRequestInfo_CORBA_Contained_defined_in_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -1816,13 +1816,13 @@ TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::exceptions (TAO_ENV_SINGLE
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1844,21 +1844,21 @@ public:
   TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1874,30 +1874,30 @@ private:
 TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -1905,13 +1905,13 @@ TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::exceptions (TAO_ENV_SIN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1933,21 +1933,21 @@ public:
   TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1963,30 +1963,30 @@ private:
 TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -1994,13 +1994,13 @@ TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::exceptions (TAO
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2022,21 +2022,21 @@ public:
   TAO_ClientRequestInfo_CORBA_Contained_describe (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2052,30 +2052,30 @@ private:
 TAO_ClientRequestInfo_CORBA_Contained_describe::TAO_ClientRequestInfo_CORBA_Contained_describe (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_describe::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_describe::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_describe::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_describe::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -2083,13 +2083,13 @@ TAO_ClientRequestInfo_CORBA_Contained_describe::exceptions (TAO_ENV_SINGLE_ARG_D
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Contained_describe::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_describe::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2114,21 +2114,21 @@ public:
       CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2148,7 +2148,7 @@ TAO_ClientRequestInfo_CORBA_Contained_move::TAO_ClientRequestInfo_CORBA_Containe
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     new_container_ (new_container),
@@ -2157,12 +2157,12 @@ TAO_ClientRequestInfo_CORBA_Contained_move::TAO_ClientRequestInfo_CORBA_Containe
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Contained_move::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_move::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2184,12 +2184,12 @@ TAO_ClientRequestInfo_CORBA_Contained_move::arguments (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Contained_move::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_move::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -2197,13 +2197,13 @@ TAO_ClientRequestInfo_CORBA_Contained_move::exceptions (TAO_ENV_SINGLE_ARG_DECL)
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Contained_move::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Contained_move::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2225,7 +2225,7 @@ _TAO_CORBA_Contained_Remote_Proxy_Impl::_TAO_CORBA_Contained_Remote_Proxy_Impl (
 
 char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2267,7 +2267,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
       TAO_ClientRequestInfo_CORBA_Contained_id_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2283,7 +2283,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2295,17 +2295,17 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2322,7 +2322,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2350,7 +2350,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2360,12 +2360,12 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2376,7 +2376,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2393,7 +2393,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
     CORBA_Object *_collocated_tao_target_,
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2436,7 +2436,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
         &_tao_call,
         _collocated_tao_target_,
         id
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -2452,7 +2452,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2464,12 +2464,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -2482,7 +2482,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2498,7 +2498,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2512,7 +2512,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2522,12 +2522,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2538,7 +2538,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2554,7 +2554,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
 
 char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2596,7 +2596,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
       TAO_ClientRequestInfo_CORBA_Contained_name_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2612,7 +2612,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2624,17 +2624,17 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2651,7 +2651,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2679,7 +2679,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2689,12 +2689,12 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2705,7 +2705,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2722,7 +2722,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
     CORBA_Object *_collocated_tao_target_,
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2765,7 +2765,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
         &_tao_call,
         _collocated_tao_target_,
         name
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -2781,7 +2781,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2793,12 +2793,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -2811,7 +2811,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2827,7 +2827,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2841,7 +2841,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2851,12 +2851,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2867,7 +2867,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2883,7 +2883,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
 
 char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2925,7 +2925,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
       TAO_ClientRequestInfo_CORBA_Contained_version_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2941,7 +2941,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2953,17 +2953,17 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2980,7 +2980,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3008,7 +3008,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3018,12 +3018,12 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3034,7 +3034,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3051,7 +3051,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
     CORBA_Object *_collocated_tao_target_,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3094,7 +3094,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
         &_tao_call,
         _collocated_tao_target_,
         version
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -3110,7 +3110,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3122,12 +3122,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -3140,7 +3140,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3156,7 +3156,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3170,7 +3170,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3180,12 +3180,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3196,7 +3196,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3212,7 +3212,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
 
 CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3255,7 +3255,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
       TAO_ClientRequestInfo_CORBA_Contained_defined_in_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -3271,7 +3271,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3283,17 +3283,17 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3310,7 +3310,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3338,7 +3338,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3348,12 +3348,12 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3364,7 +3364,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3380,7 +3380,7 @@ return _tao_safe_retval._retn ();
 
 char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3422,7 +3422,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
       TAO_ClientRequestInfo_CORBA_Contained_absolute_name_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -3438,7 +3438,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3450,17 +3450,17 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3477,7 +3477,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3505,7 +3505,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3515,12 +3515,12 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3531,7 +3531,7 @@ char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3547,7 +3547,7 @@ return _tao_safe_retval._retn ();
 
 CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_repository (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3590,7 +3590,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
       TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -3606,7 +3606,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3618,17 +3618,17 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3645,7 +3645,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3673,7 +3673,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3683,12 +3683,12 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3699,7 +3699,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_reposito
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3715,7 +3715,7 @@ return _tao_safe_retval._retn ();
 
 CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3758,7 +3758,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
       TAO_ClientRequestInfo_CORBA_Contained_describe ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -3774,7 +3774,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3786,17 +3786,17 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3813,7 +3813,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3841,7 +3841,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3851,12 +3851,12 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3867,7 +3867,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3886,7 +3886,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3931,7 +3931,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
         new_container,
         new_name,
         new_version
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -3947,7 +3947,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3959,12 +3959,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -3979,7 +3979,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3995,7 +3995,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4009,7 +4009,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4019,12 +4019,12 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4035,7 +4035,7 @@ void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4090,7 +4090,7 @@ _TAO_CORBA_Contained_Remote_Proxy_Broker::~_TAO_CORBA_Contained_Remote_Proxy_Bro
 _TAO_CORBA_Contained_Proxy_Impl&
 _TAO_CORBA_Contained_Remote_Proxy_Broker::select_proxy (
   ::CORBA_Contained *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -4133,24 +4133,24 @@ void CORBA_Contained::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_Contained_ptr CORBA_Contained::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_Contained::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Contained:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Contained:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_Contained::_nil ());
       if (is_a == 0)
         return CORBA_Contained::_nil ();
     }
-  return CORBA_Contained::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_Contained::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_Contained_ptr CORBA_Contained::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4205,7 +4205,7 @@ CORBA_Contained::_duplicate (CORBA_Contained_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
@@ -4213,7 +4213,7 @@ CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_Contained::_tao_QueryInterface (ptr_arith_t type)
@@ -4250,161 +4250,161 @@ const char* CORBA_Contained::_interface_repository_id (void) const
 }
 
 char * CORBA_Contained::id (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Contained_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.id (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_Contained::id (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Contained_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.id (
       this,
       id
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 char * CORBA_Contained::name (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Contained_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.name (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_Contained::name (
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Contained_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.name (
       this,
       name
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 char * CORBA_Contained::version (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Contained_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.version (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_Contained::version (
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Contained_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.version (
       this,
       version
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_Container_ptr CORBA_Contained::defined_in (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Contained_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.defined_in (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 char * CORBA_Contained::absolute_name (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Contained_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.absolute_name (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_Repository_ptr CORBA_Contained::containing_repository (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Contained_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.containing_repository (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4590,19 +4590,19 @@ void CORBA_Contained::Description::_tao_any_destructor (void *_tao_void_pointer)
 }
 
 CORBA_Contained::Description * CORBA_Contained::describe (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Contained_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.describe (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4610,14 +4610,14 @@ void CORBA_Contained::move (
     CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Contained_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.move (
@@ -4625,7 +4625,7 @@ void CORBA_Contained::move (
       new_container,
       new_name,
       new_version
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4702,11 +4702,11 @@ void
 _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   CORBA_Contained **tmp = ACE_static_cast (CORBA_Contained**, target);
-  *tmp = CORBA_Contained::_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = CORBA_Contained::_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -4842,11 +4842,11 @@ void
 _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   CORBA_InterfaceDef **tmp = ACE_static_cast (CORBA_InterfaceDef**, target);
-  *tmp = tao_CORBA_InterfaceDef_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = tao_CORBA_InterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -4981,11 +4981,11 @@ void
 _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   CORBA_ValueDef **tmp = ACE_static_cast (CORBA_ValueDef**, target);
-  *tmp = tao_CORBA_ValueDef_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = tao_CORBA_ValueDef_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -5120,11 +5120,11 @@ void
 _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   CORBA_AbstractInterfaceDef **tmp = ACE_static_cast (CORBA_AbstractInterfaceDef**, target);
-  *tmp = tao_CORBA_AbstractInterfaceDef_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = tao_CORBA_AbstractInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -5259,11 +5259,11 @@ void
 _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   CORBA_LocalInterfaceDef **tmp = ACE_static_cast (CORBA_LocalInterfaceDef**, target);
-  *tmp = tao_CORBA_LocalInterfaceDef_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = tao_CORBA_LocalInterfaceDef_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -5706,10 +5706,10 @@ tao_CORBA_Container_nil (
 CORBA_Container_ptr
 tao_CORBA_Container_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_Container::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_Container::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5833,10 +5833,10 @@ CORBA_Container_var::tao_nil (void)
 ::CORBA_Container_ptr
 CORBA_Container_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_Container::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_Container::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5915,21 +5915,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * search_name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5947,19 +5947,19 @@ TAO_ClientRequestInfo_CORBA_Container_lookup::TAO_ClientRequestInfo_CORBA_Contai
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * search_name
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     search_name_ (search_name)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_lookup::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_lookup::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5975,12 +5975,12 @@ TAO_ClientRequestInfo_CORBA_Container_lookup::arguments (TAO_ENV_SINGLE_ARG_DECL
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_lookup::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_lookup::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -5988,13 +5988,13 @@ TAO_ClientRequestInfo_CORBA_Container_lookup::exceptions (TAO_ENV_SINGLE_ARG_DEC
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_lookup::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_lookup::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6018,21 +6018,21 @@ public:
       CORBA::Object_ptr _tao_target,
       CORBA::DefinitionKind & limit_type,
       const CORBA::Boolean & exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6052,7 +6052,7 @@ TAO_ClientRequestInfo_CORBA_Container_contents::TAO_ClientRequestInfo_CORBA_Cont
     CORBA::Object_ptr _tao_target,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     limit_type_ (limit_type),
@@ -6060,12 +6060,12 @@ TAO_ClientRequestInfo_CORBA_Container_contents::TAO_ClientRequestInfo_CORBA_Cont
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_contents::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_contents::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6084,12 +6084,12 @@ TAO_ClientRequestInfo_CORBA_Container_contents::arguments (TAO_ENV_SINGLE_ARG_DE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_contents::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6097,13 +6097,13 @@ TAO_ClientRequestInfo_CORBA_Container_contents::exceptions (TAO_ENV_SINGLE_ARG_D
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_contents::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_contents::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6129,21 +6129,21 @@ public:
       const CORBA::Long & levels_to_search,
       CORBA::DefinitionKind & limit_type,
       const CORBA::Boolean & exclude_inherited
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6167,7 +6167,7 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::TAO_ClientRequestInfo_CORBA_C
     const CORBA::Long & levels_to_search,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     search_name_ (search_name),
@@ -6177,12 +6177,12 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::TAO_ClientRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_lookup_name::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_lookup_name::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6207,12 +6207,12 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_lookup_name::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_lookup_name::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6220,13 +6220,13 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_lookup_name::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_lookup_name::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6251,21 +6251,21 @@ public:
       CORBA::DefinitionKind & limit_type,
       const CORBA::Boolean & exclude_inherited,
       const CORBA::Long & max_returned_objs
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6287,7 +6287,7 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::TAO_ClientRequestInfo_C
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited,
     const CORBA::Long & max_returned_objs
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     limit_type_ (limit_type),
@@ -6296,12 +6296,12 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::TAO_ClientRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_describe_contents::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_describe_contents::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6323,12 +6323,12 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::arguments (TAO_ENV_SING
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_describe_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_describe_contents::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6336,13 +6336,13 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::exceptions (TAO_ENV_SIN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_describe_contents::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_describe_contents::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6367,21 +6367,21 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6403,7 +6403,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::TAO_ClientRequestInfo_CORBA
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -6412,12 +6412,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::TAO_ClientRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_module::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_module::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6439,12 +6439,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_module::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_module::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6452,13 +6452,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_create_module::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_module::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6485,21 +6485,21 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6525,7 +6525,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::TAO_ClientRequestInfo_COR
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -6536,12 +6536,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::TAO_ClientRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_constant::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_constant::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6569,12 +6569,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_constant::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_constant::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6582,13 +6582,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_create_constant::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_constant::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6614,21 +6614,21 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6652,7 +6652,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::TAO_ClientRequestInfo_CORBA
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -6662,12 +6662,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::TAO_ClientRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_struct::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_struct::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6692,12 +6692,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_struct::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_struct::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6705,13 +6705,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_create_struct::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_struct::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6738,21 +6738,21 @@ public:
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6778,7 +6778,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::TAO_ClientRequestInfo_CORBA_
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -6789,12 +6789,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::TAO_ClientRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_union::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_union::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6822,12 +6822,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::arguments (TAO_ENV_SINGLE_AR
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_union::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_union::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6835,13 +6835,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::exceptions (TAO_ENV_SINGLE_A
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_create_union::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_union::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6867,21 +6867,21 @@ public:
       const char * name,
       const char * version,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6905,7 +6905,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::TAO_ClientRequestInfo_CORBA_C
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -6915,12 +6915,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::TAO_ClientRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_enum::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_enum::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6945,12 +6945,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_enum::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_enum::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6958,13 +6958,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_create_enum::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_enum::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6990,21 +6990,21 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -7028,7 +7028,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::TAO_ClientRequestInfo_CORBA_
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -7038,12 +7038,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::TAO_ClientRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_alias::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_alias::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -7068,12 +7068,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::arguments (TAO_ENV_SINGLE_AR
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_alias::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_alias::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -7081,13 +7081,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::exceptions (TAO_ENV_SINGLE_A
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_create_alias::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_alias::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -7113,21 +7113,21 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -7151,7 +7151,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::TAO_ClientRequestInfo_CO
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -7161,12 +7161,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::TAO_ClientRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_interface::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -7191,12 +7191,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::arguments (TAO_ENV_SINGL
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -7204,13 +7204,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::exceptions (TAO_ENV_SING
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_create_interface::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_interface::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -7242,21 +7242,21 @@ public:
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -7292,7 +7292,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::TAO_ClientRequestInfo_CORBA_
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -7308,12 +7308,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::TAO_ClientRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_value::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_value::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -7356,12 +7356,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::arguments (TAO_ENV_SINGLE_AR
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_value::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_value::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -7369,13 +7369,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::exceptions (TAO_ENV_SINGLE_A
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_create_value::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_value::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -7401,21 +7401,21 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -7439,7 +7439,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::TAO_ClientRequestInfo_CO
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -7449,12 +7449,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::TAO_ClientRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_value_box::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_value_box::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -7479,12 +7479,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::arguments (TAO_ENV_SINGL
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_value_box::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_value_box::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -7492,13 +7492,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::exceptions (TAO_ENV_SING
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -7524,21 +7524,21 @@ public:
       const char * name,
       const char * version,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -7562,7 +7562,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::TAO_ClientRequestInfo_CO
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -7572,12 +7572,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::TAO_ClientRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_exception::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_exception::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -7602,12 +7602,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::arguments (TAO_ENV_SINGL
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_exception::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_exception::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -7615,13 +7615,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::exceptions (TAO_ENV_SING
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_create_exception::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_exception::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -7646,21 +7646,21 @@ public:
       const char * id,
       const char * name,
       const char * version
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -7682,7 +7682,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::TAO_ClientRequestInfo_CORBA
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -7691,12 +7691,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::TAO_ClientRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_native::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_native::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -7718,12 +7718,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_native::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_native::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -7731,13 +7731,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_create_native::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_native::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -7763,21 +7763,21 @@ public:
       const char * name,
       const char * version,
       const CORBA_AbstractInterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -7801,7 +7801,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::TAO_ClientReque
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -7811,12 +7811,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::TAO_ClientReque
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -7841,12 +7841,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::arguments (TAO_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -7854,13 +7854,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::exceptions (TAO
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -7886,21 +7886,21 @@ public:
       const char * name,
       const char * version,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -7924,7 +7924,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::TAO_ClientRequestI
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -7934,12 +7934,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::TAO_ClientRequestI
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_local_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_local_interface::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -7964,12 +7964,12 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::arguments (TAO_ENV
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Container_create_local_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_local_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -7977,13 +7977,13 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::exceptions (TAO_EN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -8016,7 +8016,7 @@ _TAO_CORBA_Container_Remote_Proxy_Impl::_TAO_CORBA_Container_Remote_Proxy_Impl (
 CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
     CORBA_Object *_collocated_tao_target_,
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8060,7 +8060,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
         &_tao_call,
         _collocated_tao_target_,
         search_name
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8076,7 +8076,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8088,12 +8088,12 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -8107,7 +8107,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8124,7 +8124,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8152,7 +8152,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8162,12 +8162,12 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8178,7 +8178,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8196,7 +8196,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
     CORBA_Object *_collocated_tao_target_,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8242,7 +8242,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
         _collocated_tao_target_,
         limit_type,
         exclude_inherited
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8258,7 +8258,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8270,12 +8270,12 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -8290,7 +8290,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8307,7 +8307,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8335,7 +8335,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8345,12 +8345,12 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8361,7 +8361,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8381,7 +8381,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8429,7 +8429,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
         levels_to_search,
         limit_type,
         exclude_inherited
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8445,7 +8445,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8457,12 +8457,12 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -8479,7 +8479,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8496,7 +8496,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8524,7 +8524,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8534,12 +8534,12 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8550,7 +8550,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8569,7 +8569,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8616,7 +8616,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
         limit_type,
         exclude_inherited,
         max_returned_objs
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8632,7 +8632,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8644,12 +8644,12 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -8665,7 +8665,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8682,7 +8682,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8710,7 +8710,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8720,12 +8720,12 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8736,7 +8736,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::descri
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8755,7 +8755,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8801,7 +8801,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
         id,
         name,
         version
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8817,7 +8817,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8829,12 +8829,12 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -8850,7 +8850,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8867,7 +8867,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8895,7 +8895,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8905,12 +8905,12 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8921,7 +8921,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8942,7 +8942,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8990,7 +8990,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
         version,
         type,
         value
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -9006,7 +9006,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9018,12 +9018,12 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -9041,7 +9041,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -9058,7 +9058,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -9086,7 +9086,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9096,12 +9096,12 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9112,7 +9112,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -9132,7 +9132,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9179,7 +9179,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
         name,
         version,
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -9195,7 +9195,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9207,12 +9207,12 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -9229,7 +9229,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -9246,7 +9246,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -9274,7 +9274,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9284,12 +9284,12 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9300,7 +9300,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -9321,7 +9321,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9369,7 +9369,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
         version,
         discriminator_type,
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -9385,7 +9385,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9397,12 +9397,12 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -9420,7 +9420,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -9437,7 +9437,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -9465,7 +9465,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9475,12 +9475,12 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9491,7 +9491,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -9511,7 +9511,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9558,7 +9558,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
         name,
         version,
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -9574,7 +9574,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9586,12 +9586,12 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -9608,7 +9608,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -9625,7 +9625,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -9653,7 +9653,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9663,12 +9663,12 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9679,7 +9679,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -9699,7 +9699,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9746,7 +9746,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
         name,
         version,
         original_type
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -9762,7 +9762,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9774,12 +9774,12 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -9796,7 +9796,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -9813,7 +9813,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -9841,7 +9841,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9851,12 +9851,12 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9867,7 +9867,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -9887,7 +9887,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9934,7 +9934,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
         name,
         version,
         base_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -9950,7 +9950,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9962,12 +9962,12 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -9984,7 +9984,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10001,7 +10001,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10029,7 +10029,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10039,12 +10039,12 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10055,7 +10055,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -10081,7 +10081,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10134,7 +10134,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
         abstract_base_values,
         supported_interfaces,
         initializers
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -10150,7 +10150,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10162,12 +10162,12 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -10190,7 +10190,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10207,7 +10207,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10235,7 +10235,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10245,12 +10245,12 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10261,7 +10261,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -10281,7 +10281,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10328,7 +10328,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
         name,
         version,
         original_type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -10344,7 +10344,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10356,12 +10356,12 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -10378,7 +10378,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10395,7 +10395,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10423,7 +10423,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10433,12 +10433,12 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10449,7 +10449,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -10469,7 +10469,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10516,7 +10516,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
         name,
         version,
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -10532,7 +10532,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10544,12 +10544,12 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -10566,7 +10566,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10583,7 +10583,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10611,7 +10611,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10621,12 +10621,12 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10637,7 +10637,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -10656,7 +10656,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10702,7 +10702,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
         id,
         name,
         version
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -10718,7 +10718,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10730,12 +10730,12 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -10751,7 +10751,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10768,7 +10768,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10796,7 +10796,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10806,12 +10806,12 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10822,7 +10822,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -10842,7 +10842,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10889,7 +10889,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
         name,
         version,
         base_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -10905,7 +10905,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10917,12 +10917,12 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -10939,7 +10939,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10956,7 +10956,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10984,7 +10984,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10994,12 +10994,12 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11010,7 +11010,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_ab
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11030,7 +11030,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11077,7 +11077,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
         name,
         version,
         base_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -11093,7 +11093,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11105,12 +11105,12 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -11127,7 +11127,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11144,7 +11144,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11172,7 +11172,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11182,12 +11182,12 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11198,7 +11198,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11253,7 +11253,7 @@ _TAO_CORBA_Container_Remote_Proxy_Broker::~_TAO_CORBA_Container_Remote_Proxy_Bro
 _TAO_CORBA_Container_Proxy_Impl&
 _TAO_CORBA_Container_Remote_Proxy_Broker::select_proxy (
   ::CORBA_Container *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -11296,24 +11296,24 @@ void CORBA_Container::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_Container_ptr CORBA_Container::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_Container::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Container:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Container:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_Container::_nil ());
       if (is_a == 0)
         return CORBA_Container::_nil ();
     }
-  return CORBA_Container::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_Container::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_Container_ptr CORBA_Container::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -11368,7 +11368,7 @@ CORBA_Container::_duplicate (CORBA_Container_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
@@ -11376,7 +11376,7 @@ CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_Container::_tao_QueryInterface (ptr_arith_t type)
@@ -11414,41 +11414,41 @@ const char* CORBA_Container::_interface_repository_id (void) const
 
 CORBA_Contained_ptr CORBA_Container::lookup (
     const char * search_name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.lookup (
       this,
       search_name
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ContainedSeq * CORBA_Container::contents (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.contents (
       this,
       limit_type,
       exclude_inherited
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -11457,14 +11457,14 @@ CORBA_ContainedSeq * CORBA_Container::lookup_name (
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.lookup_name (
@@ -11473,7 +11473,7 @@ CORBA_ContainedSeq * CORBA_Container::lookup_name (
       levels_to_search,
       limit_type,
       exclude_inherited
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12006,14 +12006,14 @@ CORBA_Container::DescriptionSeq * CORBA_Container::describe_contents (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.describe_contents (
@@ -12021,7 +12021,7 @@ CORBA_Container::DescriptionSeq * CORBA_Container::describe_contents (
       limit_type,
       exclude_inherited,
       max_returned_objs
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12029,14 +12029,14 @@ CORBA_ModuleDef_ptr CORBA_Container::create_module (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_module (
@@ -12044,7 +12044,7 @@ CORBA_ModuleDef_ptr CORBA_Container::create_module (
       id,
       name,
       version
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12054,14 +12054,14 @@ CORBA_ConstantDef_ptr CORBA_Container::create_constant (
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_constant (
@@ -12071,7 +12071,7 @@ CORBA_ConstantDef_ptr CORBA_Container::create_constant (
       version,
       type,
       value
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12080,14 +12080,14 @@ CORBA_StructDef_ptr CORBA_Container::create_struct (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_struct (
@@ -12096,7 +12096,7 @@ CORBA_StructDef_ptr CORBA_Container::create_struct (
       name,
       version,
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12106,14 +12106,14 @@ CORBA_UnionDef_ptr CORBA_Container::create_union (
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_union (
@@ -12123,7 +12123,7 @@ CORBA_UnionDef_ptr CORBA_Container::create_union (
       version,
       discriminator_type,
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12132,14 +12132,14 @@ CORBA_EnumDef_ptr CORBA_Container::create_enum (
     const char * name,
     const char * version,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_enum (
@@ -12148,7 +12148,7 @@ CORBA_EnumDef_ptr CORBA_Container::create_enum (
       name,
       version,
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12157,14 +12157,14 @@ CORBA_AliasDef_ptr CORBA_Container::create_alias (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_alias (
@@ -12173,7 +12173,7 @@ CORBA_AliasDef_ptr CORBA_Container::create_alias (
       name,
       version,
       original_type
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12182,14 +12182,14 @@ CORBA_InterfaceDef_ptr CORBA_Container::create_interface (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_interface (
@@ -12198,7 +12198,7 @@ CORBA_InterfaceDef_ptr CORBA_Container::create_interface (
       name,
       version,
       base_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12213,14 +12213,14 @@ CORBA_ValueDef_ptr CORBA_Container::create_value (
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_value (
@@ -12235,7 +12235,7 @@ CORBA_ValueDef_ptr CORBA_Container::create_value (
       abstract_base_values,
       supported_interfaces,
       initializers
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12244,14 +12244,14 @@ CORBA_ValueBoxDef_ptr CORBA_Container::create_value_box (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_value_box (
@@ -12260,7 +12260,7 @@ CORBA_ValueBoxDef_ptr CORBA_Container::create_value_box (
       name,
       version,
       original_type_def
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12269,14 +12269,14 @@ CORBA_ExceptionDef_ptr CORBA_Container::create_exception (
     const char * name,
     const char * version,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_exception (
@@ -12285,7 +12285,7 @@ CORBA_ExceptionDef_ptr CORBA_Container::create_exception (
       name,
       version,
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12293,14 +12293,14 @@ CORBA_NativeDef_ptr CORBA_Container::create_native (
     const char * id,
     const char * name,
     const char * version
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_native (
@@ -12308,7 +12308,7 @@ CORBA_NativeDef_ptr CORBA_Container::create_native (
       id,
       name,
       version
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12317,14 +12317,14 @@ CORBA_AbstractInterfaceDef_ptr CORBA_Container::create_abstract_interface (
     const char * name,
     const char * version,
     const CORBA_AbstractInterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_abstract_interface (
@@ -12333,7 +12333,7 @@ CORBA_AbstractInterfaceDef_ptr CORBA_Container::create_abstract_interface (
       name,
       version,
       base_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12342,14 +12342,14 @@ CORBA_LocalInterfaceDef_ptr CORBA_Container::create_local_interface (
     const char * name,
     const char * version,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Container_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_local_interface (
@@ -12358,7 +12358,7 @@ CORBA_LocalInterfaceDef_ptr CORBA_Container::create_local_interface (
       name,
       version,
       base_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12389,10 +12389,10 @@ tao_CORBA_IDLType_nil (
 CORBA_IDLType_ptr
 tao_CORBA_IDLType_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_IDLType::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_IDLType::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -12516,10 +12516,10 @@ CORBA_IDLType_var::tao_nil (void)
 ::CORBA_IDLType_ptr
 CORBA_IDLType_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_IDLType::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_IDLType::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -12597,21 +12597,21 @@ public:
   TAO_ClientRequestInfo_CORBA_IDLType_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -12627,30 +12627,30 @@ private:
 TAO_ClientRequestInfo_CORBA_IDLType_type_get::TAO_ClientRequestInfo_CORBA_IDLType_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_IDLType_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_IDLType_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_IDLType_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_IDLType_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -12658,13 +12658,13 @@ TAO_ClientRequestInfo_CORBA_IDLType_type_get::exceptions (TAO_ENV_SINGLE_ARG_DEC
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_IDLType_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_IDLType_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12696,7 +12696,7 @@ _TAO_CORBA_IDLType_Remote_Proxy_Impl::_TAO_CORBA_IDLType_Remote_Proxy_Impl (void
 
 CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12739,7 +12739,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
       TAO_ClientRequestInfo_CORBA_IDLType_type_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -12755,7 +12755,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12767,17 +12767,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -12794,7 +12794,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12822,7 +12822,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12832,12 +12832,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -12848,7 +12848,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12903,7 +12903,7 @@ _TAO_CORBA_IDLType_Remote_Proxy_Broker::~_TAO_CORBA_IDLType_Remote_Proxy_Broker
 _TAO_CORBA_IDLType_Proxy_Impl&
 _TAO_CORBA_IDLType_Remote_Proxy_Broker::select_proxy (
   ::CORBA_IDLType *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -12946,24 +12946,24 @@ void CORBA_IDLType::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_IDLType_ptr CORBA_IDLType::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_IDLType::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IDLType:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IDLType:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
       if (is_a == 0)
         return CORBA_IDLType::_nil ();
     }
-  return CORBA_IDLType::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_IDLType::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_IDLType_ptr CORBA_IDLType::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -13018,7 +13018,7 @@ CORBA_IDLType::_duplicate (CORBA_IDLType_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
@@ -13026,7 +13026,7 @@ CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_IDLType::_tao_QueryInterface (ptr_arith_t type)
@@ -13063,19 +13063,19 @@ const char* CORBA_IDLType::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_IDLType::type (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_IDLType_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_IDLType_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_IDLType_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -13106,10 +13106,10 @@ tao_CORBA_TypedefDef_nil (
 CORBA_TypedefDef_ptr
 tao_CORBA_TypedefDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_TypedefDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_TypedefDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -13233,10 +13233,10 @@ CORBA_TypedefDef_var::tao_nil (void)
 ::CORBA_TypedefDef_ptr
 CORBA_TypedefDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_TypedefDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_TypedefDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -13363,7 +13363,7 @@ _TAO_CORBA_TypedefDef_Remote_Proxy_Broker::~_TAO_CORBA_TypedefDef_Remote_Proxy_B
 _TAO_CORBA_TypedefDef_Proxy_Impl&
 _TAO_CORBA_TypedefDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_TypedefDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -13408,24 +13408,24 @@ void CORBA_TypedefDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_TypedefDef_ptr CORBA_TypedefDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_TypedefDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/TypedefDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/TypedefDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_TypedefDef::_nil ());
       if (is_a == 0)
         return CORBA_TypedefDef::_nil ();
     }
-  return CORBA_TypedefDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_TypedefDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_TypedefDef_ptr CORBA_TypedefDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -13480,7 +13480,7 @@ CORBA_TypedefDef::_duplicate (CORBA_TypedefDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
@@ -13490,7 +13490,7 @@ CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DEC
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_TypedefDef::_tao_QueryInterface (ptr_arith_t type)
@@ -13573,7 +13573,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DefinitionKind &_
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_DefinitionKind TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_DefinitionKind ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -13619,7 +13619,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_IRObject_ptr &_tao
     _tao_elem = CORBA_IRObject::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_IRObject TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_IRObject ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -13680,7 +13680,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Contained_ptr &_ta
     _tao_elem = CORBA_Contained::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_Contained TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_Contained ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -13755,7 +13755,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Contained::D
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA_Contained::_tc_Description TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA_Contained::_tc_Description ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -13846,7 +13846,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ContainedSeq
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ContainedSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ContainedSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -13937,7 +13937,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDef
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -14028,7 +14028,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDefSeq
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -14119,7 +14119,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AbstractInte
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -14210,7 +14210,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_LocalInterfa
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -14293,7 +14293,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StructMember
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMember TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMember ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -14384,7 +14384,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StructMember
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMemberSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMemberSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -14467,7 +14467,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Initializer
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_Initializer TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_Initializer ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -14558,7 +14558,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InitializerS
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_InitializerSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_InitializerSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -14641,7 +14641,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_UnionMember
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMember TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMember ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -14732,7 +14732,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_UnionMemberS
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMemberSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMemberSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -14823,7 +14823,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_EnumMemberSe
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumMemberSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumMemberSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -14892,7 +14892,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Container_ptr &_ta
     _tao_elem = CORBA_Container::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_Container TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_Container ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -14967,7 +14967,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Container::D
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_Description TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_Description ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -15058,7 +15058,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Container::D
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_DescriptionSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_DescriptionSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -15127,7 +15127,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_IDLType_ptr &_tao_
     _tao_elem = CORBA_IDLType::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_IDLType TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_IDLType ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -15188,7 +15188,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_TypedefDef_ptr &_t
     _tao_elem = CORBA_TypedefDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_TypedefDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_TypedefDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -15263,7 +15263,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_TypeDescript
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_TypeDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_TypeDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -15332,7 +15332,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_IRObject::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -15368,7 +15368,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_Contained::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -15824,7 +15824,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_Container::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -15860,7 +15860,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_IDLType::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -15896,7 +15896,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_TypedefDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
index 2520f156782..7b59a5a133b 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ b/TAO/tao/IFR_Client/IFR_BaseC.h
@@ -94,7 +94,7 @@ public:
   static CORBA_IRObject_ptr tao_nil (void);
   static CORBA_IRObject_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -158,12 +158,12 @@ public:
 
   static CORBA_IRObject_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static CORBA_IRObject_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static CORBA_IRObject_ptr _nil (void)
@@ -174,14 +174,14 @@ public:
   static void _tao_any_destructor (void*);
 
   virtual CORBA::DefinitionKind def_kind (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -189,7 +189,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -239,7 +239,7 @@ public:
   virtual ~_TAO_CORBA_IRObject_Proxy_Impl (void) { }
   virtual CORBA::DefinitionKind def_kind (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -247,7 +247,7 @@ public:
 
   virtual void destroy (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -277,7 +277,7 @@ public:
   virtual ~_TAO_CORBA_IRObject_Remote_Proxy_Impl (void) { }
   virtual CORBA::DefinitionKind def_kind (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -285,7 +285,7 @@ public:
 
   virtual void destroy (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -314,7 +314,7 @@ public:
   virtual ~_TAO_CORBA_IRObject_Proxy_Broker (void);
   virtual _TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
       CORBA_IRObject *object
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) = 0;
 
 protected:
@@ -341,7 +341,7 @@ public:
 
   virtual _TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
       CORBA_IRObject *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -394,7 +394,7 @@ public:
     static CORBA_Repository_ptr tao_nil (void);
     static CORBA_Repository_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -473,7 +473,7 @@ public:
     static CORBA_Container_ptr tao_nil (void);
     static CORBA_Container_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -552,7 +552,7 @@ public:
     static CORBA_Contained_ptr tao_nil (void);
     static CORBA_Contained_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -616,12 +616,12 @@ public:
 
     static CORBA_Contained_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static CORBA_Contained_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static CORBA_Contained_ptr _nil (void)
@@ -632,7 +632,7 @@ public:
     static void _tao_any_destructor (void*);
 
     virtual char * id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -640,14 +640,14 @@ public:
 
     virtual void id (
         const char * id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual char * name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -655,14 +655,14 @@ public:
 
     virtual void name (
         const char * name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual char * version (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -670,28 +670,28 @@ public:
 
     virtual void version (
         const char * version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual CORBA_Container_ptr defined_in (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual char * absolute_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual CORBA_Repository_ptr containing_repository (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -765,7 +765,7 @@ public:
     static CORBA::TypeCode_ptr _tc_Description;
 
     virtual CORBA_Contained::Description * describe (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -775,7 +775,7 @@ public:
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -783,7 +783,7 @@ public:
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -833,7 +833,7 @@ public:
     virtual ~_TAO_CORBA_Contained_Proxy_Impl (void) { }
     virtual char * id (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -842,7 +842,7 @@ public:
     virtual void id (
         CORBA_Object *_collocated_tao_target_,
         const char * id
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -850,7 +850,7 @@ public:
 
     virtual char * name (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -859,7 +859,7 @@ public:
     virtual void name (
         CORBA_Object *_collocated_tao_target_,
         const char * name
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -867,7 +867,7 @@ public:
 
     virtual char * version (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -876,7 +876,7 @@ public:
     virtual void version (
         CORBA_Object *_collocated_tao_target_,
         const char * version
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -884,7 +884,7 @@ public:
 
     virtual CORBA_Container_ptr defined_in (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -892,7 +892,7 @@ public:
 
     virtual char * absolute_name (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -900,7 +900,7 @@ public:
 
     virtual CORBA_Repository_ptr containing_repository (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -908,7 +908,7 @@ public:
 
     virtual CORBA_Contained::Description * describe (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -919,7 +919,7 @@ public:
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -950,7 +950,7 @@ public:
     virtual ~_TAO_CORBA_Contained_Remote_Proxy_Impl (void) { }
     virtual char * id (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -959,7 +959,7 @@ public:
     virtual void id (
         CORBA_Object *_collocated_tao_target_,
         const char * id
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -967,7 +967,7 @@ public:
 
     virtual char * name (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -976,7 +976,7 @@ public:
     virtual void name (
         CORBA_Object *_collocated_tao_target_,
         const char * name
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -984,7 +984,7 @@ public:
 
     virtual char * version (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -993,7 +993,7 @@ public:
     virtual void version (
         CORBA_Object *_collocated_tao_target_,
         const char * version
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1001,7 +1001,7 @@ public:
 
     virtual CORBA_Container_ptr defined_in (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1009,7 +1009,7 @@ public:
 
     virtual char * absolute_name (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1017,7 +1017,7 @@ public:
 
     virtual CORBA_Repository_ptr containing_repository (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1025,7 +1025,7 @@ public:
 
     virtual CORBA_Contained::Description * describe (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1036,7 +1036,7 @@ public:
         CORBA_Container_ptr new_container,
         const char * new_name,
         const char * new_version
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1065,7 +1065,7 @@ public:
     virtual ~_TAO_CORBA_Contained_Proxy_Broker (void);
     virtual _TAO_CORBA_Contained_Proxy_Impl &select_proxy (
         CORBA_Contained *object
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
 
   protected:
@@ -1092,7 +1092,7 @@ public:
 
     virtual _TAO_CORBA_Contained_Proxy_Impl &select_proxy (
         CORBA_Contained *object
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     private:
@@ -1159,7 +1159,7 @@ public:
       virtual void _downcast (
           void* target,
           CORBA_Object *src
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
       virtual CORBA_Object* _upcast (void *src) const;
     };
@@ -1317,7 +1317,7 @@ public:
       static CORBA_ModuleDef_ptr tao_nil (void);
       static CORBA_ModuleDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1396,7 +1396,7 @@ public:
       static CORBA_ConstantDef_ptr tao_nil (void);
       static CORBA_ConstantDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1475,7 +1475,7 @@ public:
       static CORBA_IDLType_ptr tao_nil (void);
       static CORBA_IDLType_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1554,7 +1554,7 @@ public:
       static CORBA_StructDef_ptr tao_nil (void);
       static CORBA_StructDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1633,7 +1633,7 @@ public:
       static CORBA_UnionDef_ptr tao_nil (void);
       static CORBA_UnionDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1712,7 +1712,7 @@ public:
       static CORBA_EnumDef_ptr tao_nil (void);
       static CORBA_EnumDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1791,7 +1791,7 @@ public:
       static CORBA_AliasDef_ptr tao_nil (void);
       static CORBA_AliasDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1870,7 +1870,7 @@ public:
       static CORBA_InterfaceDef_ptr tao_nil (void);
       static CORBA_InterfaceDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1955,7 +1955,7 @@ public:
       virtual void _downcast (
           void* target,
           CORBA_Object *src
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
       virtual CORBA_Object* _upcast (void *src) const;
     };
@@ -2113,7 +2113,7 @@ public:
       static CORBA_ExceptionDef_ptr tao_nil (void);
       static CORBA_ExceptionDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -2192,7 +2192,7 @@ public:
       static CORBA_NativeDef_ptr tao_nil (void);
       static CORBA_NativeDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -2271,7 +2271,7 @@ public:
       static CORBA_ValueDef_ptr tao_nil (void);
       static CORBA_ValueDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -2356,7 +2356,7 @@ public:
       virtual void _downcast (
           void* target,
           CORBA_Object *src
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
       virtual CORBA_Object* _upcast (void *src) const;
     };
@@ -2514,7 +2514,7 @@ public:
       static CORBA_ValueBoxDef_ptr tao_nil (void);
       static CORBA_ValueBoxDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -2593,7 +2593,7 @@ public:
       static CORBA_AbstractInterfaceDef_ptr tao_nil (void);
       static CORBA_AbstractInterfaceDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -2678,7 +2678,7 @@ public:
       virtual void _downcast (
           void* target,
           CORBA_Object *src
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
       virtual CORBA_Object* _upcast (void *src) const;
     };
@@ -2836,7 +2836,7 @@ public:
       static CORBA_LocalInterfaceDef_ptr tao_nil (void);
       static CORBA_LocalInterfaceDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -2921,7 +2921,7 @@ public:
       virtual void _downcast (
           void* target,
           CORBA_Object *src
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
       virtual CORBA_Object* _upcast (void *src) const;
     };
@@ -3853,12 +3853,12 @@ public:
 
       static CORBA_Container_ptr _narrow (
           CORBA::Object_ptr obj
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
       static CORBA_Container_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
       static CORBA_Container_ptr _nil (void)
@@ -3870,7 +3870,7 @@ public:
 
       virtual CORBA_Contained_ptr lookup (
           const char * search_name
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -3879,7 +3879,7 @@ public:
       virtual CORBA_ContainedSeq * contents (
           CORBA::DefinitionKind limit_type,
           CORBA::Boolean exclude_inherited
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -3890,7 +3890,7 @@ public:
           CORBA::Long levels_to_search,
           CORBA::DefinitionKind limit_type,
           CORBA::Boolean exclude_inherited
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4131,7 +4131,7 @@ public:
           CORBA::DefinitionKind limit_type,
           CORBA::Boolean exclude_inherited,
           CORBA::Long max_returned_objs
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4141,7 +4141,7 @@ public:
           const char * id,
           const char * name,
           const char * version
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4153,7 +4153,7 @@ public:
           const char * version,
           CORBA_IDLType_ptr type,
           const CORBA::Any & value
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4164,7 +4164,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_StructMemberSeq & members
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4176,7 +4176,7 @@ public:
           const char * version,
           CORBA_IDLType_ptr discriminator_type,
           const CORBA_UnionMemberSeq & members
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4187,7 +4187,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_EnumMemberSeq & members
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4198,7 +4198,7 @@ public:
           const char * name,
           const char * version,
           CORBA_IDLType_ptr original_type
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4209,7 +4209,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_InterfaceDefSeq & base_interfaces
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4226,7 +4226,7 @@ public:
           const CORBA_ValueDefSeq & abstract_base_values,
           const CORBA_InterfaceDefSeq & supported_interfaces,
           const CORBA_InitializerSeq & initializers
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4237,7 +4237,7 @@ public:
           const char * name,
           const char * version,
           CORBA_IDLType_ptr original_type_def
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4248,7 +4248,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_StructMemberSeq & members
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4258,7 +4258,7 @@ public:
           const char * id,
           const char * name,
           const char * version
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4269,7 +4269,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_AbstractInterfaceDefSeq & base_interfaces
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4280,7 +4280,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_InterfaceDefSeq & base_interfaces
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4288,7 +4288,7 @@ public:
 
       virtual CORBA::Boolean _is_a (
           const CORBA::Char *type_id
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
       virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -4339,7 +4339,7 @@ public:
       virtual CORBA_Contained_ptr lookup (
           CORBA_Object *_collocated_tao_target_,
           const char * search_name
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4349,7 +4349,7 @@ public:
           CORBA_Object *_collocated_tao_target_,
           CORBA::DefinitionKind limit_type,
           CORBA::Boolean exclude_inherited
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4361,7 +4361,7 @@ public:
           CORBA::Long levels_to_search,
           CORBA::DefinitionKind limit_type,
           CORBA::Boolean exclude_inherited
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4372,7 +4372,7 @@ public:
           CORBA::DefinitionKind limit_type,
           CORBA::Boolean exclude_inherited,
           CORBA::Long max_returned_objs
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4383,7 +4383,7 @@ public:
           const char * id,
           const char * name,
           const char * version
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4396,7 +4396,7 @@ public:
           const char * version,
           CORBA_IDLType_ptr type,
           const CORBA::Any & value
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4408,7 +4408,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_StructMemberSeq & members
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4421,7 +4421,7 @@ public:
           const char * version,
           CORBA_IDLType_ptr discriminator_type,
           const CORBA_UnionMemberSeq & members
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4433,7 +4433,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_EnumMemberSeq & members
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4445,7 +4445,7 @@ public:
           const char * name,
           const char * version,
           CORBA_IDLType_ptr original_type
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4457,7 +4457,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_InterfaceDefSeq & base_interfaces
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4475,7 +4475,7 @@ public:
           const CORBA_ValueDefSeq & abstract_base_values,
           const CORBA_InterfaceDefSeq & supported_interfaces,
           const CORBA_InitializerSeq & initializers
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4487,7 +4487,7 @@ public:
           const char * name,
           const char * version,
           CORBA_IDLType_ptr original_type_def
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4499,7 +4499,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_StructMemberSeq & members
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4510,7 +4510,7 @@ public:
           const char * id,
           const char * name,
           const char * version
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4522,7 +4522,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_AbstractInterfaceDefSeq & base_interfaces
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4534,7 +4534,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_InterfaceDefSeq & base_interfaces
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4566,7 +4566,7 @@ public:
       virtual CORBA_Contained_ptr lookup (
           CORBA_Object *_collocated_tao_target_,
           const char * search_name
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4576,7 +4576,7 @@ public:
           CORBA_Object *_collocated_tao_target_,
           CORBA::DefinitionKind limit_type,
           CORBA::Boolean exclude_inherited
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4588,7 +4588,7 @@ public:
           CORBA::Long levels_to_search,
           CORBA::DefinitionKind limit_type,
           CORBA::Boolean exclude_inherited
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4599,7 +4599,7 @@ public:
           CORBA::DefinitionKind limit_type,
           CORBA::Boolean exclude_inherited,
           CORBA::Long max_returned_objs
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4610,7 +4610,7 @@ public:
           const char * id,
           const char * name,
           const char * version
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4623,7 +4623,7 @@ public:
           const char * version,
           CORBA_IDLType_ptr type,
           const CORBA::Any & value
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4635,7 +4635,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_StructMemberSeq & members
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4648,7 +4648,7 @@ public:
           const char * version,
           CORBA_IDLType_ptr discriminator_type,
           const CORBA_UnionMemberSeq & members
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4660,7 +4660,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_EnumMemberSeq & members
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4672,7 +4672,7 @@ public:
           const char * name,
           const char * version,
           CORBA_IDLType_ptr original_type
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4684,7 +4684,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_InterfaceDefSeq & base_interfaces
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4702,7 +4702,7 @@ public:
           const CORBA_ValueDefSeq & abstract_base_values,
           const CORBA_InterfaceDefSeq & supported_interfaces,
           const CORBA_InitializerSeq & initializers
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4714,7 +4714,7 @@ public:
           const char * name,
           const char * version,
           CORBA_IDLType_ptr original_type_def
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4726,7 +4726,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_StructMemberSeq & members
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4737,7 +4737,7 @@ public:
           const char * id,
           const char * name,
           const char * version
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4749,7 +4749,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_AbstractInterfaceDefSeq & base_interfaces
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4761,7 +4761,7 @@ public:
           const char * name,
           const char * version,
           const CORBA_InterfaceDefSeq & base_interfaces
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -4790,7 +4790,7 @@ public:
       virtual ~_TAO_CORBA_Container_Proxy_Broker (void);
       virtual _TAO_CORBA_Container_Proxy_Impl &select_proxy (
           CORBA_Container *object
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         ) = 0;
 
     protected:
@@ -4817,7 +4817,7 @@ public:
 
       virtual _TAO_CORBA_Container_Proxy_Impl &select_proxy (
           CORBA_Container *object
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         );
 
       private:
@@ -4862,12 +4862,12 @@ public:
 
         static CORBA_IDLType_ptr _narrow (
             CORBA::Object_ptr obj
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
         static CORBA_IDLType_ptr _unchecked_narrow (
             CORBA::Object_ptr obj
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
         static CORBA_IDLType_ptr _nil (void)
@@ -4878,7 +4878,7 @@ public:
         static void _tao_any_destructor (void*);
 
         virtual CORBA::TypeCode_ptr type (
-            TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+            ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -4886,7 +4886,7 @@ public:
 
         virtual CORBA::Boolean _is_a (
             const CORBA::Char *type_id
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
         virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -4936,7 +4936,7 @@ public:
         virtual ~_TAO_CORBA_IDLType_Proxy_Impl (void) { }
         virtual CORBA::TypeCode_ptr type (
             CORBA_Object *_collocated_tao_target_
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -4967,7 +4967,7 @@ public:
         virtual ~_TAO_CORBA_IDLType_Remote_Proxy_Impl (void) { }
         virtual CORBA::TypeCode_ptr type (
             CORBA_Object *_collocated_tao_target_
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -4996,7 +4996,7 @@ public:
         virtual ~_TAO_CORBA_IDLType_Proxy_Broker (void);
         virtual _TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
             CORBA_IDLType *object
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS
           ) = 0;
 
       protected:
@@ -5023,7 +5023,7 @@ public:
 
         virtual _TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
             CORBA_IDLType *object
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           );
 
         private:
@@ -5084,7 +5084,7 @@ public:
           static CORBA_TypedefDef_ptr tao_nil (void);
           static CORBA_TypedefDef_ptr tao_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           static CORBA::Object * tao_upcast (void *);
 
@@ -5149,12 +5149,12 @@ public:
 
           static CORBA_TypedefDef_ptr _narrow (
               CORBA::Object_ptr obj
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
           static CORBA_TypedefDef_ptr _unchecked_narrow (
               CORBA::Object_ptr obj
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
           static CORBA_TypedefDef_ptr _nil (void)
@@ -5166,7 +5166,7 @@ public:
 
           virtual CORBA::Boolean _is_a (
               const CORBA::Char *type_id
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
           virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -5262,7 +5262,7 @@ public:
           virtual ~_TAO_CORBA_TypedefDef_Proxy_Broker (void);
           virtual _TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
               CORBA_TypedefDef *object
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS
             ) = 0;
 
         protected:
@@ -5289,7 +5289,7 @@ public:
 
           virtual _TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
               CORBA_TypedefDef *object
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             );
 
           private:
@@ -5430,7 +5430,7 @@ public:
           CORBA_Repository_ptr
           tao_CORBA_Repository_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5459,7 +5459,7 @@ public:
           CORBA_ModuleDef_ptr
           tao_CORBA_ModuleDef_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5488,7 +5488,7 @@ public:
           CORBA_ConstantDef_ptr
           tao_CORBA_ConstantDef_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5517,7 +5517,7 @@ public:
           CORBA_StructDef_ptr
           tao_CORBA_StructDef_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5546,7 +5546,7 @@ public:
           CORBA_UnionDef_ptr
           tao_CORBA_UnionDef_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5575,7 +5575,7 @@ public:
           CORBA_EnumDef_ptr
           tao_CORBA_EnumDef_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5604,7 +5604,7 @@ public:
           CORBA_AliasDef_ptr
           tao_CORBA_AliasDef_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5633,7 +5633,7 @@ public:
           CORBA_InterfaceDef_ptr
           tao_CORBA_InterfaceDef_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5662,7 +5662,7 @@ public:
           CORBA_ExceptionDef_ptr
           tao_CORBA_ExceptionDef_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5691,7 +5691,7 @@ public:
           CORBA_NativeDef_ptr
           tao_CORBA_NativeDef_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5720,7 +5720,7 @@ public:
           CORBA_ValueDef_ptr
           tao_CORBA_ValueDef_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5749,7 +5749,7 @@ public:
           CORBA_ValueBoxDef_ptr
           tao_CORBA_ValueBoxDef_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5778,7 +5778,7 @@ public:
           CORBA_AbstractInterfaceDef_ptr
           tao_CORBA_AbstractInterfaceDef_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
@@ -5807,7 +5807,7 @@ public:
           CORBA_LocalInterfaceDef_ptr
           tao_CORBA_LocalInterfaceDef_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           TAO_IFR_Client_Export
           CORBA::Object *
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index 07df25f5cd4..3170fa9995a 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -67,10 +67,10 @@ tao_CORBA_Repository_nil (
 CORBA_Repository_ptr
 tao_CORBA_Repository_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_Repository::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_Repository::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -194,10 +194,10 @@ CORBA_Repository_var::tao_nil (void)
 ::CORBA_Repository_ptr
 CORBA_Repository_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_Repository::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_Repository::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -276,21 +276,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * search_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -308,19 +308,19 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::TAO_ClientRequestInfo_CORBA_Re
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * search_id
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     search_id_ (search_id)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_lookup_id::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_lookup_id::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -336,12 +336,12 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::arguments (TAO_ENV_SINGLE_ARG_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_lookup_id::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_lookup_id::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -349,13 +349,13 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::exceptions (TAO_ENV_SINGLE_ARG
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -378,21 +378,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::TypeCode_ptr tc
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -410,19 +410,19 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ClientRequest
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA::TypeCode_ptr tc
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     tc_ (tc)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -438,12 +438,12 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (TAO_EN
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -451,13 +451,13 @@ TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (TAO_E
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_get_canonical_typecode::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -480,21 +480,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::PrimitiveKind & kind
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -512,19 +512,19 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::TAO_ClientRequestInfo_CORB
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA::PrimitiveKind & kind
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     kind_ (kind)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_get_primitive::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_get_primitive::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -540,12 +540,12 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::arguments (TAO_ENV_SINGLE_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_get_primitive::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_get_primitive::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -553,13 +553,13 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::exceptions (TAO_ENV_SINGLE
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -582,21 +582,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -614,19 +614,19 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::TAO_ClientRequestInfo_CORB
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     bound_ (bound)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_create_string::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_string::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -642,12 +642,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::arguments (TAO_ENV_SINGLE_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_create_string::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_string::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -655,13 +655,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::exceptions (TAO_ENV_SINGLE
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_create_string::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_string::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -684,21 +684,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -716,19 +716,19 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::TAO_ClientRequestInfo_COR
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     bound_ (bound)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_create_wstring::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_wstring::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -744,12 +744,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_create_wstring::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_wstring::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -757,13 +757,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -787,21 +787,21 @@ public:
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -821,7 +821,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::TAO_ClientRequestInfo_CO
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     bound_ (bound),
@@ -829,12 +829,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::TAO_ClientRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_create_sequence::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_sequence::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -853,12 +853,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::arguments (TAO_ENV_SINGL
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_create_sequence::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_sequence::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -866,13 +866,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::exceptions (TAO_ENV_SING
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -896,21 +896,21 @@ public:
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & length,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -930,7 +930,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::TAO_ClientRequestInfo_CORBA
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & length,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     length_ (length),
@@ -938,12 +938,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::TAO_ClientRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_create_array::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_array::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -962,12 +962,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_create_array::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_array::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -975,13 +975,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_create_array::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_array::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1005,21 +1005,21 @@ public:
       CORBA::Object_ptr _tao_target,
       const CORBA::UShort & digits,
       const CORBA::Short & scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1039,7 +1039,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::TAO_ClientRequestInfo_CORBA
     CORBA::Object_ptr _tao_target,
     const CORBA::UShort & digits,
     const CORBA::Short & scale
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     digits_ (digits),
@@ -1047,12 +1047,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::TAO_ClientRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Repository_create_fixed::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_fixed::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1071,12 +1071,12 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Repository_create_fixed::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_fixed::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -1084,13 +1084,13 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1123,7 +1123,7 @@ _TAO_CORBA_Repository_Remote_Proxy_Impl::_TAO_CORBA_Repository_Remote_Proxy_Impl
 CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
     CORBA_Object *_collocated_tao_target_,
     const char * search_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1167,7 +1167,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
         &_tao_call,
         _collocated_tao_target_,
         search_id
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -1183,7 +1183,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1195,12 +1195,12 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -1214,7 +1214,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1231,7 +1231,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1259,7 +1259,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1269,12 +1269,12 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1285,7 +1285,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1302,7 +1302,7 @@ return _tao_safe_retval._retn ();
 CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typecode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::TypeCode_ptr tc
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1346,7 +1346,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
         &_tao_call,
         _collocated_tao_target_,
         tc
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -1362,7 +1362,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1374,12 +1374,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -1393,7 +1393,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1410,7 +1410,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1438,7 +1438,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1448,12 +1448,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1464,7 +1464,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1481,7 +1481,7 @@ return _tao_safe_retval._retn ();
 CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
     CORBA_Object *_collocated_tao_target_,
     CORBA::PrimitiveKind kind
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1525,7 +1525,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
         &_tao_call,
         _collocated_tao_target_,
         kind
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -1541,7 +1541,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1553,12 +1553,12 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -1572,7 +1572,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1589,7 +1589,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1617,7 +1617,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1627,12 +1627,12 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1643,7 +1643,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1660,7 +1660,7 @@ return _tao_safe_retval._retn ();
 CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1704,7 +1704,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
         &_tao_call,
         _collocated_tao_target_,
         bound
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -1720,7 +1720,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1732,12 +1732,12 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -1751,7 +1751,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1768,7 +1768,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1796,7 +1796,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1806,12 +1806,12 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1822,7 +1822,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1839,7 +1839,7 @@ return _tao_safe_retval._retn ();
 CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1883,7 +1883,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
         &_tao_call,
         _collocated_tao_target_,
         bound
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -1899,7 +1899,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1911,12 +1911,12 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -1930,7 +1930,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1947,7 +1947,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1975,7 +1975,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1985,12 +1985,12 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2001,7 +2001,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2019,7 +2019,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2064,7 +2064,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
         _collocated_tao_target_,
         bound,
         element_type
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2080,7 +2080,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2092,12 +2092,12 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -2112,7 +2112,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2129,7 +2129,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2157,7 +2157,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2167,12 +2167,12 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2183,7 +2183,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2201,7 +2201,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong length,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2246,7 +2246,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
         _collocated_tao_target_,
         length,
         element_type
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2262,7 +2262,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2274,12 +2274,12 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -2294,7 +2294,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2311,7 +2311,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2339,7 +2339,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2349,12 +2349,12 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2365,7 +2365,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2383,7 +2383,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
     CORBA_Object *_collocated_tao_target_,
     CORBA::UShort digits,
     CORBA::Short scale
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2428,7 +2428,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
         _collocated_tao_target_,
         digits,
         scale
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2444,7 +2444,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2456,12 +2456,12 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -2476,7 +2476,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2493,7 +2493,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2521,7 +2521,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2531,12 +2531,12 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2547,7 +2547,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2602,7 +2602,7 @@ _TAO_CORBA_Repository_Remote_Proxy_Broker::~_TAO_CORBA_Repository_Remote_Proxy_B
 _TAO_CORBA_Repository_Proxy_Impl&
 _TAO_CORBA_Repository_Remote_Proxy_Broker::select_proxy (
   ::CORBA_Repository *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -2645,24 +2645,24 @@ void CORBA_Repository::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_Repository_ptr CORBA_Repository::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_Repository::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Repository:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Repository:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_Repository::_nil ());
       if (is_a == 0)
         return CORBA_Repository::_nil ();
     }
-  return CORBA_Repository::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_Repository::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_Repository_ptr CORBA_Repository::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2717,7 +2717,7 @@ CORBA_Repository::_duplicate (CORBA_Repository_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_Repository::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_Repository::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) ||
@@ -2726,7 +2726,7 @@ CORBA::Boolean CORBA_Repository::_is_a (const CORBA::Char *value TAO_ENV_ARG_DEC
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_Repository::_tao_QueryInterface (ptr_arith_t type)
@@ -2776,159 +2776,159 @@ const char* CORBA_Repository::_interface_repository_id (void) const
 
 CORBA_Contained_ptr CORBA_Repository::lookup_id (
     const char * search_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.lookup_id (
       this,
       search_id
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::TypeCode_ptr CORBA_Repository::get_canonical_typecode (
     CORBA::TypeCode_ptr tc
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.get_canonical_typecode (
       this,
       tc
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_PrimitiveDef_ptr CORBA_Repository::get_primitive (
     CORBA::PrimitiveKind kind
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.get_primitive (
       this,
       kind
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_StringDef_ptr CORBA_Repository::create_string (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_string (
       this,
       bound
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_WstringDef_ptr CORBA_Repository::create_wstring (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_wstring (
       this,
       bound
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_SequenceDef_ptr CORBA_Repository::create_sequence (
     CORBA::ULong bound,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_sequence (
       this,
       bound,
       element_type
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ArrayDef_ptr CORBA_Repository::create_array (
     CORBA::ULong length,
     CORBA_IDLType_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_array (
       this,
       length,
       element_type
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_FixedDef_ptr CORBA_Repository::create_fixed (
     CORBA::UShort digits,
     CORBA::Short scale
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_Repository_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_fixed (
       this,
       digits,
       scale
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2959,10 +2959,10 @@ tao_CORBA_ModuleDef_nil (
 CORBA_ModuleDef_ptr
 tao_CORBA_ModuleDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_ModuleDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_ModuleDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3086,10 +3086,10 @@ CORBA_ModuleDef_var::tao_nil (void)
 ::CORBA_ModuleDef_ptr
 CORBA_ModuleDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ModuleDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_ModuleDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3216,7 +3216,7 @@ _TAO_CORBA_ModuleDef_Remote_Proxy_Broker::~_TAO_CORBA_ModuleDef_Remote_Proxy_Bro
 _TAO_CORBA_ModuleDef_Proxy_Impl&
 _TAO_CORBA_ModuleDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ModuleDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -3261,24 +3261,24 @@ void CORBA_ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_ModuleDef_ptr CORBA_ModuleDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ModuleDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ModuleDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ModuleDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ());
       if (is_a == 0)
         return CORBA_ModuleDef::_nil ();
     }
-  return CORBA_ModuleDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_ModuleDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ModuleDef_ptr CORBA_ModuleDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3333,7 +3333,7 @@ CORBA_ModuleDef::_duplicate (CORBA_ModuleDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ModuleDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_ModuleDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ModuleDef:1.0")) ||
@@ -3343,7 +3343,7 @@ CORBA::Boolean CORBA_ModuleDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ModuleDef::_tao_QueryInterface (ptr_arith_t type)
@@ -3436,10 +3436,10 @@ tao_CORBA_ConstantDef_nil (
 CORBA_ConstantDef_ptr
 tao_CORBA_ConstantDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_ConstantDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_ConstantDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3563,10 +3563,10 @@ CORBA_ConstantDef_var::tao_nil (void)
 ::CORBA_ConstantDef_ptr
 CORBA_ConstantDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ConstantDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_ConstantDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3644,21 +3644,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ConstantDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3674,30 +3674,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::TAO_ClientRequestInfo_CORBA_ConstantDef_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -3705,13 +3705,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::exceptions (TAO_ENV_SINGLE_ARG
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3733,21 +3733,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3763,30 +3763,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -3794,13 +3794,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (TAO_ENV_SINGLE
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3823,21 +3823,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3853,19 +3853,19 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ClientRequestInfo_CORB
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     type_def_ (type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3881,12 +3881,12 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::arguments (TAO_ENV_SINGLE_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -3894,13 +3894,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (TAO_ENV_SINGLE
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3912,21 +3912,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ConstantDef_value_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3942,30 +3942,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::TAO_ClientRequestInfo_CORBA_ConstantDef_value_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -3973,13 +3973,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_value_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4002,21 +4002,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Any & value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4032,19 +4032,19 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::TAO_ClientRequestInfo_CORBA_C
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     value_ (value)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4060,12 +4060,12 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4073,13 +4073,13 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4101,7 +4101,7 @@ _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::_TAO_CORBA_ConstantDef_Remote_Proxy_Im
 
 CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4144,7 +4144,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
       TAO_ClientRequestInfo_CORBA_ConstantDef_type_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -4160,7 +4160,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4172,17 +4172,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4199,7 +4199,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4227,7 +4227,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4237,12 +4237,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4253,7 +4253,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4269,7 +4269,7 @@ return _tao_safe_retval._retn ();
 
 CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4312,7 +4312,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
       TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -4328,7 +4328,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4340,17 +4340,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4367,7 +4367,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4395,7 +4395,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4405,12 +4405,12 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4421,7 +4421,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4438,7 +4438,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4481,7 +4481,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
         &_tao_call,
         _collocated_tao_target_,
         type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -4497,7 +4497,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4509,12 +4509,12 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -4527,7 +4527,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4543,7 +4543,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4557,7 +4557,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4567,12 +4567,12 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4583,7 +4583,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4599,7 +4599,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
 
 CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4643,7 +4643,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
       TAO_ClientRequestInfo_CORBA_ConstantDef_value_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -4659,7 +4659,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4671,17 +4671,17 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4698,7 +4698,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4726,7 +4726,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4736,12 +4736,12 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4752,7 +4752,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4769,7 +4769,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
     CORBA_Object *_collocated_tao_target_,
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4812,7 +4812,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
         &_tao_call,
         _collocated_tao_target_,
         value
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -4828,7 +4828,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4840,12 +4840,12 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -4858,7 +4858,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4874,7 +4874,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4888,7 +4888,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4898,12 +4898,12 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4914,7 +4914,7 @@ void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4969,7 +4969,7 @@ _TAO_CORBA_ConstantDef_Remote_Proxy_Broker::~_TAO_CORBA_ConstantDef_Remote_Proxy
 _TAO_CORBA_ConstantDef_Proxy_Impl&
 _TAO_CORBA_ConstantDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ConstantDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -5012,24 +5012,24 @@ void CORBA_ConstantDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_ConstantDef_ptr CORBA_ConstantDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ConstantDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstantDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstantDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
       if (is_a == 0)
         return CORBA_ConstantDef::_nil ();
     }
-  return CORBA_ConstantDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_ConstantDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ConstantDef_ptr CORBA_ConstantDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -5084,7 +5084,7 @@ CORBA_ConstantDef::_duplicate (CORBA_ConstantDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ConstantDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_ConstantDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstantDef:1.0")) ||
@@ -5093,7 +5093,7 @@ CORBA::Boolean CORBA_ConstantDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DE
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ConstantDef::_tao_QueryInterface (ptr_arith_t type)
@@ -5142,91 +5142,91 @@ const char* CORBA_ConstantDef::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_ConstantDef::type (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_ConstantDef::type_def (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type_def (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ConstantDef::type_def (
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.type_def (
       this,
       type_def
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Any * CORBA_ConstantDef::value (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.value (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ConstantDef::value (
     const CORBA::Any & value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ConstantDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.value (
       this,
       value
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5263,10 +5263,10 @@ tao_CORBA_StructDef_nil (
 CORBA_StructDef_ptr
 tao_CORBA_StructDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_StructDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_StructDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5390,10 +5390,10 @@ CORBA_StructDef_var::tao_nil (void)
 ::CORBA_StructDef_ptr
 CORBA_StructDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_StructDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_StructDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5471,21 +5471,21 @@ public:
   TAO_ClientRequestInfo_CORBA_StructDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5501,30 +5501,30 @@ private:
 TAO_ClientRequestInfo_CORBA_StructDef_members_get::TAO_ClientRequestInfo_CORBA_StructDef_members_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_StructDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_StructDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_StructDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_StructDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -5532,13 +5532,13 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_get::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5561,21 +5561,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5591,19 +5591,19 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::TAO_ClientRequestInfo_CORBA_S
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     members_ (members)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_StructDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_StructDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5619,12 +5619,12 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_StructDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_StructDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -5632,13 +5632,13 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_StructDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_StructDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -5660,7 +5660,7 @@ _TAO_CORBA_StructDef_Remote_Proxy_Impl::_TAO_CORBA_StructDef_Remote_Proxy_Impl (
 
 CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5704,7 +5704,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
       TAO_ClientRequestInfo_CORBA_StructDef_members_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -5720,7 +5720,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5732,17 +5732,17 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -5759,7 +5759,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -5787,7 +5787,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5797,12 +5797,12 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -5813,7 +5813,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -5830,7 +5830,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5873,7 +5873,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
         &_tao_call,
         _collocated_tao_target_,
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -5889,7 +5889,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5901,12 +5901,12 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -5919,7 +5919,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -5935,7 +5935,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -5949,7 +5949,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5959,12 +5959,12 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -5975,7 +5975,7 @@ void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6030,7 +6030,7 @@ _TAO_CORBA_StructDef_Remote_Proxy_Broker::~_TAO_CORBA_StructDef_Remote_Proxy_Bro
 _TAO_CORBA_StructDef_Proxy_Impl&
 _TAO_CORBA_StructDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_StructDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -6075,24 +6075,24 @@ void CORBA_StructDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_StructDef_ptr CORBA_StructDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_StructDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StructDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StructDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
       if (is_a == 0)
         return CORBA_StructDef::_nil ();
     }
-  return CORBA_StructDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_StructDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructDef_ptr CORBA_StructDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -6147,7 +6147,7 @@ CORBA_StructDef::_duplicate (CORBA_StructDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_StructDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_StructDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StructDef:1.0")) ||
@@ -6159,7 +6159,7 @@ CORBA::Boolean CORBA_StructDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_StructDef::_tao_QueryInterface (ptr_arith_t type)
@@ -6244,38 +6244,38 @@ const char* CORBA_StructDef::_interface_repository_id (void) const
 }
 
 CORBA_StructMemberSeq * CORBA_StructDef::members (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_StructDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.members (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_StructDef::members (
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_StructDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.members (
       this,
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6306,10 +6306,10 @@ tao_CORBA_UnionDef_nil (
 CORBA_UnionDef_ptr
 tao_CORBA_UnionDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_UnionDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_UnionDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -6433,10 +6433,10 @@ CORBA_UnionDef_var::tao_nil (void)
 ::CORBA_UnionDef_ptr
 CORBA_UnionDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_UnionDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_UnionDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -6514,21 +6514,21 @@ public:
   TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6544,30 +6544,30 @@ private:
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6575,13 +6575,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (TAO_ENV
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6603,21 +6603,21 @@ public:
   TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6633,30 +6633,30 @@ private:
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6664,13 +6664,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (TAO
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6693,21 +6693,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr discriminator_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6723,19 +6723,19 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ClientReque
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr discriminator_type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     discriminator_type_def_ (discriminator_type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6751,12 +6751,12 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (TAO_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6764,13 +6764,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (TAO
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -6782,21 +6782,21 @@ public:
   TAO_ClientRequestInfo_CORBA_UnionDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6812,30 +6812,30 @@ private:
 TAO_ClientRequestInfo_CORBA_UnionDef_members_get::TAO_ClientRequestInfo_CORBA_UnionDef_members_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_UnionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_UnionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6843,13 +6843,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6872,21 +6872,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6902,19 +6902,19 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::TAO_ClientRequestInfo_CORBA_Un
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     members_ (members)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_UnionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6930,12 +6930,12 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_UnionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6943,13 +6943,13 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_UnionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_UnionDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -6971,7 +6971,7 @@ _TAO_CORBA_UnionDef_Remote_Proxy_Impl::_TAO_CORBA_UnionDef_Remote_Proxy_Impl (vo
 
 CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7014,7 +7014,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
       TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -7030,7 +7030,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7042,17 +7042,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7069,7 +7069,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7097,7 +7097,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7107,12 +7107,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7123,7 +7123,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7139,7 +7139,7 @@ return _tao_safe_retval._retn ();
 
 CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7182,7 +7182,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
       TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -7198,7 +7198,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7210,17 +7210,17 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7237,7 +7237,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7265,7 +7265,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7275,12 +7275,12 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7291,7 +7291,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7308,7 +7308,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr discriminator_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7351,7 +7351,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
         &_tao_call,
         _collocated_tao_target_,
         discriminator_type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -7367,7 +7367,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7379,12 +7379,12 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -7397,7 +7397,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7413,7 +7413,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7427,7 +7427,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7437,12 +7437,12 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7453,7 +7453,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7469,7 +7469,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
 
 CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7513,7 +7513,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
       TAO_ClientRequestInfo_CORBA_UnionDef_members_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -7529,7 +7529,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7541,17 +7541,17 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7568,7 +7568,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7596,7 +7596,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7606,12 +7606,12 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7622,7 +7622,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7639,7 +7639,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7682,7 +7682,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
         &_tao_call,
         _collocated_tao_target_,
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -7698,7 +7698,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7710,12 +7710,12 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -7728,7 +7728,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7744,7 +7744,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7758,7 +7758,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7768,12 +7768,12 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7784,7 +7784,7 @@ void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7839,7 +7839,7 @@ _TAO_CORBA_UnionDef_Remote_Proxy_Broker::~_TAO_CORBA_UnionDef_Remote_Proxy_Broke
 _TAO_CORBA_UnionDef_Proxy_Impl&
 _TAO_CORBA_UnionDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_UnionDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -7884,24 +7884,24 @@ void CORBA_UnionDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_UnionDef_ptr CORBA_UnionDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_UnionDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/UnionDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/UnionDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
       if (is_a == 0)
         return CORBA_UnionDef::_nil ();
     }
-  return CORBA_UnionDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_UnionDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_UnionDef_ptr CORBA_UnionDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -7956,7 +7956,7 @@ CORBA_UnionDef::_duplicate (CORBA_UnionDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_UnionDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_UnionDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/UnionDef:1.0")) ||
@@ -7968,7 +7968,7 @@ CORBA::Boolean CORBA_UnionDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_UnionDef::_tao_QueryInterface (ptr_arith_t type)
@@ -8053,91 +8053,91 @@ const char* CORBA_UnionDef::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_UnionDef::discriminator_type (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.discriminator_type (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_UnionDef::discriminator_type_def (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.discriminator_type_def (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_UnionDef::discriminator_type_def (
     CORBA_IDLType_ptr discriminator_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.discriminator_type_def (
       this,
       discriminator_type_def
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_UnionMemberSeq * CORBA_UnionDef::members (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.members (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_UnionDef::members (
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_UnionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.members (
       this,
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -8168,10 +8168,10 @@ tao_CORBA_EnumDef_nil (
 CORBA_EnumDef_ptr
 tao_CORBA_EnumDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_EnumDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_EnumDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -8295,10 +8295,10 @@ CORBA_EnumDef_var::tao_nil (void)
 ::CORBA_EnumDef_ptr
 CORBA_EnumDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_EnumDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_EnumDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -8376,21 +8376,21 @@ public:
   TAO_ClientRequestInfo_CORBA_EnumDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -8406,30 +8406,30 @@ private:
 TAO_ClientRequestInfo_CORBA_EnumDef_members_get::TAO_ClientRequestInfo_CORBA_EnumDef_members_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_EnumDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_EnumDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_EnumDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_EnumDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -8437,13 +8437,13 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -8466,21 +8466,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -8496,19 +8496,19 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::TAO_ClientRequestInfo_CORBA_Enu
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     members_ (members)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_EnumDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_EnumDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -8524,12 +8524,12 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::arguments (TAO_ENV_SINGLE_ARG_D
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_EnumDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_EnumDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -8537,13 +8537,13 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_EnumDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_EnumDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -8565,7 +8565,7 @@ _TAO_CORBA_EnumDef_Remote_Proxy_Impl::_TAO_CORBA_EnumDef_Remote_Proxy_Impl (void
 
 CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8609,7 +8609,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
       TAO_ClientRequestInfo_CORBA_EnumDef_members_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8625,7 +8625,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8637,17 +8637,17 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8664,7 +8664,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8692,7 +8692,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8702,12 +8702,12 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8718,7 +8718,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8735,7 +8735,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8778,7 +8778,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
         &_tao_call,
         _collocated_tao_target_,
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -8794,7 +8794,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8806,12 +8806,12 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -8824,7 +8824,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8840,7 +8840,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8854,7 +8854,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8864,12 +8864,12 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8880,7 +8880,7 @@ void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8935,7 +8935,7 @@ _TAO_CORBA_EnumDef_Remote_Proxy_Broker::~_TAO_CORBA_EnumDef_Remote_Proxy_Broker
 _TAO_CORBA_EnumDef_Proxy_Impl&
 _TAO_CORBA_EnumDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_EnumDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -8978,24 +8978,24 @@ void CORBA_EnumDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_EnumDef_ptr CORBA_EnumDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_EnumDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/EnumDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/EnumDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
       if (is_a == 0)
         return CORBA_EnumDef::_nil ();
     }
-  return CORBA_EnumDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_EnumDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_EnumDef_ptr CORBA_EnumDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -9050,7 +9050,7 @@ CORBA_EnumDef::_duplicate (CORBA_EnumDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_EnumDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_EnumDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/EnumDef:1.0")) ||
@@ -9061,7 +9061,7 @@ CORBA::Boolean CORBA_EnumDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_EnumDef::_tao_QueryInterface (ptr_arith_t type)
@@ -9134,38 +9134,38 @@ const char* CORBA_EnumDef::_interface_repository_id (void) const
 }
 
 CORBA_EnumMemberSeq * CORBA_EnumDef::members (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_EnumDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.members (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_EnumDef::members (
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_EnumDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.members (
       this,
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -9196,10 +9196,10 @@ tao_CORBA_AliasDef_nil (
 CORBA_AliasDef_ptr
 tao_CORBA_AliasDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_AliasDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_AliasDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -9323,10 +9323,10 @@ CORBA_AliasDef_var::tao_nil (void)
 ::CORBA_AliasDef_ptr
 CORBA_AliasDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_AliasDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_AliasDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -9404,21 +9404,21 @@ public:
   TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -9434,30 +9434,30 @@ private:
 TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -9465,13 +9465,13 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (TAO_ENV_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9494,21 +9494,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -9524,19 +9524,19 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ClientRequestInf
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     original_type_def_ (original_type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -9552,12 +9552,12 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (TAO_ENV_S
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -9565,13 +9565,13 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (TAO_ENV_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -9593,7 +9593,7 @@ _TAO_CORBA_AliasDef_Remote_Proxy_Impl::_TAO_CORBA_AliasDef_Remote_Proxy_Impl (vo
 
 CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9636,7 +9636,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
       TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -9652,7 +9652,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9664,17 +9664,17 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -9691,7 +9691,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -9719,7 +9719,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9729,12 +9729,12 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9745,7 +9745,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -9762,7 +9762,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9805,7 +9805,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
         &_tao_call,
         _collocated_tao_target_,
         original_type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -9821,7 +9821,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9833,12 +9833,12 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -9851,7 +9851,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -9867,7 +9867,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -9881,7 +9881,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -9891,12 +9891,12 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9907,7 +9907,7 @@ void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -9962,7 +9962,7 @@ _TAO_CORBA_AliasDef_Remote_Proxy_Broker::~_TAO_CORBA_AliasDef_Remote_Proxy_Broke
 _TAO_CORBA_AliasDef_Proxy_Impl&
 _TAO_CORBA_AliasDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_AliasDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -10005,24 +10005,24 @@ void CORBA_AliasDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_AliasDef_ptr CORBA_AliasDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_AliasDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AliasDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AliasDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
       if (is_a == 0)
         return CORBA_AliasDef::_nil ();
     }
-  return CORBA_AliasDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_AliasDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_AliasDef_ptr CORBA_AliasDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -10077,7 +10077,7 @@ CORBA_AliasDef::_duplicate (CORBA_AliasDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_AliasDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_AliasDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AliasDef:1.0")) ||
@@ -10088,7 +10088,7 @@ CORBA::Boolean CORBA_AliasDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_AliasDef::_tao_QueryInterface (ptr_arith_t type)
@@ -10161,38 +10161,38 @@ const char* CORBA_AliasDef::_interface_repository_id (void) const
 }
 
 CORBA_IDLType_ptr CORBA_AliasDef::original_type_def (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_AliasDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.original_type_def (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_AliasDef::original_type_def (
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_AliasDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.original_type_def (
       this,
       original_type_def
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -10223,10 +10223,10 @@ tao_CORBA_NativeDef_nil (
 CORBA_NativeDef_ptr
 tao_CORBA_NativeDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_NativeDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_NativeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -10350,10 +10350,10 @@ CORBA_NativeDef_var::tao_nil (void)
 ::CORBA_NativeDef_ptr
 CORBA_NativeDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_NativeDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_NativeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -10480,7 +10480,7 @@ _TAO_CORBA_NativeDef_Remote_Proxy_Broker::~_TAO_CORBA_NativeDef_Remote_Proxy_Bro
 _TAO_CORBA_NativeDef_Proxy_Impl&
 _TAO_CORBA_NativeDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_NativeDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -10523,24 +10523,24 @@ void CORBA_NativeDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_NativeDef_ptr CORBA_NativeDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_NativeDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/NativeDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/NativeDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_NativeDef::_nil ());
       if (is_a == 0)
         return CORBA_NativeDef::_nil ();
     }
-  return CORBA_NativeDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_NativeDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_NativeDef_ptr CORBA_NativeDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -10595,7 +10595,7 @@ CORBA_NativeDef::_duplicate (CORBA_NativeDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_NativeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_NativeDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/NativeDef:1.0")) ||
@@ -10606,7 +10606,7 @@ CORBA::Boolean CORBA_NativeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_NativeDef::_tao_QueryInterface (ptr_arith_t type)
@@ -10705,10 +10705,10 @@ tao_CORBA_PrimitiveDef_nil (
 CORBA_PrimitiveDef_ptr
 tao_CORBA_PrimitiveDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_PrimitiveDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_PrimitiveDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -10832,10 +10832,10 @@ CORBA_PrimitiveDef_var::tao_nil (void)
 ::CORBA_PrimitiveDef_ptr
 CORBA_PrimitiveDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_PrimitiveDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_PrimitiveDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -10913,21 +10913,21 @@ public:
   TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -10943,30 +10943,30 @@ private:
 TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -10974,13 +10974,13 @@ TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11012,7 +11012,7 @@ _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::_TAO_CORBA_PrimitiveDef_Remote_Proxy_
 
 CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11054,7 +11054,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
       TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -11070,7 +11070,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11082,17 +11082,17 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11109,7 +11109,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11136,7 +11136,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11146,12 +11146,12 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11162,7 +11162,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11217,7 +11217,7 @@ _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker::~_TAO_CORBA_PrimitiveDef_Remote_Pro
 _TAO_CORBA_PrimitiveDef_Proxy_Impl&
 _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_PrimitiveDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -11260,24 +11260,24 @@ void CORBA_PrimitiveDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_PrimitiveDef_ptr CORBA_PrimitiveDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_PrimitiveDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PrimitiveDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PrimitiveDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_PrimitiveDef::_nil ());
       if (is_a == 0)
         return CORBA_PrimitiveDef::_nil ();
     }
-  return CORBA_PrimitiveDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_PrimitiveDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_PrimitiveDef_ptr CORBA_PrimitiveDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -11332,7 +11332,7 @@ CORBA_PrimitiveDef::_duplicate (CORBA_PrimitiveDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_PrimitiveDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_PrimitiveDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PrimitiveDef:1.0")) ||
@@ -11341,7 +11341,7 @@ CORBA::Boolean CORBA_PrimitiveDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_D
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_PrimitiveDef::_tao_QueryInterface (ptr_arith_t type)
@@ -11390,19 +11390,19 @@ const char* CORBA_PrimitiveDef::_interface_repository_id (void) const
 }
 
 CORBA::PrimitiveKind CORBA_PrimitiveDef::kind (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_PrimitiveDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_PrimitiveDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_PrimitiveDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ((CORBA::PrimitiveKind)0);
 
   return proxy.kind (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -11433,10 +11433,10 @@ tao_CORBA_StringDef_nil (
 CORBA_StringDef_ptr
 tao_CORBA_StringDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_StringDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_StringDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -11560,10 +11560,10 @@ CORBA_StringDef_var::tao_nil (void)
 ::CORBA_StringDef_ptr
 CORBA_StringDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_StringDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_StringDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -11641,21 +11641,21 @@ public:
   TAO_ClientRequestInfo_CORBA_StringDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -11671,30 +11671,30 @@ private:
 TAO_ClientRequestInfo_CORBA_StringDef_bound_get::TAO_ClientRequestInfo_CORBA_StringDef_bound_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_StringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_StringDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_StringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_StringDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -11702,13 +11702,13 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_StringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_StringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11731,21 +11731,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -11761,19 +11761,19 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::TAO_ClientRequestInfo_CORBA_Str
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     bound_ (bound)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_StringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_StringDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -11789,12 +11789,12 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_D
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_StringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_StringDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -11802,13 +11802,13 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_StringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_StringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -11830,7 +11830,7 @@ _TAO_CORBA_StringDef_Remote_Proxy_Impl::_TAO_CORBA_StringDef_Remote_Proxy_Impl (
 
 CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11872,7 +11872,7 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
       TAO_ClientRequestInfo_CORBA_StringDef_bound_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -11888,7 +11888,7 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11900,17 +11900,17 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11927,7 +11927,7 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11954,7 +11954,7 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11964,12 +11964,12 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11980,7 +11980,7 @@ CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11997,7 +11997,7 @@ return _tao_retval;
 void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12040,7 +12040,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
         &_tao_call,
         _collocated_tao_target_,
         bound
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -12056,7 +12056,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12068,12 +12068,12 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -12086,7 +12086,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -12102,7 +12102,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12116,7 +12116,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12126,12 +12126,12 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -12142,7 +12142,7 @@ void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12197,7 +12197,7 @@ _TAO_CORBA_StringDef_Remote_Proxy_Broker::~_TAO_CORBA_StringDef_Remote_Proxy_Bro
 _TAO_CORBA_StringDef_Proxy_Impl&
 _TAO_CORBA_StringDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_StringDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -12240,24 +12240,24 @@ void CORBA_StringDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_StringDef_ptr CORBA_StringDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_StringDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StringDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StringDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_StringDef::_nil ());
       if (is_a == 0)
         return CORBA_StringDef::_nil ();
     }
-  return CORBA_StringDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_StringDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_StringDef_ptr CORBA_StringDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -12312,7 +12312,7 @@ CORBA_StringDef::_duplicate (CORBA_StringDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_StringDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_StringDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StringDef:1.0")) ||
@@ -12321,7 +12321,7 @@ CORBA::Boolean CORBA_StringDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_StringDef::_tao_QueryInterface (ptr_arith_t type)
@@ -12370,38 +12370,38 @@ const char* CORBA_StringDef::_interface_repository_id (void) const
 }
 
 CORBA::ULong CORBA_StringDef::bound (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_StringDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.bound (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_StringDef::bound (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_StringDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.bound (
       this,
       bound
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -12432,10 +12432,10 @@ tao_CORBA_WstringDef_nil (
 CORBA_WstringDef_ptr
 tao_CORBA_WstringDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_WstringDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_WstringDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -12559,10 +12559,10 @@ CORBA_WstringDef_var::tao_nil (void)
 ::CORBA_WstringDef_ptr
 CORBA_WstringDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_WstringDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_WstringDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -12640,21 +12640,21 @@ public:
   TAO_ClientRequestInfo_CORBA_WstringDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -12670,30 +12670,30 @@ private:
 TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::TAO_ClientRequestInfo_CORBA_WstringDef_bound_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -12701,13 +12701,13 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_WstringDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12730,21 +12730,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -12760,19 +12760,19 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::TAO_ClientRequestInfo_CORBA_Ws
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     bound_ (bound)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12788,12 +12788,12 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -12801,13 +12801,13 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -12829,7 +12829,7 @@ _TAO_CORBA_WstringDef_Remote_Proxy_Impl::_TAO_CORBA_WstringDef_Remote_Proxy_Impl
 
 CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12871,7 +12871,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
       TAO_ClientRequestInfo_CORBA_WstringDef_bound_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -12887,7 +12887,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12899,17 +12899,17 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -12926,7 +12926,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12953,7 +12953,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12963,12 +12963,12 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -12979,7 +12979,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12996,7 +12996,7 @@ return _tao_retval;
 void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -13039,7 +13039,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
         &_tao_call,
         _collocated_tao_target_,
         bound
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -13055,7 +13055,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -13067,12 +13067,12 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -13085,7 +13085,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -13101,7 +13101,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -13115,7 +13115,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -13125,12 +13125,12 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13141,7 +13141,7 @@ void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -13196,7 +13196,7 @@ _TAO_CORBA_WstringDef_Remote_Proxy_Broker::~_TAO_CORBA_WstringDef_Remote_Proxy_B
 _TAO_CORBA_WstringDef_Proxy_Impl&
 _TAO_CORBA_WstringDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_WstringDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -13239,24 +13239,24 @@ void CORBA_WstringDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_WstringDef_ptr CORBA_WstringDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_WstringDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/WstringDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/WstringDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_WstringDef::_nil ());
       if (is_a == 0)
         return CORBA_WstringDef::_nil ();
     }
-  return CORBA_WstringDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_WstringDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_WstringDef_ptr CORBA_WstringDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -13311,7 +13311,7 @@ CORBA_WstringDef::_duplicate (CORBA_WstringDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_WstringDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_WstringDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/WstringDef:1.0")) ||
@@ -13320,7 +13320,7 @@ CORBA::Boolean CORBA_WstringDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DEC
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_WstringDef::_tao_QueryInterface (ptr_arith_t type)
@@ -13369,38 +13369,38 @@ const char* CORBA_WstringDef::_interface_repository_id (void) const
 }
 
 CORBA::ULong CORBA_WstringDef::bound (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_WstringDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.bound (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_WstringDef::bound (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_WstringDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.bound (
       this,
       bound
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -13431,10 +13431,10 @@ tao_CORBA_SequenceDef_nil (
 CORBA_SequenceDef_ptr
 tao_CORBA_SequenceDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_SequenceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_SequenceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -13558,10 +13558,10 @@ CORBA_SequenceDef_var::tao_nil (void)
 ::CORBA_SequenceDef_ptr
 CORBA_SequenceDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_SequenceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_SequenceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -13639,21 +13639,21 @@ public:
   TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -13669,30 +13669,30 @@ private:
 TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -13700,13 +13700,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -13729,21 +13729,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -13759,19 +13759,19 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::TAO_ClientRequestInfo_CORBA_S
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     bound_ (bound)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -13787,12 +13787,12 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -13800,13 +13800,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_bound_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -13818,21 +13818,21 @@ public:
   TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -13848,30 +13848,30 @@ private:
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -13879,13 +13879,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (TAO_ENV_SI
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -13907,21 +13907,21 @@ public:
   TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -13937,30 +13937,30 @@ private:
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -13968,13 +13968,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (TAO_EN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -13997,21 +13997,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr element_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -14027,19 +14027,19 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ClientRequestI
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     element_type_def_ (element_type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -14055,12 +14055,12 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (TAO_ENV
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -14068,13 +14068,13 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (TAO_EN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -14096,7 +14096,7 @@ _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::_TAO_CORBA_SequenceDef_Remote_Proxy_Im
 
 CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14138,7 +14138,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
       TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -14154,7 +14154,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14166,17 +14166,17 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -14193,7 +14193,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -14220,7 +14220,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14230,12 +14230,12 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -14246,7 +14246,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -14263,7 +14263,7 @@ return _tao_retval;
 void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14306,7 +14306,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
         &_tao_call,
         _collocated_tao_target_,
         bound
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -14322,7 +14322,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14334,12 +14334,12 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -14352,7 +14352,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -14368,7 +14368,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -14382,7 +14382,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14392,12 +14392,12 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -14408,7 +14408,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -14424,7 +14424,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
 
 CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14467,7 +14467,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
       TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -14483,7 +14483,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14495,17 +14495,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -14522,7 +14522,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -14550,7 +14550,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14560,12 +14560,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -14576,7 +14576,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -14592,7 +14592,7 @@ return _tao_safe_retval._retn ();
 
 CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14635,7 +14635,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
       TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -14651,7 +14651,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14663,17 +14663,17 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -14690,7 +14690,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -14718,7 +14718,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14728,12 +14728,12 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -14744,7 +14744,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -14761,7 +14761,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14804,7 +14804,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
         &_tao_call,
         _collocated_tao_target_,
         element_type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -14820,7 +14820,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14832,12 +14832,12 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -14850,7 +14850,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -14866,7 +14866,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -14880,7 +14880,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14890,12 +14890,12 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -14906,7 +14906,7 @@ void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -14961,7 +14961,7 @@ _TAO_CORBA_SequenceDef_Remote_Proxy_Broker::~_TAO_CORBA_SequenceDef_Remote_Proxy
 _TAO_CORBA_SequenceDef_Proxy_Impl&
 _TAO_CORBA_SequenceDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_SequenceDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -15004,24 +15004,24 @@ void CORBA_SequenceDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_SequenceDef_ptr CORBA_SequenceDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_SequenceDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/SequenceDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/SequenceDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ());
       if (is_a == 0)
         return CORBA_SequenceDef::_nil ();
     }
-  return CORBA_SequenceDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_SequenceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_SequenceDef_ptr CORBA_SequenceDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -15076,7 +15076,7 @@ CORBA_SequenceDef::_duplicate (CORBA_SequenceDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_SequenceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_SequenceDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/SequenceDef:1.0")) ||
@@ -15085,7 +15085,7 @@ CORBA::Boolean CORBA_SequenceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DE
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_SequenceDef::_tao_QueryInterface (ptr_arith_t type)
@@ -15134,91 +15134,91 @@ const char* CORBA_SequenceDef::_interface_repository_id (void) const
 }
 
 CORBA::ULong CORBA_SequenceDef::bound (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.bound (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_SequenceDef::bound (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.bound (
       this,
       bound
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::TypeCode_ptr CORBA_SequenceDef::element_type (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.element_type (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_SequenceDef::element_type_def (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.element_type_def (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_SequenceDef::element_type_def (
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_SequenceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.element_type_def (
       this,
       element_type_def
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -15249,10 +15249,10 @@ tao_CORBA_ArrayDef_nil (
 CORBA_ArrayDef_ptr
 tao_CORBA_ArrayDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_ArrayDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_ArrayDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -15376,10 +15376,10 @@ CORBA_ArrayDef_var::tao_nil (void)
 ::CORBA_ArrayDef_ptr
 CORBA_ArrayDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ArrayDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_ArrayDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -15457,21 +15457,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ArrayDef_length_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -15487,30 +15487,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::TAO_ClientRequestInfo_CORBA_ArrayDef_length_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -15518,13 +15518,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::exceptions (TAO_ENV_SINGLE_ARG_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_length_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -15547,21 +15547,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & length
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -15577,19 +15577,19 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::TAO_ClientRequestInfo_CORBA_Arr
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & length
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     length_ (length)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -15605,12 +15605,12 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::arguments (TAO_ENV_SINGLE_ARG_D
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -15618,13 +15618,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::exceptions (TAO_ENV_SINGLE_ARG_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_length_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -15636,21 +15636,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -15666,30 +15666,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -15697,13 +15697,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -15725,21 +15725,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -15755,30 +15755,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -15786,13 +15786,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (TAO_ENV_S
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -15815,21 +15815,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr element_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -15845,19 +15845,19 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ClientRequestInfo
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     element_type_def_ (element_type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -15873,12 +15873,12 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (TAO_ENV_SI
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -15886,13 +15886,13 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (TAO_ENV_S
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -15914,7 +15914,7 @@ _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::_TAO_CORBA_ArrayDef_Remote_Proxy_Impl (vo
 
 CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -15956,7 +15956,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
       TAO_ClientRequestInfo_CORBA_ArrayDef_length_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -15972,7 +15972,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -15984,17 +15984,17 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -16011,7 +16011,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -16038,7 +16038,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16048,12 +16048,12 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16064,7 +16064,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -16081,7 +16081,7 @@ return _tao_retval;
 void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong length
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -16124,7 +16124,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
         &_tao_call,
         _collocated_tao_target_,
         length
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -16140,7 +16140,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16152,12 +16152,12 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -16170,7 +16170,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -16186,7 +16186,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -16200,7 +16200,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16210,12 +16210,12 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16226,7 +16226,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -16242,7 +16242,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
 
 CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -16285,7 +16285,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
       TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -16301,7 +16301,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16313,17 +16313,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -16340,7 +16340,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -16368,7 +16368,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16378,12 +16378,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16394,7 +16394,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -16410,7 +16410,7 @@ return _tao_safe_retval._retn ();
 
 CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -16453,7 +16453,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
       TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -16469,7 +16469,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16481,17 +16481,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -16508,7 +16508,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -16536,7 +16536,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16546,12 +16546,12 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16562,7 +16562,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -16579,7 +16579,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -16622,7 +16622,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
         &_tao_call,
         _collocated_tao_target_,
         element_type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -16638,7 +16638,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16650,12 +16650,12 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -16668,7 +16668,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -16684,7 +16684,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -16698,7 +16698,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -16708,12 +16708,12 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16724,7 +16724,7 @@ void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -16779,7 +16779,7 @@ _TAO_CORBA_ArrayDef_Remote_Proxy_Broker::~_TAO_CORBA_ArrayDef_Remote_Proxy_Broke
 _TAO_CORBA_ArrayDef_Proxy_Impl&
 _TAO_CORBA_ArrayDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ArrayDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -16822,24 +16822,24 @@ void CORBA_ArrayDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_ArrayDef_ptr CORBA_ArrayDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ArrayDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ArrayDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ArrayDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ());
       if (is_a == 0)
         return CORBA_ArrayDef::_nil ();
     }
-  return CORBA_ArrayDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_ArrayDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ArrayDef_ptr CORBA_ArrayDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -16894,7 +16894,7 @@ CORBA_ArrayDef::_duplicate (CORBA_ArrayDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ArrayDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_ArrayDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ArrayDef:1.0")) ||
@@ -16903,7 +16903,7 @@ CORBA::Boolean CORBA_ArrayDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ArrayDef::_tao_QueryInterface (ptr_arith_t type)
@@ -16952,91 +16952,91 @@ const char* CORBA_ArrayDef::_interface_repository_id (void) const
 }
 
 CORBA::ULong CORBA_ArrayDef::length (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.length (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ArrayDef::length (
     CORBA::ULong length
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.length (
       this,
       length
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::TypeCode_ptr CORBA_ArrayDef::element_type (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.element_type (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_ArrayDef::element_type_def (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.element_type_def (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ArrayDef::element_type_def (
     CORBA_IDLType_ptr element_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ArrayDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.element_type_def (
       this,
       element_type_def
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -17067,10 +17067,10 @@ tao_CORBA_ExceptionDef_nil (
 CORBA_ExceptionDef_ptr
 tao_CORBA_ExceptionDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_ExceptionDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_ExceptionDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -17194,10 +17194,10 @@ CORBA_ExceptionDef_var::tao_nil (void)
 ::CORBA_ExceptionDef_ptr
 CORBA_ExceptionDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ExceptionDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_ExceptionDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -17275,21 +17275,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -17305,30 +17305,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -17336,13 +17336,13 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -17364,21 +17364,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -17394,30 +17394,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -17425,13 +17425,13 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::exceptions (TAO_ENV_SINGLE
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -17454,21 +17454,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -17484,19 +17484,19 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::TAO_ClientRequestInfo_CORB
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     members_ (members)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -17512,12 +17512,12 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::arguments (TAO_ENV_SINGLE_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -17525,13 +17525,13 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::exceptions (TAO_ENV_SINGLE
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -17553,7 +17553,7 @@ _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::_TAO_CORBA_ExceptionDef_Remote_Proxy_
 
 CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17596,7 +17596,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
       TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -17612,7 +17612,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17624,17 +17624,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -17651,7 +17651,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -17679,7 +17679,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17689,12 +17689,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17705,7 +17705,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -17721,7 +17721,7 @@ return _tao_safe_retval._retn ();
 
 CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17765,7 +17765,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
       TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -17781,7 +17781,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17793,17 +17793,17 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -17820,7 +17820,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -17848,7 +17848,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17858,12 +17858,12 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17874,7 +17874,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -17891,7 +17891,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17934,7 +17934,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
         &_tao_call,
         _collocated_tao_target_,
         members
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -17950,7 +17950,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17962,12 +17962,12 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -17980,7 +17980,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -17996,7 +17996,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18010,7 +18010,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18020,12 +18020,12 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -18036,7 +18036,7 @@ void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18091,7 +18091,7 @@ _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker::~_TAO_CORBA_ExceptionDef_Remote_Pro
 _TAO_CORBA_ExceptionDef_Proxy_Impl&
 _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ExceptionDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -18136,24 +18136,24 @@ void CORBA_ExceptionDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_ExceptionDef_ptr CORBA_ExceptionDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ExceptionDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ExceptionDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ExceptionDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
       if (is_a == 0)
         return CORBA_ExceptionDef::_nil ();
     }
-  return CORBA_ExceptionDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_ExceptionDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ExceptionDef_ptr CORBA_ExceptionDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -18208,7 +18208,7 @@ CORBA_ExceptionDef::_duplicate (CORBA_ExceptionDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ExceptionDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_ExceptionDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ExceptionDef:1.0")) ||
@@ -18218,7 +18218,7 @@ CORBA::Boolean CORBA_ExceptionDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_D
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ExceptionDef::_tao_QueryInterface (ptr_arith_t type)
@@ -18279,55 +18279,55 @@ const char* CORBA_ExceptionDef::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_ExceptionDef::type (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_StructMemberSeq * CORBA_ExceptionDef::members (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.members (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ExceptionDef::members (
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.members (
       this,
       members
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -18411,11 +18411,11 @@ void
 _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   CORBA_ExceptionDef **tmp = ACE_static_cast (CORBA_ExceptionDef**, target);
-  *tmp = CORBA_ExceptionDef::_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = CORBA_ExceptionDef::_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -18600,10 +18600,10 @@ tao_CORBA_AttributeDef_nil (
 CORBA_AttributeDef_ptr
 tao_CORBA_AttributeDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_AttributeDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_AttributeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -18727,10 +18727,10 @@ CORBA_AttributeDef_var::tao_nil (void)
 ::CORBA_AttributeDef_ptr
 CORBA_AttributeDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_AttributeDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_AttributeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -18808,21 +18808,21 @@ public:
   TAO_ClientRequestInfo_CORBA_AttributeDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -18838,30 +18838,30 @@ private:
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -18869,13 +18869,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -18897,21 +18897,21 @@ public:
   TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -18927,30 +18927,30 @@ private:
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -18958,13 +18958,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -18987,21 +18987,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -19017,19 +19017,19 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ClientRequestInfo_COR
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     type_def_ (type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -19045,12 +19045,12 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -19058,13 +19058,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -19076,21 +19076,21 @@ public:
   TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -19106,30 +19106,30 @@ private:
 TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -19137,13 +19137,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -19166,21 +19166,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::AttributeMode & mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -19196,19 +19196,19 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::TAO_ClientRequestInfo_CORBA_A
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA::AttributeMode & mode
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     mode_ (mode)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -19224,12 +19224,12 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -19237,13 +19237,13 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -19265,7 +19265,7 @@ _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::_TAO_CORBA_AttributeDef_Remote_Proxy_
 
 CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19308,7 +19308,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
       TAO_ClientRequestInfo_CORBA_AttributeDef_type_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -19324,7 +19324,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19336,17 +19336,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -19363,7 +19363,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -19391,7 +19391,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19401,12 +19401,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -19417,7 +19417,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -19433,7 +19433,7 @@ return _tao_safe_retval._retn ();
 
 CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19476,7 +19476,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
       TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -19492,7 +19492,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19504,17 +19504,17 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -19531,7 +19531,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -19559,7 +19559,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19569,12 +19569,12 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -19585,7 +19585,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -19602,7 +19602,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19645,7 +19645,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
         &_tao_call,
         _collocated_tao_target_,
         type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -19661,7 +19661,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19673,12 +19673,12 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -19691,7 +19691,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -19707,7 +19707,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -19721,7 +19721,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19731,12 +19731,12 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -19747,7 +19747,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -19763,7 +19763,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
 
 CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19805,7 +19805,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
       TAO_ClientRequestInfo_CORBA_AttributeDef_mode_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -19821,7 +19821,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19833,17 +19833,17 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -19860,7 +19860,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -19887,7 +19887,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19897,12 +19897,12 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -19913,7 +19913,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -19930,7 +19930,7 @@ return _tao_retval;
 void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19973,7 +19973,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
         &_tao_call,
         _collocated_tao_target_,
         mode
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -19989,7 +19989,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -20001,12 +20001,12 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -20019,7 +20019,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -20035,7 +20035,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -20049,7 +20049,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -20059,12 +20059,12 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20075,7 +20075,7 @@ void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -20130,7 +20130,7 @@ _TAO_CORBA_AttributeDef_Remote_Proxy_Broker::~_TAO_CORBA_AttributeDef_Remote_Pro
 _TAO_CORBA_AttributeDef_Proxy_Impl&
 _TAO_CORBA_AttributeDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_AttributeDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -20173,24 +20173,24 @@ void CORBA_AttributeDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_AttributeDef_ptr CORBA_AttributeDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_AttributeDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AttributeDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AttributeDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
       if (is_a == 0)
         return CORBA_AttributeDef::_nil ();
     }
-  return CORBA_AttributeDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_AttributeDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_AttributeDef_ptr CORBA_AttributeDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -20245,7 +20245,7 @@ CORBA_AttributeDef::_duplicate (CORBA_AttributeDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_AttributeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_AttributeDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AttributeDef:1.0")) ||
@@ -20254,7 +20254,7 @@ CORBA::Boolean CORBA_AttributeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_D
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_AttributeDef::_tao_QueryInterface (ptr_arith_t type)
@@ -20303,91 +20303,91 @@ const char* CORBA_AttributeDef::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_AttributeDef::type (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_AttributeDef::type_def (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type_def (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_AttributeDef::type_def (
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.type_def (
       this,
       type_def
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::AttributeMode CORBA_AttributeDef::mode (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ((CORBA::AttributeMode)0);
 
   return proxy.mode (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_AttributeDef::mode (
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_AttributeDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.mode (
       this,
       mode
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -20574,10 +20574,10 @@ tao_CORBA_OperationDef_nil (
 CORBA_OperationDef_ptr
 tao_CORBA_OperationDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_OperationDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_OperationDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -20701,10 +20701,10 @@ CORBA_OperationDef_var::tao_nil (void)
 ::CORBA_OperationDef_ptr
 CORBA_OperationDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_OperationDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_OperationDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -20782,21 +20782,21 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_result_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -20812,30 +20812,30 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_result_get::TAO_ClientRequestInfo_CORBA_OperationDef_result_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_result_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_result_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -20843,13 +20843,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_get::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_result_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -20871,21 +20871,21 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -20901,30 +20901,30 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -20932,13 +20932,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::exceptions (TAO_ENV_SIN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -20961,21 +20961,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr result_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -20991,19 +20991,19 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::TAO_ClientRequestInfo_C
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr result_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     result_def_ (result_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -21019,12 +21019,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::arguments (TAO_ENV_SING
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -21032,13 +21032,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::exceptions (TAO_ENV_SIN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -21050,21 +21050,21 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_params_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -21080,30 +21080,30 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_params_get::TAO_ClientRequestInfo_CORBA_OperationDef_params_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_params_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_params_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_params_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_params_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -21111,13 +21111,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_get::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -21140,21 +21140,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_ParDescriptionSeq & params
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -21170,19 +21170,19 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::TAO_ClientRequestInfo_CORBA
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_ParDescriptionSeq & params
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     params_ (params)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_params_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_params_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -21198,12 +21198,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_params_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_params_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -21211,13 +21211,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_set::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_params_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_params_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -21229,21 +21229,21 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_mode_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -21259,30 +21259,30 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::TAO_ClientRequestInfo_CORBA_OperationDef_mode_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -21290,13 +21290,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_mode_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -21319,21 +21319,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA::OperationMode & mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -21349,19 +21349,19 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::TAO_ClientRequestInfo_CORBA_O
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA::OperationMode & mode
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     mode_ (mode)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -21377,12 +21377,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -21390,13 +21390,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_mode_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -21408,21 +21408,21 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -21438,30 +21438,30 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -21469,13 +21469,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -21498,21 +21498,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -21528,19 +21528,19 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::TAO_ClientRequestInfo_COR
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     contexts_ (contexts)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -21556,12 +21556,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -21569,13 +21569,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -21587,21 +21587,21 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -21617,30 +21617,30 @@ private:
 TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -21648,13 +21648,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (TAO_ENV_SIN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -21677,21 +21677,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_ExceptionDefSeq & exceptions
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -21707,19 +21707,19 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ClientRequestInfo_C
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     exceptions_ (exceptions)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -21735,12 +21735,12 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::arguments (TAO_ENV_SING
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -21748,13 +21748,13 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (TAO_ENV_SIN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -21776,7 +21776,7 @@ _TAO_CORBA_OperationDef_Remote_Proxy_Impl::_TAO_CORBA_OperationDef_Remote_Proxy_
 
 CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -21819,7 +21819,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
       TAO_ClientRequestInfo_CORBA_OperationDef_result_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -21835,7 +21835,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -21847,17 +21847,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -21874,7 +21874,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -21902,7 +21902,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -21912,12 +21912,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -21928,7 +21928,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -21944,7 +21944,7 @@ return _tao_safe_retval._retn ();
 
 CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -21987,7 +21987,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
       TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -22003,7 +22003,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22015,17 +22015,17 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -22042,7 +22042,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -22070,7 +22070,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22080,12 +22080,12 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22096,7 +22096,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -22113,7 +22113,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr result_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22156,7 +22156,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
         &_tao_call,
         _collocated_tao_target_,
         result_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -22172,7 +22172,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22184,12 +22184,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -22202,7 +22202,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -22218,7 +22218,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -22232,7 +22232,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22242,12 +22242,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22258,7 +22258,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -22274,7 +22274,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
 
 CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22318,7 +22318,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
       TAO_ClientRequestInfo_CORBA_OperationDef_params_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -22334,7 +22334,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22346,17 +22346,17 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -22373,7 +22373,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -22401,7 +22401,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22411,12 +22411,12 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22427,7 +22427,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -22444,7 +22444,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_ParDescriptionSeq & params
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22487,7 +22487,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
         &_tao_call,
         _collocated_tao_target_,
         params
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -22503,7 +22503,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22515,12 +22515,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -22533,7 +22533,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -22549,7 +22549,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -22563,7 +22563,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22573,12 +22573,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22589,7 +22589,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -22605,7 +22605,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
 
 CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22647,7 +22647,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
       TAO_ClientRequestInfo_CORBA_OperationDef_mode_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -22663,7 +22663,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22675,17 +22675,17 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -22702,7 +22702,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -22729,7 +22729,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22739,12 +22739,12 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22755,7 +22755,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -22772,7 +22772,7 @@ return _tao_retval;
 void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::OperationMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22815,7 +22815,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
         &_tao_call,
         _collocated_tao_target_,
         mode
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -22831,7 +22831,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22843,12 +22843,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -22861,7 +22861,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -22877,7 +22877,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -22891,7 +22891,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -22901,12 +22901,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22917,7 +22917,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -22933,7 +22933,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
 
 CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22977,7 +22977,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
       TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -22993,7 +22993,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23005,17 +23005,17 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -23032,7 +23032,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -23060,7 +23060,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23070,12 +23070,12 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -23086,7 +23086,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -23103,7 +23103,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -23146,7 +23146,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
         &_tao_call,
         _collocated_tao_target_,
         contexts
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -23162,7 +23162,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23174,12 +23174,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -23192,7 +23192,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -23208,7 +23208,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -23222,7 +23222,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23232,12 +23232,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -23248,7 +23248,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -23264,7 +23264,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
 
 CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -23308,7 +23308,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
       TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -23324,7 +23324,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23336,17 +23336,17 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -23363,7 +23363,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -23391,7 +23391,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23401,12 +23401,12 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -23417,7 +23417,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -23434,7 +23434,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -23477,7 +23477,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
         &_tao_call,
         _collocated_tao_target_,
         exceptions
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -23493,7 +23493,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23505,12 +23505,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -23523,7 +23523,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -23539,7 +23539,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -23553,7 +23553,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -23563,12 +23563,12 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -23579,7 +23579,7 @@ void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -23634,7 +23634,7 @@ _TAO_CORBA_OperationDef_Remote_Proxy_Broker::~_TAO_CORBA_OperationDef_Remote_Pro
 _TAO_CORBA_OperationDef_Proxy_Impl&
 _TAO_CORBA_OperationDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_OperationDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -23677,24 +23677,24 @@ void CORBA_OperationDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_OperationDef_ptr CORBA_OperationDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_OperationDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/OperationDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/OperationDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
       if (is_a == 0)
         return CORBA_OperationDef::_nil ();
     }
-  return CORBA_OperationDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_OperationDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_OperationDef_ptr CORBA_OperationDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -23749,7 +23749,7 @@ CORBA_OperationDef::_duplicate (CORBA_OperationDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_OperationDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_OperationDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
@@ -23758,7 +23758,7 @@ CORBA::Boolean CORBA_OperationDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_D
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_OperationDef::_tao_QueryInterface (ptr_arith_t type)
@@ -23807,199 +23807,199 @@ const char* CORBA_OperationDef::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_OperationDef::result (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.result (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_OperationDef::result_def (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.result_def (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_OperationDef::result_def (
     CORBA_IDLType_ptr result_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.result_def (
       this,
       result_def
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ParDescriptionSeq * CORBA_OperationDef::params (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.params (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_OperationDef::params (
     const CORBA_ParDescriptionSeq & params
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.params (
       this,
       params
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::OperationMode CORBA_OperationDef::mode (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ((CORBA::OperationMode)0);
 
   return proxy.mode (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_OperationDef::mode (
     CORBA::OperationMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.mode (
       this,
       mode
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ContextIdSeq * CORBA_OperationDef::contexts (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.contexts (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_OperationDef::contexts (
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.contexts (
       this,
       contexts
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ExceptionDefSeq * CORBA_OperationDef::exceptions (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.exceptions (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_OperationDef::exceptions (
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_OperationDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.exceptions (
       this,
       exceptions
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -24278,10 +24278,10 @@ tao_CORBA_InterfaceDef_nil (
 CORBA_InterfaceDef_ptr
 tao_CORBA_InterfaceDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_InterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_InterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -24405,10 +24405,10 @@ CORBA_InterfaceDef_var::tao_nil (void)
 ::CORBA_InterfaceDef_ptr
 CORBA_InterfaceDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_InterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_InterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -24486,21 +24486,21 @@ public:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -24516,30 +24516,30 @@ private:
 TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -24547,13 +24547,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (TAO_EN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -24576,21 +24576,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_InterfaceDefSeq & base_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -24606,19 +24606,19 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ClientRequestI
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     base_interfaces_ (base_interfaces)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -24634,12 +24634,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (TAO_ENV
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -24647,13 +24647,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (TAO_EN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -24666,21 +24666,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * interface_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -24698,19 +24698,19 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::TAO_ClientRequestInfo_CORBA_Inter
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * interface_id
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     interface_id_ (interface_id)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -24726,12 +24726,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DEC
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -24739,13 +24739,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DE
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -24767,21 +24767,21 @@ public:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -24797,30 +24797,30 @@ private:
 TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -24828,13 +24828,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (TAO_ENV
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -24861,21 +24861,21 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode & mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -24901,7 +24901,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ClientRequestInfo
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -24912,12 +24912,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ClientRequestInfo
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -24945,12 +24945,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (TAO_ENV_SI
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -24958,13 +24958,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (TAO_ENV_S
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -24994,21 +24994,21 @@ public:
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -25040,7 +25040,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ClientRequestInfo
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -25054,12 +25054,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ClientRequestInfo
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -25096,12 +25096,12 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::arguments (TAO_ENV_SI
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -25109,13 +25109,13 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (TAO_ENV_S
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -25147,7 +25147,7 @@ _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::_TAO_CORBA_InterfaceDef_Remote_Proxy_
 
 CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -25191,7 +25191,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
       TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -25207,7 +25207,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25219,17 +25219,17 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -25246,7 +25246,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -25274,7 +25274,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25284,12 +25284,12 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -25300,7 +25300,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfac
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -25317,7 +25317,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -25360,7 +25360,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
         &_tao_call,
         _collocated_tao_target_,
         base_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -25376,7 +25376,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25388,12 +25388,12 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -25406,7 +25406,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -25422,7 +25422,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -25436,7 +25436,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25446,12 +25446,12 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -25462,7 +25462,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -25479,7 +25479,7 @@ void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
 CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
     const char * interface_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -25522,7 +25522,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
         &_tao_call,
         _collocated_tao_target_,
         interface_id
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -25538,7 +25538,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25550,12 +25550,12 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
@@ -25569,7 +25569,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -25586,7 +25586,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -25613,7 +25613,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25623,12 +25623,12 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -25639,7 +25639,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -25655,7 +25655,7 @@ return _tao_retval;
 
 CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::describe_interface (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -25698,7 +25698,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
       TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -25714,7 +25714,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25726,17 +25726,17 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -25753,7 +25753,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -25781,7 +25781,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25791,12 +25791,12 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -25807,7 +25807,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Pr
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -25828,7 +25828,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -25876,7 +25876,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
         version,
         type,
         mode
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -25892,7 +25892,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25904,12 +25904,12 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -25927,7 +25927,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -25944,7 +25944,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -25972,7 +25972,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -25982,12 +25982,12 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -25998,7 +25998,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribu
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -26022,7 +26022,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -26073,7 +26073,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
         params,
         exceptions,
         contexts
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -26089,7 +26089,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -26101,12 +26101,12 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -26127,7 +26127,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -26144,7 +26144,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -26172,7 +26172,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -26182,12 +26182,12 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -26198,7 +26198,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operati
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -26253,7 +26253,7 @@ _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker::~_TAO_CORBA_InterfaceDef_Remote_Pro
 _TAO_CORBA_InterfaceDef_Proxy_Impl&
 _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_InterfaceDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -26300,24 +26300,24 @@ void CORBA_InterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_InterfaceDef_ptr CORBA_InterfaceDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_InterfaceDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/InterfaceDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/InterfaceDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
       if (is_a == 0)
         return CORBA_InterfaceDef::_nil ();
     }
-  return CORBA_InterfaceDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_InterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef_ptr CORBA_InterfaceDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -26372,7 +26372,7 @@ CORBA_InterfaceDef::_duplicate (CORBA_InterfaceDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_InterfaceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_InterfaceDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
@@ -26383,7 +26383,7 @@ CORBA::Boolean CORBA_InterfaceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_D
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
@@ -26456,57 +26456,57 @@ const char* CORBA_InterfaceDef::_interface_repository_id (void) const
 }
 
 CORBA_InterfaceDefSeq * CORBA_InterfaceDef::base_interfaces (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.base_interfaces (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_InterfaceDef::base_interfaces (
     const CORBA_InterfaceDefSeq & base_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.base_interfaces (
       this,
       base_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean CORBA_InterfaceDef::is_a (
     const char * interface_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_a (
       this,
       interface_id
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -27437,19 +27437,19 @@ void CORBA_InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *_t
 }
 
 CORBA_InterfaceDef::FullInterfaceDescription * CORBA_InterfaceDef::describe_interface (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.describe_interface (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -27459,14 +27459,14 @@ CORBA_AttributeDef_ptr CORBA_InterfaceDef::create_attribute (
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_attribute (
@@ -27476,7 +27476,7 @@ CORBA_AttributeDef_ptr CORBA_InterfaceDef::create_attribute (
       version,
       type,
       mode
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -27489,14 +27489,14 @@ CORBA_OperationDef_ptr CORBA_InterfaceDef::create_operation (
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_operation (
@@ -27509,7 +27509,7 @@ CORBA_OperationDef_ptr CORBA_InterfaceDef::create_operation (
       params,
       exceptions,
       contexts
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -27546,10 +27546,10 @@ tao_CORBA_AbstractInterfaceDef_nil (
 CORBA_AbstractInterfaceDef_ptr
 tao_CORBA_AbstractInterfaceDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_AbstractInterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_AbstractInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -27673,10 +27673,10 @@ CORBA_AbstractInterfaceDef_var::tao_nil (void)
 ::CORBA_AbstractInterfaceDef_ptr
 CORBA_AbstractInterfaceDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_AbstractInterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_AbstractInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -27803,7 +27803,7 @@ _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker::~_TAO_CORBA_AbstractInterfa
 _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl&
 _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_AbstractInterfaceDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -27846,24 +27846,24 @@ void CORBA_AbstractInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_AbstractInterfaceDef_ptr CORBA_AbstractInterfaceDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_AbstractInterfaceDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AbstractInterfaceDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AbstractInterfaceDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
       if (is_a == 0)
         return CORBA_AbstractInterfaceDef::_nil ();
     }
-  return CORBA_AbstractInterfaceDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_AbstractInterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_AbstractInterfaceDef_ptr CORBA_AbstractInterfaceDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -27918,7 +27918,7 @@ CORBA_AbstractInterfaceDef::_duplicate (CORBA_AbstractInterfaceDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_AbstractInterfaceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_AbstractInterfaceDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0")) ||
@@ -27930,7 +27930,7 @@ CORBA::Boolean CORBA_AbstractInterfaceDef::_is_a (const CORBA::Char *value TAO_E
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
@@ -28041,10 +28041,10 @@ tao_CORBA_LocalInterfaceDef_nil (
 CORBA_LocalInterfaceDef_ptr
 tao_CORBA_LocalInterfaceDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_LocalInterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_LocalInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -28168,10 +28168,10 @@ CORBA_LocalInterfaceDef_var::tao_nil (void)
 ::CORBA_LocalInterfaceDef_ptr
 CORBA_LocalInterfaceDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_LocalInterfaceDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_LocalInterfaceDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -28298,7 +28298,7 @@ _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker::~_TAO_CORBA_LocalInterfaceDef_
 _TAO_CORBA_LocalInterfaceDef_Proxy_Impl&
 _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_LocalInterfaceDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -28341,24 +28341,24 @@ void CORBA_LocalInterfaceDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_LocalInterfaceDef_ptr CORBA_LocalInterfaceDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_LocalInterfaceDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/LocalInterfaceDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/LocalInterfaceDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
       if (is_a == 0)
         return CORBA_LocalInterfaceDef::_nil ();
     }
-  return CORBA_LocalInterfaceDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_LocalInterfaceDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_LocalInterfaceDef_ptr CORBA_LocalInterfaceDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -28413,7 +28413,7 @@ CORBA_LocalInterfaceDef::_duplicate (CORBA_LocalInterfaceDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_LocalInterfaceDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_LocalInterfaceDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0")) ||
@@ -28425,7 +28425,7 @@ CORBA::Boolean CORBA_LocalInterfaceDef::_is_a (const CORBA::Char *value TAO_ENV_
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
@@ -28526,7 +28526,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PrimitiveKind &_t
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveKind TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveKind ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -28572,7 +28572,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Repository_ptr &_t
     _tao_elem = CORBA_Repository::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_Repository TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_Repository ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -28633,7 +28633,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ModuleDef_ptr &_ta
     _tao_elem = CORBA_ModuleDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -28708,7 +28708,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ModuleDescri
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -28777,7 +28777,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstantDef_ptr &_
     _tao_elem = CORBA_ConstantDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -28852,7 +28852,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ConstantDesc
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -28921,7 +28921,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StructDef_ptr &_ta
     _tao_elem = CORBA_StructDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -28982,7 +28982,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_UnionDef_ptr &_tao
     _tao_elem = CORBA_UnionDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29043,7 +29043,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_EnumDef_ptr &_tao_
     _tao_elem = CORBA_EnumDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29104,7 +29104,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AliasDef_ptr &_tao
     _tao_elem = CORBA_AliasDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AliasDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AliasDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29165,7 +29165,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_NativeDef_ptr &_ta
     _tao_elem = CORBA_NativeDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_NativeDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_NativeDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29226,7 +29226,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PrimitiveDef_ptr &
     _tao_elem = CORBA_PrimitiveDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29287,7 +29287,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StringDef_ptr &_ta
     _tao_elem = CORBA_StringDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_StringDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_StringDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29348,7 +29348,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_WstringDef_ptr &_t
     _tao_elem = CORBA_WstringDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_WstringDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_WstringDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29409,7 +29409,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_SequenceDef_ptr &_
     _tao_elem = CORBA_SequenceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_SequenceDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_SequenceDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29470,7 +29470,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ArrayDef_ptr &_tao
     _tao_elem = CORBA_ArrayDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ArrayDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ArrayDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29531,7 +29531,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ExceptionDef_ptr &
     _tao_elem = CORBA_ExceptionDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29606,7 +29606,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExceptionDes
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29697,7 +29697,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExceptionDef
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29788,7 +29788,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExcDescripti
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExcDescriptionSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExcDescriptionSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29851,7 +29851,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeMode &_t
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeMode TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeMode ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29897,7 +29897,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AttributeDef_ptr &
     _tao_elem = CORBA_AttributeDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -29972,7 +29972,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AttributeDes
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30035,7 +30035,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OperationMode &_t
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationMode TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationMode ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30075,7 +30075,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ParameterMode &_t
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterMode TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterMode ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30135,7 +30135,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ParameterDes
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30226,7 +30226,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ParDescripti
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParDescriptionSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParDescriptionSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30317,7 +30317,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ContextIdSeq
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ContextIdSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ContextIdSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30386,7 +30386,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_OperationDef_ptr &
     _tao_elem = CORBA_OperationDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30461,7 +30461,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OperationDes
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30552,7 +30552,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_RepositoryId
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_RepositoryIdSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_RepositoryIdSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30643,7 +30643,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OpDescriptio
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_OpDescriptionSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_OpDescriptionSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30734,7 +30734,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AttrDescript
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttrDescriptionSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttrDescriptionSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30803,7 +30803,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InterfaceDef_ptr &
     _tao_elem = CORBA_InterfaceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30878,7 +30878,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDef
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA_InterfaceDef::_tc_FullInterfaceDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA_InterfaceDef::_tc_FullInterfaceDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -30961,7 +30961,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDes
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -31030,7 +31030,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AbstractInterfaceD
     _tao_elem = CORBA_AbstractInterfaceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -31091,7 +31091,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_LocalInterfaceDef_
     _tao_elem = CORBA_LocalInterfaceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -31152,7 +31152,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_Repository::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31188,7 +31188,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_ModuleDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31224,7 +31224,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_ConstantDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31260,7 +31260,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_StructDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31296,7 +31296,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_UnionDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31332,7 +31332,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_EnumDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31368,7 +31368,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_AliasDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31404,7 +31404,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_NativeDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31440,7 +31440,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_PrimitiveDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31476,7 +31476,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_StringDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31512,7 +31512,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_WstringDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31548,7 +31548,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_SequenceDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31584,7 +31584,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_ArrayDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31620,7 +31620,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_ExceptionDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31740,7 +31740,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_AttributeDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -31860,7 +31860,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_OperationDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -32022,7 +32022,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_InterfaceDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -32058,7 +32058,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_AbstractInterfaceDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -32094,7 +32094,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_LocalInterfaceDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index 992841af4ef..05f9d665f44 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -94,7 +94,7 @@ public:
   static CORBA_PrimitiveDef_ptr tao_nil (void);
   static CORBA_PrimitiveDef_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -173,7 +173,7 @@ public:
   static CORBA_StringDef_ptr tao_nil (void);
   static CORBA_StringDef_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -252,7 +252,7 @@ public:
   static CORBA_SequenceDef_ptr tao_nil (void);
   static CORBA_SequenceDef_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -331,7 +331,7 @@ public:
   static CORBA_ArrayDef_ptr tao_nil (void);
   static CORBA_ArrayDef_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -410,7 +410,7 @@ public:
   static CORBA_WstringDef_ptr tao_nil (void);
   static CORBA_WstringDef_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -489,7 +489,7 @@ public:
   static CORBA_FixedDef_ptr tao_nil (void);
   static CORBA_FixedDef_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -567,7 +567,7 @@ public:
   static CORBA_Repository_ptr tao_nil (void);
   static CORBA_Repository_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -631,12 +631,12 @@ public:
 
   static CORBA_Repository_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static CORBA_Repository_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static CORBA_Repository_ptr _nil (void)
@@ -648,7 +648,7 @@ public:
 
   virtual CORBA_Contained_ptr lookup_id (
       const char * search_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -656,7 +656,7 @@ public:
 
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA::TypeCode_ptr tc
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -664,7 +664,7 @@ public:
 
   virtual CORBA_PrimitiveDef_ptr get_primitive (
       CORBA::PrimitiveKind kind
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -672,7 +672,7 @@ public:
 
   virtual CORBA_StringDef_ptr create_string (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -680,7 +680,7 @@ public:
 
   virtual CORBA_WstringDef_ptr create_wstring (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -689,7 +689,7 @@ public:
   virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -698,7 +698,7 @@ public:
   virtual CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -707,7 +707,7 @@ public:
   virtual CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
       CORBA::Short scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -715,7 +715,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -766,7 +766,7 @@ public:
   virtual CORBA_Contained_ptr lookup_id (
       CORBA_Object *_collocated_tao_target_,
       const char * search_id
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -775,7 +775,7 @@ public:
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA_Object *_collocated_tao_target_,
       CORBA::TypeCode_ptr tc
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -784,7 +784,7 @@ public:
   virtual CORBA_PrimitiveDef_ptr get_primitive (
       CORBA_Object *_collocated_tao_target_,
       CORBA::PrimitiveKind kind
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -793,7 +793,7 @@ public:
   virtual CORBA_StringDef_ptr create_string (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -802,7 +802,7 @@ public:
   virtual CORBA_WstringDef_ptr create_wstring (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -812,7 +812,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -822,7 +822,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong length,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -832,7 +832,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       CORBA::UShort digits,
       CORBA::Short scale
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -864,7 +864,7 @@ public:
   virtual CORBA_Contained_ptr lookup_id (
       CORBA_Object *_collocated_tao_target_,
       const char * search_id
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -873,7 +873,7 @@ public:
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA_Object *_collocated_tao_target_,
       CORBA::TypeCode_ptr tc
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -882,7 +882,7 @@ public:
   virtual CORBA_PrimitiveDef_ptr get_primitive (
       CORBA_Object *_collocated_tao_target_,
       CORBA::PrimitiveKind kind
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -891,7 +891,7 @@ public:
   virtual CORBA_StringDef_ptr create_string (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -900,7 +900,7 @@ public:
   virtual CORBA_WstringDef_ptr create_wstring (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -910,7 +910,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -920,7 +920,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong length,
       CORBA_IDLType_ptr element_type
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -930,7 +930,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       CORBA::UShort digits,
       CORBA::Short scale
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -959,7 +959,7 @@ public:
   virtual ~_TAO_CORBA_Repository_Proxy_Broker (void);
   virtual _TAO_CORBA_Repository_Proxy_Impl &select_proxy (
       CORBA_Repository *object
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) = 0;
 
 protected:
@@ -986,7 +986,7 @@ public:
 
   virtual _TAO_CORBA_Repository_Proxy_Impl &select_proxy (
       CORBA_Repository *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -1047,7 +1047,7 @@ public:
     static CORBA_ModuleDef_ptr tao_nil (void);
     static CORBA_ModuleDef_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1112,12 +1112,12 @@ public:
 
     static CORBA_ModuleDef_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static CORBA_ModuleDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static CORBA_ModuleDef_ptr _nil (void)
@@ -1129,7 +1129,7 @@ public:
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -1225,7 +1225,7 @@ public:
     virtual ~_TAO_CORBA_ModuleDef_Proxy_Broker (void);
     virtual _TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
         CORBA_ModuleDef *object
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
 
   protected:
@@ -1252,7 +1252,7 @@ public:
 
     virtual _TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
         CORBA_ModuleDef *object
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     private:
@@ -1380,7 +1380,7 @@ public:
       static CORBA_ConstantDef_ptr tao_nil (void);
       static CORBA_ConstantDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1444,12 +1444,12 @@ public:
 
       static CORBA_ConstantDef_ptr _narrow (
           CORBA::Object_ptr obj
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
       static CORBA_ConstantDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
       static CORBA_ConstantDef_ptr _nil (void)
@@ -1460,14 +1460,14 @@ public:
       static void _tao_any_destructor (void*);
 
       virtual CORBA::TypeCode_ptr type (
-          TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
 
       virtual CORBA_IDLType_ptr type_def (
-          TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1475,14 +1475,14 @@ public:
 
       virtual void type_def (
           CORBA_IDLType_ptr type_def
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
 
       virtual CORBA::Any * value (
-          TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1490,7 +1490,7 @@ public:
 
       virtual void value (
           const CORBA::Any & value
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1498,7 +1498,7 @@ public:
 
       virtual CORBA::Boolean _is_a (
           const CORBA::Char *type_id
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
       virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -1548,7 +1548,7 @@ public:
       virtual ~_TAO_CORBA_ConstantDef_Proxy_Impl (void) { }
       virtual CORBA::TypeCode_ptr type (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1556,7 +1556,7 @@ public:
 
       virtual CORBA_IDLType_ptr type_def (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1565,7 +1565,7 @@ public:
       virtual void type_def (
           CORBA_Object *_collocated_tao_target_,
           CORBA_IDLType_ptr type_def
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1573,7 +1573,7 @@ public:
 
       virtual CORBA::Any * value (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1582,7 +1582,7 @@ public:
       virtual void value (
           CORBA_Object *_collocated_tao_target_,
           const CORBA::Any & value
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1613,7 +1613,7 @@ public:
       virtual ~_TAO_CORBA_ConstantDef_Remote_Proxy_Impl (void) { }
       virtual CORBA::TypeCode_ptr type (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1621,7 +1621,7 @@ public:
 
       virtual CORBA_IDLType_ptr type_def (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1630,7 +1630,7 @@ public:
       virtual void type_def (
           CORBA_Object *_collocated_tao_target_,
           CORBA_IDLType_ptr type_def
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1638,7 +1638,7 @@ public:
 
       virtual CORBA::Any * value (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1647,7 +1647,7 @@ public:
       virtual void value (
           CORBA_Object *_collocated_tao_target_,
           const CORBA::Any & value
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1676,7 +1676,7 @@ public:
       virtual ~_TAO_CORBA_ConstantDef_Proxy_Broker (void);
       virtual _TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
           CORBA_ConstantDef *object
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         ) = 0;
 
     protected:
@@ -1703,7 +1703,7 @@ public:
 
       virtual _TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
           CORBA_ConstantDef *object
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         );
 
       private:
@@ -1835,7 +1835,7 @@ public:
         static CORBA_StructDef_ptr tao_nil (void);
         static CORBA_StructDef_ptr tao_narrow (
             CORBA::Object *
-            TAO_ENV_ARG_DECL_NOT_USED
+            ACE_ENV_ARG_DECL_NOT_USED
           );
         static CORBA::Object * tao_upcast (void *);
 
@@ -1900,12 +1900,12 @@ public:
 
         static CORBA_StructDef_ptr _narrow (
             CORBA::Object_ptr obj
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
         static CORBA_StructDef_ptr _unchecked_narrow (
             CORBA::Object_ptr obj
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
         static CORBA_StructDef_ptr _nil (void)
@@ -1916,7 +1916,7 @@ public:
         static void _tao_any_destructor (void*);
 
         virtual CORBA_StructMemberSeq * members (
-            TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+            ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -1924,7 +1924,7 @@ public:
 
         virtual void members (
             const CORBA_StructMemberSeq & members
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -1932,7 +1932,7 @@ public:
 
         virtual CORBA::Boolean _is_a (
             const CORBA::Char *type_id
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
         virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -1983,7 +1983,7 @@ public:
         virtual ~_TAO_CORBA_StructDef_Proxy_Impl (void) { }
         virtual CORBA_StructMemberSeq * members (
             CORBA_Object *_collocated_tao_target_
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -1992,7 +1992,7 @@ public:
         virtual void members (
             CORBA_Object *_collocated_tao_target_,
             const CORBA_StructMemberSeq & members
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -2024,7 +2024,7 @@ public:
         virtual ~_TAO_CORBA_StructDef_Remote_Proxy_Impl (void) { }
         virtual CORBA_StructMemberSeq * members (
             CORBA_Object *_collocated_tao_target_
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -2033,7 +2033,7 @@ public:
         virtual void members (
             CORBA_Object *_collocated_tao_target_,
             const CORBA_StructMemberSeq & members
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -2062,7 +2062,7 @@ public:
         virtual ~_TAO_CORBA_StructDef_Proxy_Broker (void);
         virtual _TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
             CORBA_StructDef *object
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS
           ) = 0;
 
       protected:
@@ -2089,7 +2089,7 @@ public:
 
         virtual _TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
             CORBA_StructDef *object
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           );
 
         private:
@@ -2151,7 +2151,7 @@ public:
           static CORBA_UnionDef_ptr tao_nil (void);
           static CORBA_UnionDef_ptr tao_narrow (
               CORBA::Object *
-              TAO_ENV_ARG_DECL_NOT_USED
+              ACE_ENV_ARG_DECL_NOT_USED
             );
           static CORBA::Object * tao_upcast (void *);
 
@@ -2216,12 +2216,12 @@ public:
 
           static CORBA_UnionDef_ptr _narrow (
               CORBA::Object_ptr obj
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
           static CORBA_UnionDef_ptr _unchecked_narrow (
               CORBA::Object_ptr obj
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
           static CORBA_UnionDef_ptr _nil (void)
@@ -2232,14 +2232,14 @@ public:
           static void _tao_any_destructor (void*);
 
           virtual CORBA::TypeCode_ptr discriminator_type (
-              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
             ACE_THROW_SPEC ((
               CORBA::SystemException
             ));
 
           virtual CORBA_IDLType_ptr discriminator_type_def (
-              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -2247,14 +2247,14 @@ public:
 
           virtual void discriminator_type_def (
               CORBA_IDLType_ptr discriminator_type_def
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
             ACE_THROW_SPEC ((
               CORBA::SystemException
             ));
 
           virtual CORBA_UnionMemberSeq * members (
-              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -2262,7 +2262,7 @@ public:
 
           virtual void members (
               const CORBA_UnionMemberSeq & members
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -2270,7 +2270,7 @@ public:
 
           virtual CORBA::Boolean _is_a (
               const CORBA::Char *type_id
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
           virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -2321,7 +2321,7 @@ public:
           virtual ~_TAO_CORBA_UnionDef_Proxy_Impl (void) { }
           virtual CORBA::TypeCode_ptr discriminator_type (
               CORBA_Object *_collocated_tao_target_
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -2329,7 +2329,7 @@ public:
 
           virtual CORBA_IDLType_ptr discriminator_type_def (
               CORBA_Object *_collocated_tao_target_
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -2338,7 +2338,7 @@ public:
           virtual void discriminator_type_def (
               CORBA_Object *_collocated_tao_target_,
               CORBA_IDLType_ptr discriminator_type_def
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -2346,7 +2346,7 @@ public:
 
           virtual CORBA_UnionMemberSeq * members (
               CORBA_Object *_collocated_tao_target_
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -2355,7 +2355,7 @@ public:
           virtual void members (
               CORBA_Object *_collocated_tao_target_,
               const CORBA_UnionMemberSeq & members
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -2387,7 +2387,7 @@ public:
           virtual ~_TAO_CORBA_UnionDef_Remote_Proxy_Impl (void) { }
           virtual CORBA::TypeCode_ptr discriminator_type (
               CORBA_Object *_collocated_tao_target_
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -2395,7 +2395,7 @@ public:
 
           virtual CORBA_IDLType_ptr discriminator_type_def (
               CORBA_Object *_collocated_tao_target_
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -2404,7 +2404,7 @@ public:
           virtual void discriminator_type_def (
               CORBA_Object *_collocated_tao_target_,
               CORBA_IDLType_ptr discriminator_type_def
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -2412,7 +2412,7 @@ public:
 
           virtual CORBA_UnionMemberSeq * members (
               CORBA_Object *_collocated_tao_target_
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -2421,7 +2421,7 @@ public:
           virtual void members (
               CORBA_Object *_collocated_tao_target_,
               const CORBA_UnionMemberSeq & members
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -2450,7 +2450,7 @@ public:
           virtual ~_TAO_CORBA_UnionDef_Proxy_Broker (void);
           virtual _TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
               CORBA_UnionDef *object
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS
             ) = 0;
 
         protected:
@@ -2477,7 +2477,7 @@ public:
 
           virtual _TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
               CORBA_UnionDef *object
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             );
 
           private:
@@ -2539,7 +2539,7 @@ public:
             static CORBA_EnumDef_ptr tao_nil (void);
             static CORBA_EnumDef_ptr tao_narrow (
                 CORBA::Object *
-                TAO_ENV_ARG_DECL_NOT_USED
+                ACE_ENV_ARG_DECL_NOT_USED
               );
             static CORBA::Object * tao_upcast (void *);
 
@@ -2603,12 +2603,12 @@ public:
 
             static CORBA_EnumDef_ptr _narrow (
                 CORBA::Object_ptr obj
-                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
             static CORBA_EnumDef_ptr _unchecked_narrow (
                 CORBA::Object_ptr obj
-                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
             static CORBA_EnumDef_ptr _nil (void)
@@ -2619,7 +2619,7 @@ public:
             static void _tao_any_destructor (void*);
 
             virtual CORBA_EnumMemberSeq * members (
-                TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
               ACE_THROW_SPEC ((
                 CORBA::SystemException
@@ -2627,7 +2627,7 @@ public:
 
             virtual void members (
                 const CORBA_EnumMemberSeq & members
-                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
               ACE_THROW_SPEC ((
                 CORBA::SystemException
@@ -2635,7 +2635,7 @@ public:
 
             virtual CORBA::Boolean _is_a (
                 const CORBA::Char *type_id
-                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
             virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -2685,7 +2685,7 @@ public:
             virtual ~_TAO_CORBA_EnumDef_Proxy_Impl (void) { }
             virtual CORBA_EnumMemberSeq * members (
                 CORBA_Object *_collocated_tao_target_
-                TAO_ENV_ARG_DECL
+                ACE_ENV_ARG_DECL
               )
               ACE_THROW_SPEC ((
                 CORBA::SystemException
@@ -2694,7 +2694,7 @@ public:
             virtual void members (
                 CORBA_Object *_collocated_tao_target_,
                 const CORBA_EnumMemberSeq & members
-                TAO_ENV_ARG_DECL
+                ACE_ENV_ARG_DECL
               )
               ACE_THROW_SPEC ((
                 CORBA::SystemException
@@ -2725,7 +2725,7 @@ public:
             virtual ~_TAO_CORBA_EnumDef_Remote_Proxy_Impl (void) { }
             virtual CORBA_EnumMemberSeq * members (
                 CORBA_Object *_collocated_tao_target_
-                TAO_ENV_ARG_DECL
+                ACE_ENV_ARG_DECL
               )
               ACE_THROW_SPEC ((
                 CORBA::SystemException
@@ -2734,7 +2734,7 @@ public:
             virtual void members (
                 CORBA_Object *_collocated_tao_target_,
                 const CORBA_EnumMemberSeq & members
-                TAO_ENV_ARG_DECL
+                ACE_ENV_ARG_DECL
               )
               ACE_THROW_SPEC ((
                 CORBA::SystemException
@@ -2763,7 +2763,7 @@ public:
             virtual ~_TAO_CORBA_EnumDef_Proxy_Broker (void);
             virtual _TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
                 CORBA_EnumDef *object
-                TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS
               ) = 0;
 
           protected:
@@ -2790,7 +2790,7 @@ public:
 
             virtual _TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
                 CORBA_EnumDef *object
-                TAO_ENV_ARG_DECL
+                ACE_ENV_ARG_DECL
               );
 
             private:
@@ -2852,7 +2852,7 @@ public:
               static CORBA_AliasDef_ptr tao_nil (void);
               static CORBA_AliasDef_ptr tao_narrow (
                   CORBA::Object *
-                  TAO_ENV_ARG_DECL_NOT_USED
+                  ACE_ENV_ARG_DECL_NOT_USED
                 );
               static CORBA::Object * tao_upcast (void *);
 
@@ -2916,12 +2916,12 @@ public:
 
               static CORBA_AliasDef_ptr _narrow (
                   CORBA::Object_ptr obj
-                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
               static CORBA_AliasDef_ptr _unchecked_narrow (
                   CORBA::Object_ptr obj
-                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
               static CORBA_AliasDef_ptr _nil (void)
@@ -2932,7 +2932,7 @@ public:
               static void _tao_any_destructor (void*);
 
               virtual CORBA_IDLType_ptr original_type_def (
-                  TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                  ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                 ACE_THROW_SPEC ((
                   CORBA::SystemException
@@ -2940,7 +2940,7 @@ public:
 
               virtual void original_type_def (
                   CORBA_IDLType_ptr original_type_def
-                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                 ACE_THROW_SPEC ((
                   CORBA::SystemException
@@ -2948,7 +2948,7 @@ public:
 
               virtual CORBA::Boolean _is_a (
                   const CORBA::Char *type_id
-                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
               virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -2998,7 +2998,7 @@ public:
               virtual ~_TAO_CORBA_AliasDef_Proxy_Impl (void) { }
               virtual CORBA_IDLType_ptr original_type_def (
                   CORBA_Object *_collocated_tao_target_
-                  TAO_ENV_ARG_DECL
+                  ACE_ENV_ARG_DECL
                 )
                 ACE_THROW_SPEC ((
                   CORBA::SystemException
@@ -3007,7 +3007,7 @@ public:
               virtual void original_type_def (
                   CORBA_Object *_collocated_tao_target_,
                   CORBA_IDLType_ptr original_type_def
-                  TAO_ENV_ARG_DECL
+                  ACE_ENV_ARG_DECL
                 )
                 ACE_THROW_SPEC ((
                   CORBA::SystemException
@@ -3038,7 +3038,7 @@ public:
               virtual ~_TAO_CORBA_AliasDef_Remote_Proxy_Impl (void) { }
               virtual CORBA_IDLType_ptr original_type_def (
                   CORBA_Object *_collocated_tao_target_
-                  TAO_ENV_ARG_DECL
+                  ACE_ENV_ARG_DECL
                 )
                 ACE_THROW_SPEC ((
                   CORBA::SystemException
@@ -3047,7 +3047,7 @@ public:
               virtual void original_type_def (
                   CORBA_Object *_collocated_tao_target_,
                   CORBA_IDLType_ptr original_type_def
-                  TAO_ENV_ARG_DECL
+                  ACE_ENV_ARG_DECL
                 )
                 ACE_THROW_SPEC ((
                   CORBA::SystemException
@@ -3076,7 +3076,7 @@ public:
               virtual ~_TAO_CORBA_AliasDef_Proxy_Broker (void);
               virtual _TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
                   CORBA_AliasDef *object
-                  TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS
                 ) = 0;
 
             protected:
@@ -3103,7 +3103,7 @@ public:
 
               virtual _TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
                   CORBA_AliasDef *object
-                  TAO_ENV_ARG_DECL
+                  ACE_ENV_ARG_DECL
                 );
 
               private:
@@ -3165,7 +3165,7 @@ public:
                 static CORBA_NativeDef_ptr tao_nil (void);
                 static CORBA_NativeDef_ptr tao_narrow (
                     CORBA::Object *
-                    TAO_ENV_ARG_DECL_NOT_USED
+                    ACE_ENV_ARG_DECL_NOT_USED
                   );
                 static CORBA::Object * tao_upcast (void *);
 
@@ -3229,12 +3229,12 @@ public:
 
                 static CORBA_NativeDef_ptr _narrow (
                     CORBA::Object_ptr obj
-                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                 static CORBA_NativeDef_ptr _unchecked_narrow (
                     CORBA::Object_ptr obj
-                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                 static CORBA_NativeDef_ptr _nil (void)
@@ -3246,7 +3246,7 @@ public:
 
                 virtual CORBA::Boolean _is_a (
                     const CORBA::Char *type_id
-                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                 virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -3340,7 +3340,7 @@ public:
                 virtual ~_TAO_CORBA_NativeDef_Proxy_Broker (void);
                 virtual _TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
                     CORBA_NativeDef *object
-                    TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS
                   ) = 0;
 
               protected:
@@ -3367,7 +3367,7 @@ public:
 
                 virtual _TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
                     CORBA_NativeDef *object
-                    TAO_ENV_ARG_DECL
+                    ACE_ENV_ARG_DECL
                   );
 
                 private:
@@ -3414,12 +3414,12 @@ public:
 
                   static CORBA_PrimitiveDef_ptr _narrow (
                       CORBA::Object_ptr obj
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                   static CORBA_PrimitiveDef_ptr _unchecked_narrow (
                       CORBA::Object_ptr obj
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                   static CORBA_PrimitiveDef_ptr _nil (void)
@@ -3430,7 +3430,7 @@ public:
                   static void _tao_any_destructor (void*);
 
                   virtual CORBA::PrimitiveKind kind (
-                      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -3438,7 +3438,7 @@ public:
 
                   virtual CORBA::Boolean _is_a (
                       const CORBA::Char *type_id
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                   virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -3488,7 +3488,7 @@ public:
                   virtual ~_TAO_CORBA_PrimitiveDef_Proxy_Impl (void) { }
                   virtual CORBA::PrimitiveKind kind (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -3519,7 +3519,7 @@ public:
                   virtual ~_TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl (void) { }
                   virtual CORBA::PrimitiveKind kind (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -3548,7 +3548,7 @@ public:
                   virtual ~_TAO_CORBA_PrimitiveDef_Proxy_Broker (void);
                   virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
                       CORBA_PrimitiveDef *object
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS
                     ) = 0;
 
                 protected:
@@ -3575,7 +3575,7 @@ public:
 
                   virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
                       CORBA_PrimitiveDef *object
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     );
 
                   private:
@@ -3622,12 +3622,12 @@ public:
 
                     static CORBA_StringDef_ptr _narrow (
                         CORBA::Object_ptr obj
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                     static CORBA_StringDef_ptr _unchecked_narrow (
                         CORBA::Object_ptr obj
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                     static CORBA_StringDef_ptr _nil (void)
@@ -3638,7 +3638,7 @@ public:
                     static void _tao_any_destructor (void*);
 
                     virtual CORBA::ULong bound (
-                        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                       ACE_THROW_SPEC ((
                         CORBA::SystemException
@@ -3646,7 +3646,7 @@ public:
 
                     virtual void bound (
                         CORBA::ULong bound
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                       ACE_THROW_SPEC ((
                         CORBA::SystemException
@@ -3654,7 +3654,7 @@ public:
 
                     virtual CORBA::Boolean _is_a (
                         const CORBA::Char *type_id
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                     virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -3704,7 +3704,7 @@ public:
                     virtual ~_TAO_CORBA_StringDef_Proxy_Impl (void) { }
                     virtual CORBA::ULong bound (
                         CORBA_Object *_collocated_tao_target_
-                        TAO_ENV_ARG_DECL
+                        ACE_ENV_ARG_DECL
                       )
                       ACE_THROW_SPEC ((
                         CORBA::SystemException
@@ -3713,7 +3713,7 @@ public:
                     virtual void bound (
                         CORBA_Object *_collocated_tao_target_,
                         CORBA::ULong bound
-                        TAO_ENV_ARG_DECL
+                        ACE_ENV_ARG_DECL
                       )
                       ACE_THROW_SPEC ((
                         CORBA::SystemException
@@ -3744,7 +3744,7 @@ public:
                     virtual ~_TAO_CORBA_StringDef_Remote_Proxy_Impl (void) { }
                     virtual CORBA::ULong bound (
                         CORBA_Object *_collocated_tao_target_
-                        TAO_ENV_ARG_DECL
+                        ACE_ENV_ARG_DECL
                       )
                       ACE_THROW_SPEC ((
                         CORBA::SystemException
@@ -3753,7 +3753,7 @@ public:
                     virtual void bound (
                         CORBA_Object *_collocated_tao_target_,
                         CORBA::ULong bound
-                        TAO_ENV_ARG_DECL
+                        ACE_ENV_ARG_DECL
                       )
                       ACE_THROW_SPEC ((
                         CORBA::SystemException
@@ -3782,7 +3782,7 @@ public:
                     virtual ~_TAO_CORBA_StringDef_Proxy_Broker (void);
                     virtual _TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
                         CORBA_StringDef *object
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS
                       ) = 0;
 
                   protected:
@@ -3809,7 +3809,7 @@ public:
 
                     virtual _TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
                         CORBA_StringDef *object
-                        TAO_ENV_ARG_DECL
+                        ACE_ENV_ARG_DECL
                       );
 
                     private:
@@ -3856,12 +3856,12 @@ public:
 
                       static CORBA_WstringDef_ptr _narrow (
                           CORBA::Object_ptr obj
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                       static CORBA_WstringDef_ptr _unchecked_narrow (
                           CORBA::Object_ptr obj
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                       static CORBA_WstringDef_ptr _nil (void)
@@ -3872,7 +3872,7 @@ public:
                       static void _tao_any_destructor (void*);
 
                       virtual CORBA::ULong bound (
-                          TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                         ACE_THROW_SPEC ((
                           CORBA::SystemException
@@ -3880,7 +3880,7 @@ public:
 
                       virtual void bound (
                           CORBA::ULong bound
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                         ACE_THROW_SPEC ((
                           CORBA::SystemException
@@ -3888,7 +3888,7 @@ public:
 
                       virtual CORBA::Boolean _is_a (
                           const CORBA::Char *type_id
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                       virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -3938,7 +3938,7 @@ public:
                       virtual ~_TAO_CORBA_WstringDef_Proxy_Impl (void) { }
                       virtual CORBA::ULong bound (
                           CORBA_Object *_collocated_tao_target_
-                          TAO_ENV_ARG_DECL
+                          ACE_ENV_ARG_DECL
                         )
                         ACE_THROW_SPEC ((
                           CORBA::SystemException
@@ -3947,7 +3947,7 @@ public:
                       virtual void bound (
                           CORBA_Object *_collocated_tao_target_,
                           CORBA::ULong bound
-                          TAO_ENV_ARG_DECL
+                          ACE_ENV_ARG_DECL
                         )
                         ACE_THROW_SPEC ((
                           CORBA::SystemException
@@ -3978,7 +3978,7 @@ public:
                       virtual ~_TAO_CORBA_WstringDef_Remote_Proxy_Impl (void) { }
                       virtual CORBA::ULong bound (
                           CORBA_Object *_collocated_tao_target_
-                          TAO_ENV_ARG_DECL
+                          ACE_ENV_ARG_DECL
                         )
                         ACE_THROW_SPEC ((
                           CORBA::SystemException
@@ -3987,7 +3987,7 @@ public:
                       virtual void bound (
                           CORBA_Object *_collocated_tao_target_,
                           CORBA::ULong bound
-                          TAO_ENV_ARG_DECL
+                          ACE_ENV_ARG_DECL
                         )
                         ACE_THROW_SPEC ((
                           CORBA::SystemException
@@ -4016,7 +4016,7 @@ public:
                       virtual ~_TAO_CORBA_WstringDef_Proxy_Broker (void);
                       virtual _TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
                           CORBA_WstringDef *object
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS
                         ) = 0;
 
                     protected:
@@ -4043,7 +4043,7 @@ public:
 
                       virtual _TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
                           CORBA_WstringDef *object
-                          TAO_ENV_ARG_DECL
+                          ACE_ENV_ARG_DECL
                         );
 
                       private:
@@ -4090,12 +4090,12 @@ public:
 
                         static CORBA_SequenceDef_ptr _narrow (
                             CORBA::Object_ptr obj
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                         static CORBA_SequenceDef_ptr _unchecked_narrow (
                             CORBA::Object_ptr obj
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                         static CORBA_SequenceDef_ptr _nil (void)
@@ -4106,7 +4106,7 @@ public:
                         static void _tao_any_destructor (void*);
 
                         virtual CORBA::ULong bound (
-                            TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
@@ -4114,21 +4114,21 @@ public:
 
                         virtual void bound (
                             CORBA::ULong bound
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
                           ));
 
                         virtual CORBA::TypeCode_ptr element_type (
-                            TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
                           ));
 
                         virtual CORBA_IDLType_ptr element_type_def (
-                            TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
@@ -4136,7 +4136,7 @@ public:
 
                         virtual void element_type_def (
                             CORBA_IDLType_ptr element_type_def
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
@@ -4144,7 +4144,7 @@ public:
 
                         virtual CORBA::Boolean _is_a (
                             const CORBA::Char *type_id
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                         virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -4194,7 +4194,7 @@ public:
                         virtual ~_TAO_CORBA_SequenceDef_Proxy_Impl (void) { }
                         virtual CORBA::ULong bound (
                             CORBA_Object *_collocated_tao_target_
-                            TAO_ENV_ARG_DECL
+                            ACE_ENV_ARG_DECL
                           )
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
@@ -4203,7 +4203,7 @@ public:
                         virtual void bound (
                             CORBA_Object *_collocated_tao_target_,
                             CORBA::ULong bound
-                            TAO_ENV_ARG_DECL
+                            ACE_ENV_ARG_DECL
                           )
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
@@ -4211,7 +4211,7 @@ public:
 
                         virtual CORBA::TypeCode_ptr element_type (
                             CORBA_Object *_collocated_tao_target_
-                            TAO_ENV_ARG_DECL
+                            ACE_ENV_ARG_DECL
                           )
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
@@ -4219,7 +4219,7 @@ public:
 
                         virtual CORBA_IDLType_ptr element_type_def (
                             CORBA_Object *_collocated_tao_target_
-                            TAO_ENV_ARG_DECL
+                            ACE_ENV_ARG_DECL
                           )
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
@@ -4228,7 +4228,7 @@ public:
                         virtual void element_type_def (
                             CORBA_Object *_collocated_tao_target_,
                             CORBA_IDLType_ptr element_type_def
-                            TAO_ENV_ARG_DECL
+                            ACE_ENV_ARG_DECL
                           )
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
@@ -4259,7 +4259,7 @@ public:
                         virtual ~_TAO_CORBA_SequenceDef_Remote_Proxy_Impl (void) { }
                         virtual CORBA::ULong bound (
                             CORBA_Object *_collocated_tao_target_
-                            TAO_ENV_ARG_DECL
+                            ACE_ENV_ARG_DECL
                           )
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
@@ -4268,7 +4268,7 @@ public:
                         virtual void bound (
                             CORBA_Object *_collocated_tao_target_,
                             CORBA::ULong bound
-                            TAO_ENV_ARG_DECL
+                            ACE_ENV_ARG_DECL
                           )
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
@@ -4276,7 +4276,7 @@ public:
 
                         virtual CORBA::TypeCode_ptr element_type (
                             CORBA_Object *_collocated_tao_target_
-                            TAO_ENV_ARG_DECL
+                            ACE_ENV_ARG_DECL
                           )
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
@@ -4284,7 +4284,7 @@ public:
 
                         virtual CORBA_IDLType_ptr element_type_def (
                             CORBA_Object *_collocated_tao_target_
-                            TAO_ENV_ARG_DECL
+                            ACE_ENV_ARG_DECL
                           )
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
@@ -4293,7 +4293,7 @@ public:
                         virtual void element_type_def (
                             CORBA_Object *_collocated_tao_target_,
                             CORBA_IDLType_ptr element_type_def
-                            TAO_ENV_ARG_DECL
+                            ACE_ENV_ARG_DECL
                           )
                           ACE_THROW_SPEC ((
                             CORBA::SystemException
@@ -4322,7 +4322,7 @@ public:
                         virtual ~_TAO_CORBA_SequenceDef_Proxy_Broker (void);
                         virtual _TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
                             CORBA_SequenceDef *object
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS
                           ) = 0;
 
                       protected:
@@ -4349,7 +4349,7 @@ public:
 
                         virtual _TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
                             CORBA_SequenceDef *object
-                            TAO_ENV_ARG_DECL
+                            ACE_ENV_ARG_DECL
                           );
 
                         private:
@@ -4396,12 +4396,12 @@ public:
 
                           static CORBA_ArrayDef_ptr _narrow (
                               CORBA::Object_ptr obj
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                           static CORBA_ArrayDef_ptr _unchecked_narrow (
                               CORBA::Object_ptr obj
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                           static CORBA_ArrayDef_ptr _nil (void)
@@ -4412,7 +4412,7 @@ public:
                           static void _tao_any_destructor (void*);
 
                           virtual CORBA::ULong length (
-                              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -4420,21 +4420,21 @@ public:
 
                           virtual void length (
                               CORBA::ULong length
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
                             ));
 
                           virtual CORBA::TypeCode_ptr element_type (
-                              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
                             ));
 
                           virtual CORBA_IDLType_ptr element_type_def (
-                              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -4442,7 +4442,7 @@ public:
 
                           virtual void element_type_def (
                               CORBA_IDLType_ptr element_type_def
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -4450,7 +4450,7 @@ public:
 
                           virtual CORBA::Boolean _is_a (
                               const CORBA::Char *type_id
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                           virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -4500,7 +4500,7 @@ public:
                           virtual ~_TAO_CORBA_ArrayDef_Proxy_Impl (void) { }
                           virtual CORBA::ULong length (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -4509,7 +4509,7 @@ public:
                           virtual void length (
                               CORBA_Object *_collocated_tao_target_,
                               CORBA::ULong length
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -4517,7 +4517,7 @@ public:
 
                           virtual CORBA::TypeCode_ptr element_type (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -4525,7 +4525,7 @@ public:
 
                           virtual CORBA_IDLType_ptr element_type_def (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -4534,7 +4534,7 @@ public:
                           virtual void element_type_def (
                               CORBA_Object *_collocated_tao_target_,
                               CORBA_IDLType_ptr element_type_def
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -4565,7 +4565,7 @@ public:
                           virtual ~_TAO_CORBA_ArrayDef_Remote_Proxy_Impl (void) { }
                           virtual CORBA::ULong length (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -4574,7 +4574,7 @@ public:
                           virtual void length (
                               CORBA_Object *_collocated_tao_target_,
                               CORBA::ULong length
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -4582,7 +4582,7 @@ public:
 
                           virtual CORBA::TypeCode_ptr element_type (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -4590,7 +4590,7 @@ public:
 
                           virtual CORBA_IDLType_ptr element_type_def (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -4599,7 +4599,7 @@ public:
                           virtual void element_type_def (
                               CORBA_Object *_collocated_tao_target_,
                               CORBA_IDLType_ptr element_type_def
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -4628,7 +4628,7 @@ public:
                           virtual ~_TAO_CORBA_ArrayDef_Proxy_Broker (void);
                           virtual _TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
                               CORBA_ArrayDef *object
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS
                             ) = 0;
 
                         protected:
@@ -4655,7 +4655,7 @@ public:
 
                           virtual _TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
                               CORBA_ArrayDef *object
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             );
 
                           private:
@@ -4716,7 +4716,7 @@ public:
                             static CORBA_ExceptionDef_ptr tao_nil (void);
                             static CORBA_ExceptionDef_ptr tao_narrow (
                                 CORBA::Object *
-                                TAO_ENV_ARG_DECL_NOT_USED
+                                ACE_ENV_ARG_DECL_NOT_USED
                               );
                             static CORBA::Object * tao_upcast (void *);
 
@@ -4781,12 +4781,12 @@ public:
 
                             static CORBA_ExceptionDef_ptr _narrow (
                                 CORBA::Object_ptr obj
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                             static CORBA_ExceptionDef_ptr _unchecked_narrow (
                                 CORBA::Object_ptr obj
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                             static CORBA_ExceptionDef_ptr _nil (void)
@@ -4797,14 +4797,14 @@ public:
                             static void _tao_any_destructor (void*);
 
                             virtual CORBA::TypeCode_ptr type (
-                                TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                               ACE_THROW_SPEC ((
                                 CORBA::SystemException
                               ));
 
                             virtual CORBA_StructMemberSeq * members (
-                                TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                               ACE_THROW_SPEC ((
                                 CORBA::SystemException
@@ -4812,7 +4812,7 @@ public:
 
                             virtual void members (
                                 const CORBA_StructMemberSeq & members
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                               ACE_THROW_SPEC ((
                                 CORBA::SystemException
@@ -4820,7 +4820,7 @@ public:
 
                             virtual CORBA::Boolean _is_a (
                                 const CORBA::Char *type_id
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                             virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -4871,7 +4871,7 @@ public:
                             virtual ~_TAO_CORBA_ExceptionDef_Proxy_Impl (void) { }
                             virtual CORBA::TypeCode_ptr type (
                                 CORBA_Object *_collocated_tao_target_
-                                TAO_ENV_ARG_DECL
+                                ACE_ENV_ARG_DECL
                               )
                               ACE_THROW_SPEC ((
                                 CORBA::SystemException
@@ -4879,7 +4879,7 @@ public:
 
                             virtual CORBA_StructMemberSeq * members (
                                 CORBA_Object *_collocated_tao_target_
-                                TAO_ENV_ARG_DECL
+                                ACE_ENV_ARG_DECL
                               )
                               ACE_THROW_SPEC ((
                                 CORBA::SystemException
@@ -4888,7 +4888,7 @@ public:
                             virtual void members (
                                 CORBA_Object *_collocated_tao_target_,
                                 const CORBA_StructMemberSeq & members
-                                TAO_ENV_ARG_DECL
+                                ACE_ENV_ARG_DECL
                               )
                               ACE_THROW_SPEC ((
                                 CORBA::SystemException
@@ -4920,7 +4920,7 @@ public:
                             virtual ~_TAO_CORBA_ExceptionDef_Remote_Proxy_Impl (void) { }
                             virtual CORBA::TypeCode_ptr type (
                                 CORBA_Object *_collocated_tao_target_
-                                TAO_ENV_ARG_DECL
+                                ACE_ENV_ARG_DECL
                               )
                               ACE_THROW_SPEC ((
                                 CORBA::SystemException
@@ -4928,7 +4928,7 @@ public:
 
                             virtual CORBA_StructMemberSeq * members (
                                 CORBA_Object *_collocated_tao_target_
-                                TAO_ENV_ARG_DECL
+                                ACE_ENV_ARG_DECL
                               )
                               ACE_THROW_SPEC ((
                                 CORBA::SystemException
@@ -4937,7 +4937,7 @@ public:
                             virtual void members (
                                 CORBA_Object *_collocated_tao_target_,
                                 const CORBA_StructMemberSeq & members
-                                TAO_ENV_ARG_DECL
+                                ACE_ENV_ARG_DECL
                               )
                               ACE_THROW_SPEC ((
                                 CORBA::SystemException
@@ -4966,7 +4966,7 @@ public:
                             virtual ~_TAO_CORBA_ExceptionDef_Proxy_Broker (void);
                             virtual _TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
                                 CORBA_ExceptionDef *object
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS
                               ) = 0;
 
                           protected:
@@ -4993,7 +4993,7 @@ public:
 
                             virtual _TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
                                 CORBA_ExceptionDef *object
-                                TAO_ENV_ARG_DECL
+                                ACE_ENV_ARG_DECL
                               );
 
                             private:
@@ -5130,7 +5130,7 @@ public:
                               virtual void _downcast (
                                   void* target,
                                   CORBA_Object *src
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
                               virtual CORBA_Object* _upcast (void *src) const;
                             };
@@ -5451,7 +5451,7 @@ public:
                               static CORBA_AttributeDef_ptr tao_nil (void);
                               static CORBA_AttributeDef_ptr tao_narrow (
                                   CORBA::Object *
-                                  TAO_ENV_ARG_DECL_NOT_USED
+                                  ACE_ENV_ARG_DECL_NOT_USED
                                 );
                               static CORBA::Object * tao_upcast (void *);
 
@@ -5515,12 +5515,12 @@ public:
 
                               static CORBA_AttributeDef_ptr _narrow (
                                   CORBA::Object_ptr obj
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                               static CORBA_AttributeDef_ptr _unchecked_narrow (
                                   CORBA::Object_ptr obj
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                               static CORBA_AttributeDef_ptr _nil (void)
@@ -5531,14 +5531,14 @@ public:
                               static void _tao_any_destructor (void*);
 
                               virtual CORBA::TypeCode_ptr type (
-                                  TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
                                 ));
 
                               virtual CORBA_IDLType_ptr type_def (
-                                  TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
@@ -5546,14 +5546,14 @@ public:
 
                               virtual void type_def (
                                   CORBA_IDLType_ptr type_def
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
                                 ));
 
                               virtual CORBA::AttributeMode mode (
-                                  TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
@@ -5561,7 +5561,7 @@ public:
 
                               virtual void mode (
                                   CORBA::AttributeMode mode
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
@@ -5569,7 +5569,7 @@ public:
 
                               virtual CORBA::Boolean _is_a (
                                   const CORBA::Char *type_id
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                               virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -5619,7 +5619,7 @@ public:
                               virtual ~_TAO_CORBA_AttributeDef_Proxy_Impl (void) { }
                               virtual CORBA::TypeCode_ptr type (
                                   CORBA_Object *_collocated_tao_target_
-                                  TAO_ENV_ARG_DECL
+                                  ACE_ENV_ARG_DECL
                                 )
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
@@ -5627,7 +5627,7 @@ public:
 
                               virtual CORBA_IDLType_ptr type_def (
                                   CORBA_Object *_collocated_tao_target_
-                                  TAO_ENV_ARG_DECL
+                                  ACE_ENV_ARG_DECL
                                 )
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
@@ -5636,7 +5636,7 @@ public:
                               virtual void type_def (
                                   CORBA_Object *_collocated_tao_target_,
                                   CORBA_IDLType_ptr type_def
-                                  TAO_ENV_ARG_DECL
+                                  ACE_ENV_ARG_DECL
                                 )
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
@@ -5644,7 +5644,7 @@ public:
 
                               virtual CORBA::AttributeMode mode (
                                   CORBA_Object *_collocated_tao_target_
-                                  TAO_ENV_ARG_DECL
+                                  ACE_ENV_ARG_DECL
                                 )
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
@@ -5653,7 +5653,7 @@ public:
                               virtual void mode (
                                   CORBA_Object *_collocated_tao_target_,
                                   CORBA::AttributeMode mode
-                                  TAO_ENV_ARG_DECL
+                                  ACE_ENV_ARG_DECL
                                 )
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
@@ -5684,7 +5684,7 @@ public:
                               virtual ~_TAO_CORBA_AttributeDef_Remote_Proxy_Impl (void) { }
                               virtual CORBA::TypeCode_ptr type (
                                   CORBA_Object *_collocated_tao_target_
-                                  TAO_ENV_ARG_DECL
+                                  ACE_ENV_ARG_DECL
                                 )
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
@@ -5692,7 +5692,7 @@ public:
 
                               virtual CORBA_IDLType_ptr type_def (
                                   CORBA_Object *_collocated_tao_target_
-                                  TAO_ENV_ARG_DECL
+                                  ACE_ENV_ARG_DECL
                                 )
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
@@ -5701,7 +5701,7 @@ public:
                               virtual void type_def (
                                   CORBA_Object *_collocated_tao_target_,
                                   CORBA_IDLType_ptr type_def
-                                  TAO_ENV_ARG_DECL
+                                  ACE_ENV_ARG_DECL
                                 )
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
@@ -5709,7 +5709,7 @@ public:
 
                               virtual CORBA::AttributeMode mode (
                                   CORBA_Object *_collocated_tao_target_
-                                  TAO_ENV_ARG_DECL
+                                  ACE_ENV_ARG_DECL
                                 )
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
@@ -5718,7 +5718,7 @@ public:
                               virtual void mode (
                                   CORBA_Object *_collocated_tao_target_,
                                   CORBA::AttributeMode mode
-                                  TAO_ENV_ARG_DECL
+                                  ACE_ENV_ARG_DECL
                                 )
                                 ACE_THROW_SPEC ((
                                   CORBA::SystemException
@@ -5747,7 +5747,7 @@ public:
                               virtual ~_TAO_CORBA_AttributeDef_Proxy_Broker (void);
                               virtual _TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
                                   CORBA_AttributeDef *object
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS
                                 ) = 0;
 
                             protected:
@@ -5774,7 +5774,7 @@ public:
 
                               virtual _TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
                                   CORBA_AttributeDef *object
-                                  TAO_ENV_ARG_DECL
+                                  ACE_ENV_ARG_DECL
                                 );
 
                               private:
@@ -6247,7 +6247,7 @@ public:
                                 static CORBA_OperationDef_ptr tao_nil (void);
                                 static CORBA_OperationDef_ptr tao_narrow (
                                     CORBA::Object *
-                                    TAO_ENV_ARG_DECL_NOT_USED
+                                    ACE_ENV_ARG_DECL_NOT_USED
                                   );
                                 static CORBA::Object * tao_upcast (void *);
 
@@ -6311,12 +6311,12 @@ public:
 
                                 static CORBA_OperationDef_ptr _narrow (
                                     CORBA::Object_ptr obj
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                                 static CORBA_OperationDef_ptr _unchecked_narrow (
                                     CORBA::Object_ptr obj
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                                 static CORBA_OperationDef_ptr _nil (void)
@@ -6327,14 +6327,14 @@ public:
                                 static void _tao_any_destructor (void*);
 
                                 virtual CORBA::TypeCode_ptr result (
-                                    TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
                                   ));
 
                                 virtual CORBA_IDLType_ptr result_def (
-                                    TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6342,14 +6342,14 @@ public:
 
                                 virtual void result_def (
                                     CORBA_IDLType_ptr result_def
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
                                   ));
 
                                 virtual CORBA_ParDescriptionSeq * params (
-                                    TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6357,14 +6357,14 @@ public:
 
                                 virtual void params (
                                     const CORBA_ParDescriptionSeq & params
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
                                   ));
 
                                 virtual CORBA::OperationMode mode (
-                                    TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6372,14 +6372,14 @@ public:
 
                                 virtual void mode (
                                     CORBA::OperationMode mode
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
                                   ));
 
                                 virtual CORBA_ContextIdSeq * contexts (
-                                    TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6387,14 +6387,14 @@ public:
 
                                 virtual void contexts (
                                     const CORBA_ContextIdSeq & contexts
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
                                   ));
 
                                 virtual CORBA_ExceptionDefSeq * exceptions (
-                                    TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6402,7 +6402,7 @@ public:
 
                                 virtual void exceptions (
                                     const CORBA_ExceptionDefSeq & exceptions
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6410,7 +6410,7 @@ public:
 
                                 virtual CORBA::Boolean _is_a (
                                     const CORBA::Char *type_id
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                                 virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -6460,7 +6460,7 @@ public:
                                 virtual ~_TAO_CORBA_OperationDef_Proxy_Impl (void) { }
                                 virtual CORBA::TypeCode_ptr result (
                                     CORBA_Object *_collocated_tao_target_
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6468,7 +6468,7 @@ public:
 
                                 virtual CORBA_IDLType_ptr result_def (
                                     CORBA_Object *_collocated_tao_target_
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6477,7 +6477,7 @@ public:
                                 virtual void result_def (
                                     CORBA_Object *_collocated_tao_target_,
                                     CORBA_IDLType_ptr result_def
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6485,7 +6485,7 @@ public:
 
                                 virtual CORBA_ParDescriptionSeq * params (
                                     CORBA_Object *_collocated_tao_target_
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6494,7 +6494,7 @@ public:
                                 virtual void params (
                                     CORBA_Object *_collocated_tao_target_,
                                     const CORBA_ParDescriptionSeq & params
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6502,7 +6502,7 @@ public:
 
                                 virtual CORBA::OperationMode mode (
                                     CORBA_Object *_collocated_tao_target_
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6511,7 +6511,7 @@ public:
                                 virtual void mode (
                                     CORBA_Object *_collocated_tao_target_,
                                     CORBA::OperationMode mode
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6519,7 +6519,7 @@ public:
 
                                 virtual CORBA_ContextIdSeq * contexts (
                                     CORBA_Object *_collocated_tao_target_
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6528,7 +6528,7 @@ public:
                                 virtual void contexts (
                                     CORBA_Object *_collocated_tao_target_,
                                     const CORBA_ContextIdSeq & contexts
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6536,7 +6536,7 @@ public:
 
                                 virtual CORBA_ExceptionDefSeq * exceptions (
                                     CORBA_Object *_collocated_tao_target_
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6545,7 +6545,7 @@ public:
                                 virtual void exceptions (
                                     CORBA_Object *_collocated_tao_target_,
                                     const CORBA_ExceptionDefSeq & exceptions
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6576,7 +6576,7 @@ public:
                                 virtual ~_TAO_CORBA_OperationDef_Remote_Proxy_Impl (void) { }
                                 virtual CORBA::TypeCode_ptr result (
                                     CORBA_Object *_collocated_tao_target_
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6584,7 +6584,7 @@ public:
 
                                 virtual CORBA_IDLType_ptr result_def (
                                     CORBA_Object *_collocated_tao_target_
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6593,7 +6593,7 @@ public:
                                 virtual void result_def (
                                     CORBA_Object *_collocated_tao_target_,
                                     CORBA_IDLType_ptr result_def
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6601,7 +6601,7 @@ public:
 
                                 virtual CORBA_ParDescriptionSeq * params (
                                     CORBA_Object *_collocated_tao_target_
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6610,7 +6610,7 @@ public:
                                 virtual void params (
                                     CORBA_Object *_collocated_tao_target_,
                                     const CORBA_ParDescriptionSeq & params
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6618,7 +6618,7 @@ public:
 
                                 virtual CORBA::OperationMode mode (
                                     CORBA_Object *_collocated_tao_target_
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6627,7 +6627,7 @@ public:
                                 virtual void mode (
                                     CORBA_Object *_collocated_tao_target_,
                                     CORBA::OperationMode mode
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6635,7 +6635,7 @@ public:
 
                                 virtual CORBA_ContextIdSeq * contexts (
                                     CORBA_Object *_collocated_tao_target_
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6644,7 +6644,7 @@ public:
                                 virtual void contexts (
                                     CORBA_Object *_collocated_tao_target_,
                                     const CORBA_ContextIdSeq & contexts
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6652,7 +6652,7 @@ public:
 
                                 virtual CORBA_ExceptionDefSeq * exceptions (
                                     CORBA_Object *_collocated_tao_target_
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6661,7 +6661,7 @@ public:
                                 virtual void exceptions (
                                     CORBA_Object *_collocated_tao_target_,
                                     const CORBA_ExceptionDefSeq & exceptions
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   )
                                   ACE_THROW_SPEC ((
                                     CORBA::SystemException
@@ -6690,7 +6690,7 @@ public:
                                 virtual ~_TAO_CORBA_OperationDef_Proxy_Broker (void);
                                 virtual _TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
                                     CORBA_OperationDef *object
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS
                                   ) = 0;
 
                               protected:
@@ -6717,7 +6717,7 @@ public:
 
                                 virtual _TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
                                     CORBA_OperationDef *object
-                                    TAO_ENV_ARG_DECL
+                                    ACE_ENV_ARG_DECL
                                   );
 
                                 private:
@@ -7283,7 +7283,7 @@ public:
                                   static CORBA_InterfaceDef_ptr tao_nil (void);
                                   static CORBA_InterfaceDef_ptr tao_narrow (
                                       CORBA::Object *
-                                      TAO_ENV_ARG_DECL_NOT_USED
+                                      ACE_ENV_ARG_DECL_NOT_USED
                                     );
                                   static CORBA::Object * tao_upcast (void *);
 
@@ -7349,12 +7349,12 @@ public:
 
                                   static CORBA_InterfaceDef_ptr _narrow (
                                       CORBA::Object_ptr obj
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                                   static CORBA_InterfaceDef_ptr _unchecked_narrow (
                                       CORBA::Object_ptr obj
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                                   static CORBA_InterfaceDef_ptr _nil (void)
@@ -7365,7 +7365,7 @@ public:
                                   static void _tao_any_destructor (void*);
 
                                   virtual CORBA_InterfaceDefSeq * base_interfaces (
-                                      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7373,7 +7373,7 @@ public:
 
                                   virtual void base_interfaces (
                                       const CORBA_InterfaceDefSeq & base_interfaces
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7381,7 +7381,7 @@ public:
 
                                   virtual CORBA::Boolean is_a (
                                       const char * interface_id
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7462,7 +7462,7 @@ public:
                                   static CORBA::TypeCode_ptr _tc_FullInterfaceDescription;
 
                                   virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-                                      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7474,7 +7474,7 @@ public:
                                       const char * version,
                                       CORBA_IDLType_ptr type,
                                       CORBA::AttributeMode mode
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7489,7 +7489,7 @@ public:
                                       const CORBA_ParDescriptionSeq & params,
                                       const CORBA_ExceptionDefSeq & exceptions,
                                       const CORBA_ContextIdSeq & contexts
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7497,7 +7497,7 @@ public:
 
                                   virtual CORBA::Boolean _is_a (
                                       const CORBA::Char *type_id
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                                   virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -7549,7 +7549,7 @@ public:
                                   virtual ~_TAO_CORBA_InterfaceDef_Proxy_Impl (void) { }
                                   virtual CORBA_InterfaceDefSeq * base_interfaces (
                                       CORBA_Object *_collocated_tao_target_
-                                      TAO_ENV_ARG_DECL
+                                      ACE_ENV_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7558,7 +7558,7 @@ public:
                                   virtual void base_interfaces (
                                       CORBA_Object *_collocated_tao_target_,
                                       const CORBA_InterfaceDefSeq & base_interfaces
-                                      TAO_ENV_ARG_DECL
+                                      ACE_ENV_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7567,7 +7567,7 @@ public:
                                   virtual CORBA::Boolean is_a (
                                       CORBA_Object *_collocated_tao_target_,
                                       const char * interface_id
-                                      TAO_ENV_ARG_DECL
+                                      ACE_ENV_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7575,7 +7575,7 @@ public:
 
                                   virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
                                       CORBA_Object *_collocated_tao_target_
-                                      TAO_ENV_ARG_DECL
+                                      ACE_ENV_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7588,7 +7588,7 @@ public:
                                       const char * version,
                                       CORBA_IDLType_ptr type,
                                       CORBA::AttributeMode mode
-                                      TAO_ENV_ARG_DECL
+                                      ACE_ENV_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7604,7 +7604,7 @@ public:
                                       const CORBA_ParDescriptionSeq & params,
                                       const CORBA_ExceptionDefSeq & exceptions,
                                       const CORBA_ContextIdSeq & contexts
-                                      TAO_ENV_ARG_DECL
+                                      ACE_ENV_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7637,7 +7637,7 @@ public:
                                   virtual ~_TAO_CORBA_InterfaceDef_Remote_Proxy_Impl (void) { }
                                   virtual CORBA_InterfaceDefSeq * base_interfaces (
                                       CORBA_Object *_collocated_tao_target_
-                                      TAO_ENV_ARG_DECL
+                                      ACE_ENV_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7646,7 +7646,7 @@ public:
                                   virtual void base_interfaces (
                                       CORBA_Object *_collocated_tao_target_,
                                       const CORBA_InterfaceDefSeq & base_interfaces
-                                      TAO_ENV_ARG_DECL
+                                      ACE_ENV_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7655,7 +7655,7 @@ public:
                                   virtual CORBA::Boolean is_a (
                                       CORBA_Object *_collocated_tao_target_,
                                       const char * interface_id
-                                      TAO_ENV_ARG_DECL
+                                      ACE_ENV_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7663,7 +7663,7 @@ public:
 
                                   virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
                                       CORBA_Object *_collocated_tao_target_
-                                      TAO_ENV_ARG_DECL
+                                      ACE_ENV_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7676,7 +7676,7 @@ public:
                                       const char * version,
                                       CORBA_IDLType_ptr type,
                                       CORBA::AttributeMode mode
-                                      TAO_ENV_ARG_DECL
+                                      ACE_ENV_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7692,7 +7692,7 @@ public:
                                       const CORBA_ParDescriptionSeq & params,
                                       const CORBA_ExceptionDefSeq & exceptions,
                                       const CORBA_ContextIdSeq & contexts
-                                      TAO_ENV_ARG_DECL
+                                      ACE_ENV_ARG_DECL
                                     )
                                     ACE_THROW_SPEC ((
                                       CORBA::SystemException
@@ -7721,7 +7721,7 @@ public:
                                   virtual ~_TAO_CORBA_InterfaceDef_Proxy_Broker (void);
                                   virtual _TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
                                       CORBA_InterfaceDef *object
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS
                                     ) = 0;
 
                                 protected:
@@ -7748,7 +7748,7 @@ public:
 
                                   virtual _TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
                                       CORBA_InterfaceDef *object
-                                      TAO_ENV_ARG_DECL
+                                      ACE_ENV_ARG_DECL
                                     );
 
                                   private:
@@ -7879,7 +7879,7 @@ public:
                                     static CORBA_AbstractInterfaceDef_ptr tao_nil (void);
                                     static CORBA_AbstractInterfaceDef_ptr tao_narrow (
                                         CORBA::Object *
-                                        TAO_ENV_ARG_DECL_NOT_USED
+                                        ACE_ENV_ARG_DECL_NOT_USED
                                       );
                                     static CORBA::Object * tao_upcast (void *);
 
@@ -7943,12 +7943,12 @@ public:
 
                                     static CORBA_AbstractInterfaceDef_ptr _narrow (
                                         CORBA::Object_ptr obj
-                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                                     static CORBA_AbstractInterfaceDef_ptr _unchecked_narrow (
                                         CORBA::Object_ptr obj
-                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                                     static CORBA_AbstractInterfaceDef_ptr _nil (void)
@@ -7960,7 +7960,7 @@ public:
 
                                     virtual CORBA::Boolean _is_a (
                                         const CORBA::Char *type_id
-                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                                     virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -8054,7 +8054,7 @@ public:
                                     virtual ~_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker (void);
                                     virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
                                         CORBA_AbstractInterfaceDef *object
-                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS
                                       ) = 0;
 
                                   protected:
@@ -8081,7 +8081,7 @@ public:
 
                                     virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
                                         CORBA_AbstractInterfaceDef *object
-                                        TAO_ENV_ARG_DECL
+                                        ACE_ENV_ARG_DECL
                                       );
 
                                     private:
@@ -8143,7 +8143,7 @@ public:
                                       static CORBA_LocalInterfaceDef_ptr tao_nil (void);
                                       static CORBA_LocalInterfaceDef_ptr tao_narrow (
                                           CORBA::Object *
-                                          TAO_ENV_ARG_DECL_NOT_USED
+                                          ACE_ENV_ARG_DECL_NOT_USED
                                         );
                                       static CORBA::Object * tao_upcast (void *);
 
@@ -8207,12 +8207,12 @@ public:
 
                                       static CORBA_LocalInterfaceDef_ptr _narrow (
                                           CORBA::Object_ptr obj
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                                       static CORBA_LocalInterfaceDef_ptr _unchecked_narrow (
                                           CORBA::Object_ptr obj
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                                       static CORBA_LocalInterfaceDef_ptr _nil (void)
@@ -8224,7 +8224,7 @@ public:
 
                                       virtual CORBA::Boolean _is_a (
                                           const CORBA::Char *type_id
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                                       virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -8318,7 +8318,7 @@ public:
                                       virtual ~_TAO_CORBA_LocalInterfaceDef_Proxy_Broker (void);
                                       virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
                                           CORBA_LocalInterfaceDef *object
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS
                                         ) = 0;
 
                                     protected:
@@ -8345,7 +8345,7 @@ public:
 
                                       virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
                                           CORBA_LocalInterfaceDef *object
-                                          TAO_ENV_ARG_DECL
+                                          ACE_ENV_ARG_DECL
                                         );
 
                                       private:
@@ -8503,7 +8503,7 @@ public:
                                       CORBA_FixedDef_ptr
                                       tao_CORBA_FixedDef_narrow (
                                           CORBA::Object *
-                                          TAO_ENV_ARG_DECL_NOT_USED
+                                          ACE_ENV_ARG_DECL_NOT_USED
                                         );
                                       TAO_IFR_Client_Export
                                       CORBA::Object *
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index da828bfc82d..e2c6db87cb6 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -41,12 +41,12 @@ CORBA_InterfaceDef_ptr
 TAO_IFR_Client_Adapter_Impl::get_interface (
     CORBA::ORB_ptr orb,
     const char *repo_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   CORBA::Object_var obj =
     orb->resolve_initial_references ("InterfaceRepository"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
   if (CORBA::is_nil (obj.in ()))
@@ -57,7 +57,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
 
   CORBA_Repository_var repo =
     CORBA_Repository::_narrow (obj.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
   if (CORBA::is_nil (repo.in ()))
@@ -67,7 +67,7 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
     }
 
   CORBA_Contained_var result = repo->lookup_id (repo_id
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
   if (CORBA::is_nil (result.in ()))
@@ -77,14 +77,14 @@ TAO_IFR_Client_Adapter_Impl::get_interface (
   else
     {
       return CORBA_InterfaceDef::_narrow (result.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
     }
 }
 
 CORBA_InterfaceDef_ptr
 TAO_IFR_Client_Adapter_Impl::get_interface_remote (
     const CORBA::Object_ptr target
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   CORBA_InterfaceDef_ptr _tao_retval = CORBA_InterfaceDef::_nil ();
@@ -112,17 +112,17 @@ TAO_IFR_Client_Adapter_Impl::get_interface_remote (
 
       for (;;)
         {
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
 
           _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag)
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           int _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (_invoke_status == TAO_INVOKE_RESTART)
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
index d8f93d930bf..34fa0f893f9 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
@@ -56,12 +56,12 @@ public:
   virtual CORBA_InterfaceDef_ptr get_interface (
       CORBA::ORB_ptr orb,
       const char *repo_id
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual CORBA_InterfaceDef_ptr get_interface_remote (
       const CORBA::Object_ptr target
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   // Used to force the initialization of the ORB code.
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index c5bc53db81d..9ec1ebfc03a 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -350,11 +350,11 @@ void
 IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   IR::ComponentDef **tmp = ACE_static_cast (IR::ComponentDef**, target);
-  *tmp = IR::ComponentDef::_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = IR::ComponentDef::_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -547,11 +547,11 @@ void
 IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   IR::ProvidesDef **tmp = ACE_static_cast (IR::ProvidesDef**, target);
-  *tmp = IR::ProvidesDef::_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = IR::ProvidesDef::_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -743,11 +743,11 @@ void
 IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   IR::UsesDef **tmp = ACE_static_cast (IR::UsesDef**, target);
-  *tmp = IR::UsesDef::_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = IR::UsesDef::_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -935,11 +935,11 @@ void
 IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   IR::HomeDef **tmp = ACE_static_cast (IR::HomeDef**, target);
-  *tmp = IR::HomeDef::_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = IR::HomeDef::_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1127,11 +1127,11 @@ void
 IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   IR::EmitsDef **tmp = ACE_static_cast (IR::EmitsDef**, target);
-  *tmp = IR::EmitsDef::_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = IR::EmitsDef::_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1320,11 +1320,11 @@ void
 IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   IR::PublishesDef **tmp = ACE_static_cast (IR::PublishesDef**, target);
-  *tmp = IR::PublishesDef::_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = IR::PublishesDef::_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1517,11 +1517,11 @@ void
 IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   IR::ConsumesDef **tmp = ACE_static_cast (IR::ConsumesDef**, target);
-  *tmp = IR::ConsumesDef::_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = IR::ConsumesDef::_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1713,11 +1713,11 @@ void
 IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   IR::FactoryDef **tmp = ACE_static_cast (IR::FactoryDef**, target);
-  *tmp = IR::FactoryDef::_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = IR::FactoryDef::_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1909,11 +1909,11 @@ void
 IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   IR::FinderDef **tmp = ACE_static_cast (IR::FinderDef**, target);
-  *tmp = IR::FinderDef::_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = IR::FinderDef::_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -2057,10 +2057,10 @@ tao_IR_ComponentRepository_nil (
 IR::ComponentRepository_ptr
 tao_IR_ComponentRepository_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IR::ComponentRepository::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IR::ComponentRepository::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2184,10 +2184,10 @@ IR::ComponentRepository_var::tao_nil (void)
 ::IR::ComponentRepository_ptr
 IR::ComponentRepository_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::ComponentRepository::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IR::ComponentRepository::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2270,21 +2270,21 @@ public:
       const char * version,
       IR::ComponentDef_ptr base_component,
       const CORBA_InterfaceDefSeq & supports_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2310,7 +2310,7 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequest
     const char * version,
     IR::ComponentDef_ptr base_component,
     const CORBA_InterfaceDefSeq & supports_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -2321,12 +2321,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2354,12 +2354,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (TAO_EN
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -2367,13 +2367,13 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (TAO_E
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2401,21 +2401,21 @@ public:
       IR::HomeDef_ptr base_home,
       IR::ComponentDef_ptr managed_component,
       CORBA_ValueDef_ptr primary_key
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2443,7 +2443,7 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -2455,12 +2455,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2491,12 +2491,12 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (TAO_ENV_SIN
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -2504,13 +2504,13 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (TAO_ENV_SI
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2547,7 +2547,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
     const char * version,
     IR::ComponentDef_ptr base_component,
     const CORBA_InterfaceDefSeq & supports_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2595,7 +2595,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
         version,
         base_component,
         supports_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2611,7 +2611,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2623,12 +2623,12 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -2646,7 +2646,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2663,7 +2663,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2691,7 +2691,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2701,12 +2701,12 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2717,7 +2717,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2739,7 +2739,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2788,7 +2788,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
         base_home,
         managed_component,
         primary_key
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2804,7 +2804,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2816,12 +2816,12 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -2840,7 +2840,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2857,7 +2857,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2885,7 +2885,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2895,12 +2895,12 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2911,7 +2911,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2966,7 +2966,7 @@ IR::_TAO_ComponentRepository_Remote_Proxy_Broker::~_TAO_ComponentRepository_Remo
 IR::_TAO_ComponentRepository_Proxy_Impl&
 IR::_TAO_ComponentRepository_Remote_Proxy_Broker::select_proxy (
   ::IR::ComponentRepository *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -3009,24 +3009,24 @@ void IR::ComponentRepository::_tao_any_destructor (void *_tao_void_pointer)
 
 IR::ComponentRepository_ptr IR::ComponentRepository::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ComponentRepository::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentRepository:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentRepository:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ComponentRepository::_nil ());
       if (is_a == 0)
         return ComponentRepository::_nil ();
     }
-  return ComponentRepository::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ComponentRepository::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IR::ComponentRepository_ptr IR::ComponentRepository::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3081,7 +3081,7 @@ IR::ComponentRepository::_duplicate (ComponentRepository_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::ComponentRepository::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean IR::ComponentRepository::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentRepository:1.0")) ||
@@ -3091,7 +3091,7 @@ CORBA::Boolean IR::ComponentRepository::_is_a (const CORBA::Char *value TAO_ENV_
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *IR::ComponentRepository::_tao_QueryInterface (ptr_arith_t type)
@@ -3157,14 +3157,14 @@ IR::ComponentDef_ptr IR::ComponentRepository::create_component (
     const char * version,
     IR::ComponentDef_ptr base_component,
     const CORBA_InterfaceDefSeq & supports_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentRepository_Proxy_Impl &proxy =
-    this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_component (
@@ -3174,7 +3174,7 @@ IR::ComponentDef_ptr IR::ComponentRepository::create_component (
       version,
       base_component,
       supports_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3185,14 +3185,14 @@ IR::HomeDef_ptr IR::ComponentRepository::create_home (
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentRepository_Proxy_Impl &proxy =
-    this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_home (
@@ -3203,7 +3203,7 @@ IR::HomeDef_ptr IR::ComponentRepository::create_home (
       base_home,
       managed_component,
       primary_key
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3269,10 +3269,10 @@ tao_IR_ProvidesDef_nil (
 IR::ProvidesDef_ptr
 tao_IR_ProvidesDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IR::ProvidesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IR::ProvidesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3396,10 +3396,10 @@ IR::ProvidesDef_var::tao_nil (void)
 ::IR::ProvidesDef_ptr
 IR::ProvidesDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::ProvidesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IR::ProvidesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3477,21 +3477,21 @@ public:
   TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3507,30 +3507,30 @@ private:
 TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -3538,13 +3538,13 @@ TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (TAO_ENV_SIN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3576,7 +3576,7 @@ IR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void
 
 CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3619,7 +3619,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
       TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -3635,7 +3635,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3647,17 +3647,17 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3674,7 +3674,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3702,7 +3702,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3712,12 +3712,12 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3728,7 +3728,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3783,7 +3783,7 @@ IR::_TAO_ProvidesDef_Remote_Proxy_Broker::~_TAO_ProvidesDef_Remote_Proxy_Broker
 IR::_TAO_ProvidesDef_Proxy_Impl&
 IR::_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
   ::IR::ProvidesDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -3826,24 +3826,24 @@ void IR::ProvidesDef::_tao_any_destructor (void *_tao_void_pointer)
 
 IR::ProvidesDef_ptr IR::ProvidesDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ProvidesDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ProvidesDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ProvidesDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ProvidesDef::_nil ());
       if (is_a == 0)
         return ProvidesDef::_nil ();
     }
-  return ProvidesDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ProvidesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IR::ProvidesDef_ptr IR::ProvidesDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3898,7 +3898,7 @@ IR::ProvidesDef::_duplicate (ProvidesDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::ProvidesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean IR::ProvidesDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ProvidesDef:1.0")) ||
@@ -3907,7 +3907,7 @@ CORBA::Boolean IR::ProvidesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *IR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
@@ -3956,19 +3956,19 @@ const char* IR::ProvidesDef::_interface_repository_id (void) const
 }
 
 CORBA_InterfaceDef_ptr IR::ProvidesDef::interface_type (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ProvidesDef_Proxy_Impl &proxy =
-    this->the_TAO_ProvidesDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ProvidesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.interface_type (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -4186,10 +4186,10 @@ tao_IR_UsesDef_nil (
 IR::UsesDef_ptr
 tao_IR_UsesDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IR::UsesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IR::UsesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4313,10 +4313,10 @@ IR::UsesDef_var::tao_nil (void)
 ::IR::UsesDef_ptr
 IR::UsesDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::UsesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IR::UsesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4394,21 +4394,21 @@ public:
   TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4424,30 +4424,30 @@ private:
 TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4455,13 +4455,13 @@ TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4483,21 +4483,21 @@ public:
   TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4513,30 +4513,30 @@ private:
 TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4544,13 +4544,13 @@ TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (TAO_ENV_SINGLE_ARG
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4582,7 +4582,7 @@ IR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
 
 CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4625,7 +4625,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
       TAO_ClientRequestInfo_IR_UsesDef_interface_type_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -4641,7 +4641,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4653,17 +4653,17 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4680,7 +4680,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4708,7 +4708,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4718,12 +4718,12 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4734,7 +4734,7 @@ CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4750,7 +4750,7 @@ return _tao_safe_retval._retn ();
 
 CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4792,7 +4792,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
       TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -4808,7 +4808,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4820,17 +4820,17 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4847,7 +4847,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4874,7 +4874,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4884,12 +4884,12 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4900,7 +4900,7 @@ CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4955,7 +4955,7 @@ IR::_TAO_UsesDef_Remote_Proxy_Broker::~_TAO_UsesDef_Remote_Proxy_Broker (void)
 IR::_TAO_UsesDef_Proxy_Impl&
 IR::_TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
   ::IR::UsesDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -4998,24 +4998,24 @@ void IR::UsesDef::_tao_any_destructor (void *_tao_void_pointer)
 
 IR::UsesDef_ptr IR::UsesDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return UsesDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UsesDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UsesDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (UsesDef::_nil ());
       if (is_a == 0)
         return UsesDef::_nil ();
     }
-  return UsesDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return UsesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IR::UsesDef_ptr IR::UsesDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -5070,7 +5070,7 @@ IR::UsesDef::_duplicate (UsesDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::UsesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean IR::UsesDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UsesDef:1.0")) ||
@@ -5079,7 +5079,7 @@ CORBA::Boolean IR::UsesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *IR::UsesDef::_tao_QueryInterface (ptr_arith_t type)
@@ -5128,36 +5128,36 @@ const char* IR::UsesDef::_interface_repository_id (void) const
 }
 
 CORBA_InterfaceDef_ptr IR::UsesDef::interface_type (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_UsesDef_Proxy_Impl &proxy =
-    this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.interface_type (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean IR::UsesDef::is_multiple (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_UsesDef_Proxy_Impl &proxy =
-    this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_multiple (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5919,10 +5919,10 @@ tao_IR_EventDef_nil (
 IR::EventDef_ptr
 tao_IR_EventDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IR::EventDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IR::EventDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -6046,10 +6046,10 @@ IR::EventDef_var::tao_nil (void)
 ::IR::EventDef_ptr
 IR::EventDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::EventDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IR::EventDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -6128,21 +6128,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * event_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6160,19 +6160,19 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::TAO_ClientRequestInfo_IR_EventDef_is_a (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * event_id
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     event_id_ (event_id)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6188,12 +6188,12 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6201,13 +6201,13 @@ TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_EventDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_EventDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6229,21 +6229,21 @@ public:
   TAO_ClientRequestInfo_IR_EventDef_event_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -6259,30 +6259,30 @@ private:
 TAO_ClientRequestInfo_IR_EventDef_event_get::TAO_ClientRequestInfo_IR_EventDef_event_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -6290,13 +6290,13 @@ TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (TAO_ENV_SINGLE_ARG_DECL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_EventDef_event_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_EventDef_event_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6329,7 +6329,7 @@ IR::_TAO_EventDef_Remote_Proxy_Impl::_TAO_EventDef_Remote_Proxy_Impl (void)
 CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
     const char * event_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6372,7 +6372,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
         &_tao_call,
         _collocated_tao_target_,
         event_id
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -6388,7 +6388,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6400,12 +6400,12 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
@@ -6419,7 +6419,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6436,7 +6436,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6463,7 +6463,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6473,12 +6473,12 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6489,7 +6489,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6505,7 +6505,7 @@ return _tao_retval;
 
 CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6548,7 +6548,7 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
       TAO_ClientRequestInfo_IR_EventDef_event_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -6564,7 +6564,7 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6576,17 +6576,17 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6603,7 +6603,7 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6631,7 +6631,7 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6641,12 +6641,12 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6657,7 +6657,7 @@ CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6712,7 +6712,7 @@ IR::_TAO_EventDef_Remote_Proxy_Broker::~_TAO_EventDef_Remote_Proxy_Broker (void)
 IR::_TAO_EventDef_Proxy_Impl&
 IR::_TAO_EventDef_Remote_Proxy_Broker::select_proxy (
   ::IR::EventDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -6755,24 +6755,24 @@ void IR::EventDef::_tao_any_destructor (void *_tao_void_pointer)
 
 IR::EventDef_ptr IR::EventDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return EventDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EventDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EventDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (EventDef::_nil ());
       if (is_a == 0)
         return EventDef::_nil ();
     }
-  return EventDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return EventDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IR::EventDef_ptr IR::EventDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -6827,7 +6827,7 @@ IR::EventDef::_duplicate (EventDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::EventDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean IR::EventDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
@@ -6836,7 +6836,7 @@ CORBA::Boolean IR::EventDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *IR::EventDef::_tao_QueryInterface (ptr_arith_t type)
@@ -6886,37 +6886,37 @@ const char* IR::EventDef::_interface_repository_id (void) const
 
 CORBA::Boolean IR::EventDef::is_a (
     const char * event_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_EventDef_Proxy_Impl &proxy =
-    this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_a (
       this,
       event_id
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ValueDef_ptr IR::EventDef::event (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_EventDef_Proxy_Impl &proxy =
-    this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.event (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -7128,10 +7128,10 @@ tao_IR_EmitsDef_nil (
 IR::EmitsDef_ptr
 tao_IR_EmitsDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IR::EmitsDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IR::EmitsDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -7255,10 +7255,10 @@ IR::EmitsDef_var::tao_nil (void)
 ::IR::EmitsDef_ptr
 IR::EmitsDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::EmitsDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IR::EmitsDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -7385,7 +7385,7 @@ IR::_TAO_EmitsDef_Remote_Proxy_Broker::~_TAO_EmitsDef_Remote_Proxy_Broker (void)
 IR::_TAO_EmitsDef_Proxy_Impl&
 IR::_TAO_EmitsDef_Remote_Proxy_Broker::select_proxy (
   ::IR::EmitsDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -7428,24 +7428,24 @@ void IR::EmitsDef::_tao_any_destructor (void *_tao_void_pointer)
 
 IR::EmitsDef_ptr IR::EmitsDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return EmitsDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EmitsDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EmitsDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (EmitsDef::_nil ());
       if (is_a == 0)
         return EmitsDef::_nil ();
     }
-  return EmitsDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return EmitsDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IR::EmitsDef_ptr IR::EmitsDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -7500,7 +7500,7 @@ IR::EmitsDef::_duplicate (EmitsDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::EmitsDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean IR::EmitsDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EmitsDef:1.0")) ||
@@ -7510,7 +7510,7 @@ CORBA::Boolean IR::EmitsDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *IR::EmitsDef::_tao_QueryInterface (ptr_arith_t type)
@@ -7627,10 +7627,10 @@ tao_IR_PublishesDef_nil (
 IR::PublishesDef_ptr
 tao_IR_PublishesDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IR::PublishesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IR::PublishesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -7754,10 +7754,10 @@ IR::PublishesDef_var::tao_nil (void)
 ::IR::PublishesDef_ptr
 IR::PublishesDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::PublishesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IR::PublishesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -7884,7 +7884,7 @@ IR::_TAO_PublishesDef_Remote_Proxy_Broker::~_TAO_PublishesDef_Remote_Proxy_Broke
 IR::_TAO_PublishesDef_Proxy_Impl&
 IR::_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
   ::IR::PublishesDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -7927,24 +7927,24 @@ void IR::PublishesDef::_tao_any_destructor (void *_tao_void_pointer)
 
 IR::PublishesDef_ptr IR::PublishesDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return PublishesDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PublishesDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PublishesDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (PublishesDef::_nil ());
       if (is_a == 0)
         return PublishesDef::_nil ();
     }
-  return PublishesDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return PublishesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IR::PublishesDef_ptr IR::PublishesDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -7999,7 +7999,7 @@ IR::PublishesDef::_duplicate (PublishesDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::PublishesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean IR::PublishesDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) ||
@@ -8009,7 +8009,7 @@ CORBA::Boolean IR::PublishesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DEC
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *IR::PublishesDef::_tao_QueryInterface (ptr_arith_t type)
@@ -8128,10 +8128,10 @@ tao_IR_ConsumesDef_nil (
 IR::ConsumesDef_ptr
 tao_IR_ConsumesDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IR::ConsumesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IR::ConsumesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -8255,10 +8255,10 @@ IR::ConsumesDef_var::tao_nil (void)
 ::IR::ConsumesDef_ptr
 IR::ConsumesDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::ConsumesDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IR::ConsumesDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -8385,7 +8385,7 @@ IR::_TAO_ConsumesDef_Remote_Proxy_Broker::~_TAO_ConsumesDef_Remote_Proxy_Broker
 IR::_TAO_ConsumesDef_Proxy_Impl&
 IR::_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
   ::IR::ConsumesDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -8428,24 +8428,24 @@ void IR::ConsumesDef::_tao_any_destructor (void *_tao_void_pointer)
 
 IR::ConsumesDef_ptr IR::ConsumesDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ConsumesDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConsumesDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConsumesDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ConsumesDef::_nil ());
       if (is_a == 0)
         return ConsumesDef::_nil ();
     }
-  return ConsumesDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ConsumesDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IR::ConsumesDef_ptr IR::ConsumesDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -8500,7 +8500,7 @@ IR::ConsumesDef::_duplicate (ConsumesDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::ConsumesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean IR::ConsumesDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConsumesDef:1.0")) ||
@@ -8510,7 +8510,7 @@ CORBA::Boolean IR::ConsumesDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *IR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
@@ -8628,10 +8628,10 @@ tao_IR_ComponentDef_nil (
 IR::ComponentDef_ptr
 tao_IR_ComponentDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IR::ComponentDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IR::ComponentDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -8755,10 +8755,10 @@ IR::ComponentDef_var::tao_nil (void)
 ::IR::ComponentDef_ptr
 IR::ComponentDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::ComponentDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IR::ComponentDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -8836,21 +8836,21 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -8866,30 +8866,30 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -8897,13 +8897,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (TAO_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -8926,21 +8926,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_InterfaceDefSeq & supported_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -8956,19 +8956,19 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ClientReques
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     supported_interfaces_ (supported_interfaces)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -8984,12 +8984,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (TAO_E
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -8997,13 +8997,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (TAO_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -9015,21 +9015,21 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -9045,30 +9045,30 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -9076,13 +9076,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (TAO_ENV_SI
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9104,21 +9104,21 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -9134,30 +9134,30 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -9165,13 +9165,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (TAO_E
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9193,21 +9193,21 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -9223,30 +9223,30 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -9254,13 +9254,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (TAO_ENV_S
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9282,21 +9282,21 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -9312,30 +9312,30 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -9343,13 +9343,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (TAO_ENV_SING
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9371,21 +9371,21 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -9401,30 +9401,30 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -9432,13 +9432,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (TAO_ENV_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9460,21 +9460,21 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -9490,30 +9490,30 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -9521,13 +9521,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (TAO_ENV_S
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9549,21 +9549,21 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -9579,30 +9579,30 @@ private:
 TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -9610,13 +9610,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (TAO_ENV_SINGLE_A
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9642,21 +9642,21 @@ public:
       const char * name,
       const char * version,
       CORBA_InterfaceDef_ptr interface_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -9680,7 +9680,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -9690,12 +9690,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -9720,12 +9720,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -9733,13 +9733,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9766,21 +9766,21 @@ public:
       const char * version,
       CORBA_InterfaceDef_ptr interface_type,
       const CORBA::Boolean & is_multiple
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -9806,7 +9806,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_Comp
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
     const CORBA::Boolean & is_multiple
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -9817,12 +9817,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_Comp
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -9850,12 +9850,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (TAO_ENV_SINGLE_ARG
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -9863,13 +9863,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (TAO_ENV_SINGLE_AR
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9895,21 +9895,21 @@ public:
       const char * name,
       const char * version,
       CORBA_ValueDef_ptr value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -9933,7 +9933,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_IR_Com
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -9943,12 +9943,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_IR_Com
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -9973,12 +9973,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (TAO_ENV_SINGLE_AR
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -9986,13 +9986,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (TAO_ENV_SINGLE_A
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -10018,21 +10018,21 @@ public:
       const char * name,
       const char * version,
       CORBA_ValueDef_ptr value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -10056,7 +10056,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -10066,12 +10066,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -10096,12 +10096,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (TAO_ENV_SINGL
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -10109,13 +10109,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (TAO_ENV_SING
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -10141,21 +10141,21 @@ public:
       const char * name,
       const char * version,
       CORBA_ValueDef_ptr value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -10179,7 +10179,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -10189,12 +10189,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -10219,12 +10219,12 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -10232,13 +10232,13 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -10270,7 +10270,7 @@ IR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (vo
 
 CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10314,7 +10314,7 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
       TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -10330,7 +10330,7 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10342,17 +10342,17 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10369,7 +10369,7 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10397,7 +10397,7 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10407,12 +10407,12 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10423,7 +10423,7 @@ CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inter
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -10440,7 +10440,7 @@ return _tao_safe_retval._retn ();
 void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10483,7 +10483,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
         &_tao_call,
         _collocated_tao_target_,
         supported_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -10499,7 +10499,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10511,12 +10511,12 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -10529,7 +10529,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10545,7 +10545,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10559,7 +10559,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10569,12 +10569,12 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10585,7 +10585,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -10601,7 +10601,7 @@ void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
 
 IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10644,7 +10644,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
       TAO_ClientRequestInfo_IR_ComponentDef_base_component_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -10660,7 +10660,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10672,17 +10672,17 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10699,7 +10699,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10727,7 +10727,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10737,12 +10737,12 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10753,7 +10753,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -10769,7 +10769,7 @@ return _tao_safe_retval._retn ();
 
 IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10813,7 +10813,7 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
       TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -10829,7 +10829,7 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10841,17 +10841,17 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -10868,7 +10868,7 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -10896,7 +10896,7 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -10906,12 +10906,12 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10922,7 +10922,7 @@ IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interface
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -10938,7 +10938,7 @@ return _tao_safe_retval._retn ();
 
 IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10982,7 +10982,7 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
       TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -10998,7 +10998,7 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11010,17 +11010,17 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11037,7 +11037,7 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11065,7 +11065,7 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11075,12 +11075,12 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11091,7 +11091,7 @@ IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11107,7 +11107,7 @@ return _tao_safe_retval._retn ();
 
 IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11151,7 +11151,7 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
       TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -11167,7 +11167,7 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11179,17 +11179,17 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11206,7 +11206,7 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11234,7 +11234,7 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11244,12 +11244,12 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11260,7 +11260,7 @@ IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11276,7 +11276,7 @@ return _tao_safe_retval._retn ();
 
 IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11320,7 +11320,7 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
       TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -11336,7 +11336,7 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11348,17 +11348,17 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11375,7 +11375,7 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11403,7 +11403,7 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11413,12 +11413,12 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11429,7 +11429,7 @@ IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11445,7 +11445,7 @@ return _tao_safe_retval._retn ();
 
 IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11489,7 +11489,7 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
       TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -11505,7 +11505,7 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11517,17 +11517,17 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11544,7 +11544,7 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11572,7 +11572,7 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11582,12 +11582,12 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11598,7 +11598,7 @@ IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11614,7 +11614,7 @@ return _tao_safe_retval._retn ();
 
 CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11656,7 +11656,7 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
       TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -11672,7 +11672,7 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11684,17 +11684,17 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11711,7 +11711,7 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11738,7 +11738,7 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11748,12 +11748,12 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11764,7 +11764,7 @@ CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11784,7 +11784,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11831,7 +11831,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
         name,
         version,
         interface_type
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -11847,7 +11847,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11859,12 +11859,12 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -11881,7 +11881,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11898,7 +11898,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11926,7 +11926,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11936,12 +11936,12 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11952,7 +11952,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11973,7 +11973,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
     CORBA::Boolean is_multiple
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12021,7 +12021,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
         version,
         interface_type,
         is_multiple
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -12037,7 +12037,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12049,12 +12049,12 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -12072,7 +12072,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -12089,7 +12089,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12117,7 +12117,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12127,12 +12127,12 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -12143,7 +12143,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12163,7 +12163,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12210,7 +12210,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
         name,
         version,
         value
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -12226,7 +12226,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12238,12 +12238,12 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -12260,7 +12260,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -12277,7 +12277,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12305,7 +12305,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12315,12 +12315,12 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -12331,7 +12331,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12351,7 +12351,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12398,7 +12398,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
         name,
         version,
         value
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -12414,7 +12414,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12426,12 +12426,12 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -12448,7 +12448,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -12465,7 +12465,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12493,7 +12493,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12503,12 +12503,12 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -12519,7 +12519,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12539,7 +12539,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12586,7 +12586,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
         name,
         version,
         value
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -12602,7 +12602,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12614,12 +12614,12 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -12636,7 +12636,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -12653,7 +12653,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -12681,7 +12681,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -12691,12 +12691,12 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -12707,7 +12707,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -12762,7 +12762,7 @@ IR::_TAO_ComponentDef_Remote_Proxy_Broker::~_TAO_ComponentDef_Remote_Proxy_Broke
 IR::_TAO_ComponentDef_Proxy_Impl&
 IR::_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
   ::IR::ComponentDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -12805,24 +12805,24 @@ void IR::ComponentDef::_tao_any_destructor (void *_tao_void_pointer)
 
 IR::ComponentDef_ptr IR::ComponentDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ComponentDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ComponentDef::_nil ());
       if (is_a == 0)
         return ComponentDef::_nil ();
     }
-  return ComponentDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ComponentDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IR::ComponentDef_ptr IR::ComponentDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -12877,7 +12877,7 @@ IR::ComponentDef::_duplicate (ComponentDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::ComponentDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean IR::ComponentDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) ||
@@ -12889,7 +12889,7 @@ CORBA::Boolean IR::ComponentDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DEC
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *IR::ComponentDef::_tao_QueryInterface (ptr_arith_t type)
@@ -12974,157 +12974,157 @@ const char* IR::ComponentDef::_interface_repository_id (void) const
 }
 
 CORBA_InterfaceDefSeq * IR::ComponentDef::supported_interfaces (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.supported_interfaces (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void IR::ComponentDef::supported_interfaces (
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.supported_interfaces (
       this,
       supported_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 IR::ComponentDef_ptr IR::ComponentDef::base_component (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.base_component (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 IR::ProvidesDefSeq * IR::ComponentDef::provides_interfaces (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.provides_interfaces (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 IR::UsesDefSeq * IR::ComponentDef::uses_interfaces (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.uses_interfaces (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 IR::EmitsDefSeq * IR::ComponentDef::emits_events (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.emits_events (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 IR::PublishesDefSeq * IR::ComponentDef::publishes_events (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.publishes_events (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 IR::ConsumesDefSeq * IR::ComponentDef::consumes_events (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.consumes_events (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean IR::ComponentDef::is_basic (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_basic (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -13133,14 +13133,14 @@ IR::ProvidesDef_ptr IR::ComponentDef::create_provides (
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_provides (
@@ -13149,7 +13149,7 @@ IR::ProvidesDef_ptr IR::ComponentDef::create_provides (
       name,
       version,
       interface_type
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -13159,14 +13159,14 @@ IR::UsesDef_ptr IR::ComponentDef::create_uses (
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
     CORBA::Boolean is_multiple
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_uses (
@@ -13176,7 +13176,7 @@ IR::UsesDef_ptr IR::ComponentDef::create_uses (
       version,
       interface_type,
       is_multiple
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -13185,14 +13185,14 @@ IR::EmitsDef_ptr IR::ComponentDef::create_emits (
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_emits (
@@ -13201,7 +13201,7 @@ IR::EmitsDef_ptr IR::ComponentDef::create_emits (
       name,
       version,
       value
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -13210,14 +13210,14 @@ IR::PublishesDef_ptr IR::ComponentDef::create_publishes (
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_publishes (
@@ -13226,7 +13226,7 @@ IR::PublishesDef_ptr IR::ComponentDef::create_publishes (
       name,
       version,
       value
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -13235,14 +13235,14 @@ IR::ConsumesDef_ptr IR::ComponentDef::create_consumes (
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ComponentDef_Proxy_Impl &proxy =
-    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_consumes (
@@ -13251,7 +13251,7 @@ IR::ConsumesDef_ptr IR::ComponentDef::create_consumes (
       name,
       version,
       value
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -14248,10 +14248,10 @@ tao_IR_PrimaryKeyDef_nil (
 IR::PrimaryKeyDef_ptr
 tao_IR_PrimaryKeyDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IR::PrimaryKeyDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IR::PrimaryKeyDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -14375,10 +14375,10 @@ IR::PrimaryKeyDef_var::tao_nil (void)
 ::IR::PrimaryKeyDef_ptr
 IR::PrimaryKeyDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::PrimaryKeyDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IR::PrimaryKeyDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -14457,21 +14457,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * primary_key_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -14489,19 +14489,19 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ClientRequestInfo_IR_PrimaryKey
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * primary_key_id
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     primary_key_id_ (primary_key_id)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -14517,12 +14517,12 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -14530,13 +14530,13 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -14558,21 +14558,21 @@ public:
   TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -14588,30 +14588,30 @@ private:
 TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -14619,13 +14619,13 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (TAO_ENV_SING
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -14658,7 +14658,7 @@ IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::_TAO_PrimaryKeyDef_Remote_Proxy_Impl (
 CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
     const char * primary_key_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14701,7 +14701,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
         &_tao_call,
         _collocated_tao_target_,
         primary_key_id
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -14717,7 +14717,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14729,12 +14729,12 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
@@ -14748,7 +14748,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -14765,7 +14765,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -14792,7 +14792,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14802,12 +14802,12 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -14818,7 +14818,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -14834,7 +14834,7 @@ return _tao_retval;
 
 CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14877,7 +14877,7 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
       TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -14893,7 +14893,7 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14905,17 +14905,17 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -14932,7 +14932,7 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -14960,7 +14960,7 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -14970,12 +14970,12 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -14986,7 +14986,7 @@ CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -15041,7 +15041,7 @@ IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::~_TAO_PrimaryKeyDef_Remote_Proxy_Bro
 IR::_TAO_PrimaryKeyDef_Proxy_Impl&
 IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::select_proxy (
   ::IR::PrimaryKeyDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -15084,24 +15084,24 @@ void IR::PrimaryKeyDef::_tao_any_destructor (void *_tao_void_pointer)
 
 IR::PrimaryKeyDef_ptr IR::PrimaryKeyDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return PrimaryKeyDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimaryKeyDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimaryKeyDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (PrimaryKeyDef::_nil ());
       if (is_a == 0)
         return PrimaryKeyDef::_nil ();
     }
-  return PrimaryKeyDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return PrimaryKeyDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IR::PrimaryKeyDef_ptr IR::PrimaryKeyDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -15156,7 +15156,7 @@ IR::PrimaryKeyDef::_duplicate (PrimaryKeyDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::PrimaryKeyDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean IR::PrimaryKeyDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimaryKeyDef:1.0")) ||
@@ -15165,7 +15165,7 @@ CORBA::Boolean IR::PrimaryKeyDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DE
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *IR::PrimaryKeyDef::_tao_QueryInterface (ptr_arith_t type)
@@ -15215,37 +15215,37 @@ const char* IR::PrimaryKeyDef::_interface_repository_id (void) const
 
 CORBA::Boolean IR::PrimaryKeyDef::is_a (
     const char * primary_key_id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_PrimaryKeyDef_Proxy_Impl &proxy =
-    this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_a (
       this,
       primary_key_id
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ValueDef_ptr IR::PrimaryKeyDef::primary_key (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_PrimaryKeyDef_Proxy_Impl &proxy =
-    this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.primary_key (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -15464,10 +15464,10 @@ tao_IR_FactoryDef_nil (
 IR::FactoryDef_ptr
 tao_IR_FactoryDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IR::FactoryDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IR::FactoryDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -15591,10 +15591,10 @@ IR::FactoryDef_var::tao_nil (void)
 ::IR::FactoryDef_ptr
 IR::FactoryDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::FactoryDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IR::FactoryDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -15721,7 +15721,7 @@ IR::_TAO_FactoryDef_Remote_Proxy_Broker::~_TAO_FactoryDef_Remote_Proxy_Broker (v
 IR::_TAO_FactoryDef_Proxy_Impl&
 IR::_TAO_FactoryDef_Remote_Proxy_Broker::select_proxy (
   ::IR::FactoryDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -15764,24 +15764,24 @@ void IR::FactoryDef::_tao_any_destructor (void *_tao_void_pointer)
 
 IR::FactoryDef_ptr IR::FactoryDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return FactoryDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FactoryDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FactoryDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (FactoryDef::_nil ());
       if (is_a == 0)
         return FactoryDef::_nil ();
     }
-  return FactoryDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return FactoryDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IR::FactoryDef_ptr IR::FactoryDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -15836,7 +15836,7 @@ IR::FactoryDef::_duplicate (FactoryDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::FactoryDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean IR::FactoryDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) ||
@@ -15846,7 +15846,7 @@ CORBA::Boolean IR::FactoryDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *IR::FactoryDef::_tao_QueryInterface (ptr_arith_t type)
@@ -15964,10 +15964,10 @@ tao_IR_FinderDef_nil (
 IR::FinderDef_ptr
 tao_IR_FinderDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IR::FinderDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IR::FinderDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -16091,10 +16091,10 @@ IR::FinderDef_var::tao_nil (void)
 ::IR::FinderDef_ptr
 IR::FinderDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::FinderDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IR::FinderDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -16221,7 +16221,7 @@ IR::_TAO_FinderDef_Remote_Proxy_Broker::~_TAO_FinderDef_Remote_Proxy_Broker (voi
 IR::_TAO_FinderDef_Proxy_Impl&
 IR::_TAO_FinderDef_Remote_Proxy_Broker::select_proxy (
   ::IR::FinderDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -16264,24 +16264,24 @@ void IR::FinderDef::_tao_any_destructor (void *_tao_void_pointer)
 
 IR::FinderDef_ptr IR::FinderDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return FinderDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FinderDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FinderDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (FinderDef::_nil ());
       if (is_a == 0)
         return FinderDef::_nil ();
     }
-  return FinderDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return FinderDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IR::FinderDef_ptr IR::FinderDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -16336,7 +16336,7 @@ IR::FinderDef::_duplicate (FinderDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::FinderDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean IR::FinderDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) ||
@@ -16346,7 +16346,7 @@ CORBA::Boolean IR::FinderDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *IR::FinderDef::_tao_QueryInterface (ptr_arith_t type)
@@ -16464,10 +16464,10 @@ tao_IR_HomeDef_nil (
 IR::HomeDef_ptr
 tao_IR_HomeDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IR::HomeDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IR::HomeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -16591,10 +16591,10 @@ IR::HomeDef_var::tao_nil (void)
 ::IR::HomeDef_ptr
 IR::HomeDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IR::HomeDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IR::HomeDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -16672,21 +16672,21 @@ public:
   TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -16702,30 +16702,30 @@ private:
 TAO_ClientRequestInfo_IR_HomeDef_base_home_get::TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -16733,13 +16733,13 @@ TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (TAO_ENV_SINGLE_ARG_D
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -16761,21 +16761,21 @@ public:
   TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -16791,30 +16791,30 @@ private:
 TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -16822,13 +16822,13 @@ TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (TAO_ENV_SING
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -16850,21 +16850,21 @@ public:
   TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -16880,30 +16880,30 @@ private:
 TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -16911,13 +16911,13 @@ TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -16939,21 +16939,21 @@ public:
   TAO_ClientRequestInfo_IR_HomeDef_factories_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -16969,30 +16969,30 @@ private:
 TAO_ClientRequestInfo_IR_HomeDef_factories_get::TAO_ClientRequestInfo_IR_HomeDef_factories_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -17000,13 +17000,13 @@ TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (TAO_ENV_SINGLE_ARG_D
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -17028,21 +17028,21 @@ public:
   TAO_ClientRequestInfo_IR_HomeDef_finders_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -17058,30 +17058,30 @@ private:
 TAO_ClientRequestInfo_IR_HomeDef_finders_get::TAO_ClientRequestInfo_IR_HomeDef_finders_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -17089,13 +17089,13 @@ TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (TAO_ENV_SINGLE_ARG_DEC
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -17117,21 +17117,21 @@ public:
   TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -17147,30 +17147,30 @@ private:
 TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -17178,13 +17178,13 @@ TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DE
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -17210,21 +17210,21 @@ public:
       const char * name,
       const char * version,
       CORBA_ValueDef_ptr primary_key
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -17248,7 +17248,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_IR_Ho
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -17258,12 +17258,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_IR_Ho
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -17288,12 +17288,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -17301,13 +17301,13 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -17334,21 +17334,21 @@ public:
       const char * version,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -17374,7 +17374,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_IR_HomeDe
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -17385,12 +17385,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_IR_HomeDe
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -17418,12 +17418,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (TAO_ENV_SINGLE_ARG_D
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -17431,13 +17431,13 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (TAO_ENV_SINGLE_ARG_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -17464,21 +17464,21 @@ public:
       const char * version,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -17504,7 +17504,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_IR_HomeDef
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -17515,12 +17515,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_IR_HomeDef
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -17548,12 +17548,12 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (TAO_ENV_SINGLE_ARG_DE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -17561,13 +17561,13 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (TAO_ENV_SINGLE_ARG_D
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -17599,7 +17599,7 @@ IR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
 
 IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17642,7 +17642,7 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
       TAO_ClientRequestInfo_IR_HomeDef_base_home_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -17658,7 +17658,7 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17670,17 +17670,17 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -17697,7 +17697,7 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -17725,7 +17725,7 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17735,12 +17735,12 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17751,7 +17751,7 @@ IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -17767,7 +17767,7 @@ return _tao_safe_retval._retn ();
 
 IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17810,7 +17810,7 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
       TAO_ClientRequestInfo_IR_HomeDef_managed_component_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -17826,7 +17826,7 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17838,17 +17838,17 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -17865,7 +17865,7 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -17893,7 +17893,7 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -17903,12 +17903,12 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17919,7 +17919,7 @@ IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -17935,7 +17935,7 @@ return _tao_safe_retval._retn ();
 
 IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17978,7 +17978,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
       TAO_ClientRequestInfo_IR_HomeDef_primary_key_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -17994,7 +17994,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18006,17 +18006,17 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -18033,7 +18033,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18061,7 +18061,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18071,12 +18071,12 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -18087,7 +18087,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18103,7 +18103,7 @@ return _tao_safe_retval._retn ();
 
 IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -18147,7 +18147,7 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
       TAO_ClientRequestInfo_IR_HomeDef_factories_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -18163,7 +18163,7 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18175,17 +18175,17 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -18202,7 +18202,7 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18230,7 +18230,7 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18240,12 +18240,12 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -18256,7 +18256,7 @@ IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18272,7 +18272,7 @@ return _tao_safe_retval._retn ();
 
 IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -18316,7 +18316,7 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
       TAO_ClientRequestInfo_IR_HomeDef_finders_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -18332,7 +18332,7 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18344,17 +18344,17 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -18371,7 +18371,7 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18399,7 +18399,7 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18409,12 +18409,12 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -18425,7 +18425,7 @@ IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18441,7 +18441,7 @@ return _tao_safe_retval._retn ();
 
 CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -18483,7 +18483,7 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
       TAO_ClientRequestInfo_IR_HomeDef_is_basic_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -18499,7 +18499,7 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18511,17 +18511,17 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -18538,7 +18538,7 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18565,7 +18565,7 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18575,12 +18575,12 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -18591,7 +18591,7 @@ CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18611,7 +18611,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -18658,7 +18658,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
         name,
         version,
         primary_key
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -18674,7 +18674,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18686,12 +18686,12 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -18708,7 +18708,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -18725,7 +18725,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18753,7 +18753,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18763,12 +18763,12 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -18779,7 +18779,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18800,7 +18800,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -18848,7 +18848,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
         version,
         params,
         exceptions
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -18864,7 +18864,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18876,12 +18876,12 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -18899,7 +18899,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -18916,7 +18916,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -18944,7 +18944,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -18954,12 +18954,12 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -18970,7 +18970,7 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -18991,7 +18991,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -19039,7 +19039,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
         version,
         params,
         exceptions
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -19055,7 +19055,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19067,12 +19067,12 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -19090,7 +19090,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -19107,7 +19107,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -19135,7 +19135,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -19145,12 +19145,12 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -19161,7 +19161,7 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -19216,7 +19216,7 @@ IR::_TAO_HomeDef_Remote_Proxy_Broker::~_TAO_HomeDef_Remote_Proxy_Broker (void)
 IR::_TAO_HomeDef_Proxy_Impl&
 IR::_TAO_HomeDef_Remote_Proxy_Broker::select_proxy (
   ::IR::HomeDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -19259,24 +19259,24 @@ void IR::HomeDef::_tao_any_destructor (void *_tao_void_pointer)
 
 IR::HomeDef_ptr IR::HomeDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return HomeDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/HomeDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/HomeDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (HomeDef::_nil ());
       if (is_a == 0)
         return HomeDef::_nil ();
     }
-  return HomeDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return HomeDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IR::HomeDef_ptr IR::HomeDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -19331,7 +19331,7 @@ IR::HomeDef::_duplicate (HomeDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean IR::HomeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean IR::HomeDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) ||
@@ -19343,7 +19343,7 @@ CORBA::Boolean IR::HomeDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *IR::HomeDef::_tao_QueryInterface (ptr_arith_t type)
@@ -19428,104 +19428,104 @@ const char* IR::HomeDef::_interface_repository_id (void) const
 }
 
 IR::HomeDef_ptr IR::HomeDef::base_home (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.base_home (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 IR::ComponentDef_ptr IR::HomeDef::managed_component (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.managed_component (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 IR::PrimaryKeyDef_ptr IR::HomeDef::primary_key (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.primary_key (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 IR::FactoryDefSeq * IR::HomeDef::factories (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.factories (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 IR::FinderDefSeq * IR::HomeDef::finders (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.finders (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean IR::HomeDef::is_basic (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_basic (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -19534,14 +19534,14 @@ IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key (
     const char * name,
     const char * version,
     CORBA_ValueDef_ptr primary_key
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_primary_key (
@@ -19550,7 +19550,7 @@ IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key (
       name,
       version,
       primary_key
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -19560,14 +19560,14 @@ IR::FactoryDef_ptr IR::HomeDef::create_factory (
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_factory (
@@ -19577,7 +19577,7 @@ IR::FactoryDef_ptr IR::HomeDef::create_factory (
       version,
       params,
       exceptions
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -19587,14 +19587,14 @@ IR::FinderDef_ptr IR::HomeDef::create_finder (
     const char * version,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_HomeDef_Proxy_Impl &proxy =
-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_finder (
@@ -19604,7 +19604,7 @@ IR::FinderDef_ptr IR::HomeDef::create_finder (
       version,
       params,
       exceptions
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -21017,7 +21017,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::RepositoryIdSe
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_RepositoryIdSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_RepositoryIdSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21108,7 +21108,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ComponentDefSe
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21199,7 +21199,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDefSeq
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21290,7 +21290,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDefSeq *&_
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21381,7 +21381,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::HomeDefSeq *&_
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21472,7 +21472,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EmitsDefSeq *&
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21563,7 +21563,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::PublishesDefSe
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21654,7 +21654,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ConsumesDefSeq
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21745,7 +21745,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::FactoryDefSeq
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21836,7 +21836,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::FinderDefSeq *
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_FinderDefSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_FinderDefSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21905,7 +21905,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentRepository_
     _tao_elem = IR::ComponentRepository::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentRepository TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentRepository ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -21966,7 +21966,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ProvidesDef_ptr &_ta
     _tao_elem = IR::ProvidesDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22041,7 +22041,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDescri
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22110,7 +22110,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UsesDef_ptr &_tao_el
     _tao_elem = IR::UsesDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22185,7 +22185,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDescriptio
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22276,7 +22276,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDescSe
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22367,7 +22367,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDescSeq *&
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22436,7 +22436,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EventDef_ptr &_tao_e
     _tao_elem = IR::EventDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_EventDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_EventDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22511,7 +22511,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EventDescripti
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_EventDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_EventDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22580,7 +22580,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EmitsDef_ptr &_tao_e
     _tao_elem = IR::EmitsDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22641,7 +22641,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PublishesDef_ptr &_t
     _tao_elem = IR::PublishesDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22702,7 +22702,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ConsumesDef_ptr &_ta
     _tao_elem = IR::ConsumesDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22763,7 +22763,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentDef_ptr &_t
     _tao_elem = IR::ComponentDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22838,7 +22838,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ComponentDescr
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22907,7 +22907,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimaryKeyDef_ptr &_
     _tao_elem = IR::PrimaryKeyDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -22982,7 +22982,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::PrimaryKeyDesc
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -23051,7 +23051,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FactoryDef_ptr &_tao
     _tao_elem = IR::FactoryDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -23112,7 +23112,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FinderDef_ptr &_tao_
     _tao_elem = IR::FinderDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_FinderDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_FinderDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -23173,7 +23173,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::HomeDef_ptr &_tao_el
     _tao_elem = IR::HomeDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -23248,7 +23248,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::HomeDescriptio
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -23737,7 +23737,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       IR::ComponentRepository::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -23773,7 +23773,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       IR::ProvidesDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -23809,7 +23809,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       IR::UsesDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -23929,7 +23929,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       IR::EventDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -23965,7 +23965,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       IR::EmitsDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24001,7 +24001,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       IR::PublishesDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24037,7 +24037,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       IR::ConsumesDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24073,7 +24073,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       IR::ComponentDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24109,7 +24109,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       IR::PrimaryKeyDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24145,7 +24145,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       IR::FactoryDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24181,7 +24181,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       IR::FinderDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -24217,7 +24217,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       IR::HomeDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index 86c1ce37159..3e1daa5eee6 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -227,7 +227,7 @@ TAO_NAMESPACE  IR
     static ComponentDef_ptr tao_nil (void);
     static ComponentDef_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -312,7 +312,7 @@ TAO_NAMESPACE  IR
     virtual void _downcast (
         void* target,
         CORBA_Object *src
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual CORBA_Object* _upcast (void *src) const;
   };
@@ -472,7 +472,7 @@ TAO_NAMESPACE  IR
     static ProvidesDef_ptr tao_nil (void);
     static ProvidesDef_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -557,7 +557,7 @@ TAO_NAMESPACE  IR
     virtual void _downcast (
         void* target,
         CORBA_Object *src
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual CORBA_Object* _upcast (void *src) const;
   };
@@ -717,7 +717,7 @@ TAO_NAMESPACE  IR
     static UsesDef_ptr tao_nil (void);
     static UsesDef_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -802,7 +802,7 @@ TAO_NAMESPACE  IR
     virtual void _downcast (
         void* target,
         CORBA_Object *src
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual CORBA_Object* _upcast (void *src) const;
   };
@@ -962,7 +962,7 @@ TAO_NAMESPACE  IR
     static HomeDef_ptr tao_nil (void);
     static HomeDef_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1047,7 +1047,7 @@ TAO_NAMESPACE  IR
     virtual void _downcast (
         void* target,
         CORBA_Object *src
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual CORBA_Object* _upcast (void *src) const;
   };
@@ -1207,7 +1207,7 @@ TAO_NAMESPACE  IR
     static EventDef_ptr tao_nil (void);
     static EventDef_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1286,7 +1286,7 @@ TAO_NAMESPACE  IR
     static EmitsDef_ptr tao_nil (void);
     static EmitsDef_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1371,7 +1371,7 @@ TAO_NAMESPACE  IR
     virtual void _downcast (
         void* target,
         CORBA_Object *src
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual CORBA_Object* _upcast (void *src) const;
   };
@@ -1531,7 +1531,7 @@ TAO_NAMESPACE  IR
     static PublishesDef_ptr tao_nil (void);
     static PublishesDef_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1616,7 +1616,7 @@ TAO_NAMESPACE  IR
     virtual void _downcast (
         void* target,
         CORBA_Object *src
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual CORBA_Object* _upcast (void *src) const;
   };
@@ -1776,7 +1776,7 @@ TAO_NAMESPACE  IR
     static ConsumesDef_ptr tao_nil (void);
     static ConsumesDef_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1861,7 +1861,7 @@ TAO_NAMESPACE  IR
     virtual void _downcast (
         void* target,
         CORBA_Object *src
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual CORBA_Object* _upcast (void *src) const;
   };
@@ -2021,7 +2021,7 @@ TAO_NAMESPACE  IR
     static FactoryDef_ptr tao_nil (void);
     static FactoryDef_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -2106,7 +2106,7 @@ TAO_NAMESPACE  IR
     virtual void _downcast (
         void* target,
         CORBA_Object *src
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual CORBA_Object* _upcast (void *src) const;
   };
@@ -2266,7 +2266,7 @@ TAO_NAMESPACE  IR
     static FinderDef_ptr tao_nil (void);
     static FinderDef_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -2351,7 +2351,7 @@ TAO_NAMESPACE  IR
     virtual void _downcast (
         void* target,
         CORBA_Object *src
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual CORBA_Object* _upcast (void *src) const;
   };
@@ -2511,7 +2511,7 @@ TAO_NAMESPACE  IR
     static PrimaryKeyDef_ptr tao_nil (void);
     static PrimaryKeyDef_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -2590,7 +2590,7 @@ TAO_NAMESPACE  IR
     static ComponentRepository_ptr tao_nil (void);
     static ComponentRepository_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -2654,12 +2654,12 @@ TAO_NAMESPACE  IR
 
     static ComponentRepository_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ComponentRepository_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ComponentRepository_ptr _nil (void)
@@ -2675,7 +2675,7 @@ TAO_NAMESPACE  IR
         const char * version,
         IR::ComponentDef_ptr base_component,
         const CORBA_InterfaceDefSeq & supports_interfaces
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2688,7 +2688,7 @@ TAO_NAMESPACE  IR
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
         CORBA_ValueDef_ptr primary_key
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2696,7 +2696,7 @@ TAO_NAMESPACE  IR
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -2751,7 +2751,7 @@ TAO_NAMESPACE  IR
         const char * version,
         IR::ComponentDef_ptr base_component,
         const CORBA_InterfaceDefSeq & supports_interfaces
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2765,7 +2765,7 @@ TAO_NAMESPACE  IR
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
         CORBA_ValueDef_ptr primary_key
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2801,7 +2801,7 @@ TAO_NAMESPACE  IR
         const char * version,
         IR::ComponentDef_ptr base_component,
         const CORBA_InterfaceDefSeq & supports_interfaces
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2815,7 +2815,7 @@ TAO_NAMESPACE  IR
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
         CORBA_ValueDef_ptr primary_key
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2844,7 +2844,7 @@ TAO_NAMESPACE  IR
     virtual ~_TAO_ComponentRepository_Proxy_Broker (void);
     virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
         ComponentRepository *object
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
 
   protected:
@@ -2871,7 +2871,7 @@ TAO_NAMESPACE  IR
 
     virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
         ComponentRepository *object
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     private:
@@ -2919,12 +2919,12 @@ TAO_NAMESPACE  IR
 
       static ProvidesDef_ptr _narrow (
           CORBA::Object_ptr obj
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
       static ProvidesDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
       static ProvidesDef_ptr _nil (void)
@@ -2935,7 +2935,7 @@ TAO_NAMESPACE  IR
       static void _tao_any_destructor (void*);
 
       virtual CORBA_InterfaceDef_ptr interface_type (
-          TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -2943,7 +2943,7 @@ TAO_NAMESPACE  IR
 
       virtual CORBA::Boolean _is_a (
           const CORBA::Char *type_id
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
       virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -2993,7 +2993,7 @@ TAO_NAMESPACE  IR
       virtual ~_TAO_ProvidesDef_Proxy_Impl (void) { }
       virtual CORBA_InterfaceDef_ptr interface_type (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -3024,7 +3024,7 @@ TAO_NAMESPACE  IR
       virtual ~_TAO_ProvidesDef_Remote_Proxy_Impl (void) { }
       virtual CORBA_InterfaceDef_ptr interface_type (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -3053,7 +3053,7 @@ TAO_NAMESPACE  IR
       virtual ~_TAO_ProvidesDef_Proxy_Broker (void);
       virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
           ProvidesDef *object
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         ) = 0;
 
     protected:
@@ -3080,7 +3080,7 @@ TAO_NAMESPACE  IR
 
       virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
           ProvidesDef *object
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         );
 
       private:
@@ -3198,12 +3198,12 @@ TAO_NAMESPACE  IR
 
         static UsesDef_ptr _narrow (
             CORBA::Object_ptr obj
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
         static UsesDef_ptr _unchecked_narrow (
             CORBA::Object_ptr obj
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
         static UsesDef_ptr _nil (void)
@@ -3214,14 +3214,14 @@ TAO_NAMESPACE  IR
         static void _tao_any_destructor (void*);
 
         virtual CORBA_InterfaceDef_ptr interface_type (
-            TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+            ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
           ACE_THROW_SPEC ((
             CORBA::SystemException
           ));
 
         virtual CORBA::Boolean is_multiple (
-            TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+            ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -3229,7 +3229,7 @@ TAO_NAMESPACE  IR
 
         virtual CORBA::Boolean _is_a (
             const CORBA::Char *type_id
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
         virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -3279,7 +3279,7 @@ TAO_NAMESPACE  IR
         virtual ~_TAO_UsesDef_Proxy_Impl (void) { }
         virtual CORBA_InterfaceDef_ptr interface_type (
             CORBA_Object *_collocated_tao_target_
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -3287,7 +3287,7 @@ TAO_NAMESPACE  IR
 
         virtual CORBA::Boolean is_multiple (
             CORBA_Object *_collocated_tao_target_
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -3318,7 +3318,7 @@ TAO_NAMESPACE  IR
         virtual ~_TAO_UsesDef_Remote_Proxy_Impl (void) { }
         virtual CORBA_InterfaceDef_ptr interface_type (
             CORBA_Object *_collocated_tao_target_
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -3326,7 +3326,7 @@ TAO_NAMESPACE  IR
 
         virtual CORBA::Boolean is_multiple (
             CORBA_Object *_collocated_tao_target_
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -3355,7 +3355,7 @@ TAO_NAMESPACE  IR
         virtual ~_TAO_UsesDef_Proxy_Broker (void);
         virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
             UsesDef *object
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS
           ) = 0;
 
       protected:
@@ -3382,7 +3382,7 @@ TAO_NAMESPACE  IR
 
         virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
             UsesDef *object
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           );
 
         private:
@@ -3827,12 +3827,12 @@ TAO_NAMESPACE  IR
 
           static EventDef_ptr _narrow (
               CORBA::Object_ptr obj
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
           static EventDef_ptr _unchecked_narrow (
               CORBA::Object_ptr obj
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
           static EventDef_ptr _nil (void)
@@ -3844,14 +3844,14 @@ TAO_NAMESPACE  IR
 
           virtual CORBA::Boolean is_a (
               const char * event_id
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
             ACE_THROW_SPEC ((
               CORBA::SystemException
             ));
 
           virtual CORBA_ValueDef_ptr event (
-              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -3859,7 +3859,7 @@ TAO_NAMESPACE  IR
 
           virtual CORBA::Boolean _is_a (
               const CORBA::Char *type_id
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
           virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -3910,7 +3910,7 @@ TAO_NAMESPACE  IR
           virtual CORBA::Boolean is_a (
               CORBA_Object *_collocated_tao_target_,
               const char * event_id
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -3918,7 +3918,7 @@ TAO_NAMESPACE  IR
 
           virtual CORBA_ValueDef_ptr event (
               CORBA_Object *_collocated_tao_target_
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -3950,7 +3950,7 @@ TAO_NAMESPACE  IR
           virtual CORBA::Boolean is_a (
               CORBA_Object *_collocated_tao_target_,
               const char * event_id
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -3958,7 +3958,7 @@ TAO_NAMESPACE  IR
 
           virtual CORBA_ValueDef_ptr event (
               CORBA_Object *_collocated_tao_target_
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             )
             ACE_THROW_SPEC ((
               CORBA::SystemException
@@ -3987,7 +3987,7 @@ TAO_NAMESPACE  IR
           virtual ~_TAO_EventDef_Proxy_Broker (void);
           virtual _TAO_EventDef_Proxy_Impl &select_proxy (
               EventDef *object
-              TAO_ENV_ARG_DECL_WITH_DEFAULTS
+              ACE_ENV_ARG_DECL_WITH_DEFAULTS
             ) = 0;
 
         protected:
@@ -4014,7 +4014,7 @@ TAO_NAMESPACE  IR
 
           virtual _TAO_EventDef_Proxy_Impl &select_proxy (
               EventDef *object
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
             );
 
           private:
@@ -4132,12 +4132,12 @@ TAO_NAMESPACE  IR
 
             static EmitsDef_ptr _narrow (
                 CORBA::Object_ptr obj
-                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
             static EmitsDef_ptr _unchecked_narrow (
                 CORBA::Object_ptr obj
-                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
             static EmitsDef_ptr _nil (void)
@@ -4149,7 +4149,7 @@ TAO_NAMESPACE  IR
 
             virtual CORBA::Boolean _is_a (
                 const CORBA::Char *type_id
-                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
             virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -4243,7 +4243,7 @@ TAO_NAMESPACE  IR
             virtual ~_TAO_EmitsDef_Proxy_Broker (void);
             virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
                 EmitsDef *object
-                TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS
               ) = 0;
 
           protected:
@@ -4270,7 +4270,7 @@ TAO_NAMESPACE  IR
 
             virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
                 EmitsDef *object
-                TAO_ENV_ARG_DECL
+                ACE_ENV_ARG_DECL
               );
 
             private:
@@ -4318,12 +4318,12 @@ TAO_NAMESPACE  IR
 
               static PublishesDef_ptr _narrow (
                   CORBA::Object_ptr obj
-                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
               static PublishesDef_ptr _unchecked_narrow (
                   CORBA::Object_ptr obj
-                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
               static PublishesDef_ptr _nil (void)
@@ -4335,7 +4335,7 @@ TAO_NAMESPACE  IR
 
               virtual CORBA::Boolean _is_a (
                   const CORBA::Char *type_id
-                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
               virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -4429,7 +4429,7 @@ TAO_NAMESPACE  IR
               virtual ~_TAO_PublishesDef_Proxy_Broker (void);
               virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
                   PublishesDef *object
-                  TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS
                 ) = 0;
 
             protected:
@@ -4456,7 +4456,7 @@ TAO_NAMESPACE  IR
 
               virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
                   PublishesDef *object
-                  TAO_ENV_ARG_DECL
+                  ACE_ENV_ARG_DECL
                 );
 
               private:
@@ -4504,12 +4504,12 @@ TAO_NAMESPACE  IR
 
                 static ConsumesDef_ptr _narrow (
                     CORBA::Object_ptr obj
-                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                 static ConsumesDef_ptr _unchecked_narrow (
                     CORBA::Object_ptr obj
-                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                 static ConsumesDef_ptr _nil (void)
@@ -4521,7 +4521,7 @@ TAO_NAMESPACE  IR
 
                 virtual CORBA::Boolean _is_a (
                     const CORBA::Char *type_id
-                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                 virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -4615,7 +4615,7 @@ TAO_NAMESPACE  IR
                 virtual ~_TAO_ConsumesDef_Proxy_Broker (void);
                 virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
                     ConsumesDef *object
-                    TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS
                   ) = 0;
 
               protected:
@@ -4642,7 +4642,7 @@ TAO_NAMESPACE  IR
 
                 virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
                     ConsumesDef *object
-                    TAO_ENV_ARG_DECL
+                    ACE_ENV_ARG_DECL
                   );
 
                 private:
@@ -4690,12 +4690,12 @@ TAO_NAMESPACE  IR
 
                   static ComponentDef_ptr _narrow (
                       CORBA::Object_ptr obj
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                   static ComponentDef_ptr _unchecked_narrow (
                       CORBA::Object_ptr obj
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                   static ComponentDef_ptr _nil (void)
@@ -4706,7 +4706,7 @@ TAO_NAMESPACE  IR
                   static void _tao_any_destructor (void*);
 
                   virtual CORBA_InterfaceDefSeq * supported_interfaces (
-                      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4714,56 +4714,56 @@ TAO_NAMESPACE  IR
 
                   virtual void supported_interfaces (
                       const CORBA_InterfaceDefSeq & supported_interfaces
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
                     ));
 
                   virtual IR::ComponentDef_ptr base_component (
-                      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
                     ));
 
                   virtual IR::ProvidesDefSeq * provides_interfaces (
-                      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
                     ));
 
                   virtual IR::UsesDefSeq * uses_interfaces (
-                      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
                     ));
 
                   virtual IR::EmitsDefSeq * emits_events (
-                      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
                     ));
 
                   virtual IR::PublishesDefSeq * publishes_events (
-                      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
                     ));
 
                   virtual IR::ConsumesDefSeq * consumes_events (
-                      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
                     ));
 
                   virtual CORBA::Boolean is_basic (
-                      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4774,7 +4774,7 @@ TAO_NAMESPACE  IR
                       const char * name,
                       const char * version,
                       CORBA_InterfaceDef_ptr interface_type
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4786,7 +4786,7 @@ TAO_NAMESPACE  IR
                       const char * version,
                       CORBA_InterfaceDef_ptr interface_type,
                       CORBA::Boolean is_multiple
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4797,7 +4797,7 @@ TAO_NAMESPACE  IR
                       const char * name,
                       const char * version,
                       CORBA_ValueDef_ptr value
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4808,7 +4808,7 @@ TAO_NAMESPACE  IR
                       const char * name,
                       const char * version,
                       CORBA_ValueDef_ptr value
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4819,7 +4819,7 @@ TAO_NAMESPACE  IR
                       const char * name,
                       const char * version,
                       CORBA_ValueDef_ptr value
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4827,7 +4827,7 @@ TAO_NAMESPACE  IR
 
                   virtual CORBA::Boolean _is_a (
                       const CORBA::Char *type_id
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                   virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -4877,7 +4877,7 @@ TAO_NAMESPACE  IR
                   virtual ~_TAO_ComponentDef_Proxy_Impl (void) { }
                   virtual CORBA_InterfaceDefSeq * supported_interfaces (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4886,7 +4886,7 @@ TAO_NAMESPACE  IR
                   virtual void supported_interfaces (
                       CORBA_Object *_collocated_tao_target_,
                       const CORBA_InterfaceDefSeq & supported_interfaces
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4894,7 +4894,7 @@ TAO_NAMESPACE  IR
 
                   virtual IR::ComponentDef_ptr base_component (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4902,7 +4902,7 @@ TAO_NAMESPACE  IR
 
                   virtual IR::ProvidesDefSeq * provides_interfaces (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4910,7 +4910,7 @@ TAO_NAMESPACE  IR
 
                   virtual IR::UsesDefSeq * uses_interfaces (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4918,7 +4918,7 @@ TAO_NAMESPACE  IR
 
                   virtual IR::EmitsDefSeq * emits_events (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4926,7 +4926,7 @@ TAO_NAMESPACE  IR
 
                   virtual IR::PublishesDefSeq * publishes_events (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4934,7 +4934,7 @@ TAO_NAMESPACE  IR
 
                   virtual IR::ConsumesDefSeq * consumes_events (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4942,7 +4942,7 @@ TAO_NAMESPACE  IR
 
                   virtual CORBA::Boolean is_basic (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4954,7 +4954,7 @@ TAO_NAMESPACE  IR
                       const char * name,
                       const char * version,
                       CORBA_InterfaceDef_ptr interface_type
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4967,7 +4967,7 @@ TAO_NAMESPACE  IR
                       const char * version,
                       CORBA_InterfaceDef_ptr interface_type,
                       CORBA::Boolean is_multiple
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4979,7 +4979,7 @@ TAO_NAMESPACE  IR
                       const char * name,
                       const char * version,
                       CORBA_ValueDef_ptr value
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -4991,7 +4991,7 @@ TAO_NAMESPACE  IR
                       const char * name,
                       const char * version,
                       CORBA_ValueDef_ptr value
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5003,7 +5003,7 @@ TAO_NAMESPACE  IR
                       const char * name,
                       const char * version,
                       CORBA_ValueDef_ptr value
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5034,7 +5034,7 @@ TAO_NAMESPACE  IR
                   virtual ~_TAO_ComponentDef_Remote_Proxy_Impl (void) { }
                   virtual CORBA_InterfaceDefSeq * supported_interfaces (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5043,7 +5043,7 @@ TAO_NAMESPACE  IR
                   virtual void supported_interfaces (
                       CORBA_Object *_collocated_tao_target_,
                       const CORBA_InterfaceDefSeq & supported_interfaces
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5051,7 +5051,7 @@ TAO_NAMESPACE  IR
 
                   virtual IR::ComponentDef_ptr base_component (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5059,7 +5059,7 @@ TAO_NAMESPACE  IR
 
                   virtual IR::ProvidesDefSeq * provides_interfaces (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5067,7 +5067,7 @@ TAO_NAMESPACE  IR
 
                   virtual IR::UsesDefSeq * uses_interfaces (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5075,7 +5075,7 @@ TAO_NAMESPACE  IR
 
                   virtual IR::EmitsDefSeq * emits_events (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5083,7 +5083,7 @@ TAO_NAMESPACE  IR
 
                   virtual IR::PublishesDefSeq * publishes_events (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5091,7 +5091,7 @@ TAO_NAMESPACE  IR
 
                   virtual IR::ConsumesDefSeq * consumes_events (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5099,7 +5099,7 @@ TAO_NAMESPACE  IR
 
                   virtual CORBA::Boolean is_basic (
                       CORBA_Object *_collocated_tao_target_
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5111,7 +5111,7 @@ TAO_NAMESPACE  IR
                       const char * name,
                       const char * version,
                       CORBA_InterfaceDef_ptr interface_type
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5124,7 +5124,7 @@ TAO_NAMESPACE  IR
                       const char * version,
                       CORBA_InterfaceDef_ptr interface_type,
                       CORBA::Boolean is_multiple
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5136,7 +5136,7 @@ TAO_NAMESPACE  IR
                       const char * name,
                       const char * version,
                       CORBA_ValueDef_ptr value
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5148,7 +5148,7 @@ TAO_NAMESPACE  IR
                       const char * name,
                       const char * version,
                       CORBA_ValueDef_ptr value
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5160,7 +5160,7 @@ TAO_NAMESPACE  IR
                       const char * name,
                       const char * version,
                       CORBA_ValueDef_ptr value
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     )
                     ACE_THROW_SPEC ((
                       CORBA::SystemException
@@ -5189,7 +5189,7 @@ TAO_NAMESPACE  IR
                   virtual ~_TAO_ComponentDef_Proxy_Broker (void);
                   virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
                       ComponentDef *object
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS
                     ) = 0;
 
                 protected:
@@ -5216,7 +5216,7 @@ TAO_NAMESPACE  IR
 
                   virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
                       ComponentDef *object
-                      TAO_ENV_ARG_DECL
+                      ACE_ENV_ARG_DECL
                     );
 
                   private:
@@ -5342,12 +5342,12 @@ TAO_NAMESPACE  IR
 
                     static PrimaryKeyDef_ptr _narrow (
                         CORBA::Object_ptr obj
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                     static PrimaryKeyDef_ptr _unchecked_narrow (
                         CORBA::Object_ptr obj
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                     static PrimaryKeyDef_ptr _nil (void)
@@ -5359,14 +5359,14 @@ TAO_NAMESPACE  IR
 
                     virtual CORBA::Boolean is_a (
                         const char * primary_key_id
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                       ACE_THROW_SPEC ((
                         CORBA::SystemException
                       ));
 
                     virtual CORBA_ValueDef_ptr primary_key (
-                        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                       ACE_THROW_SPEC ((
                         CORBA::SystemException
@@ -5374,7 +5374,7 @@ TAO_NAMESPACE  IR
 
                     virtual CORBA::Boolean _is_a (
                         const CORBA::Char *type_id
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                     virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -5425,7 +5425,7 @@ TAO_NAMESPACE  IR
                     virtual CORBA::Boolean is_a (
                         CORBA_Object *_collocated_tao_target_,
                         const char * primary_key_id
-                        TAO_ENV_ARG_DECL
+                        ACE_ENV_ARG_DECL
                       )
                       ACE_THROW_SPEC ((
                         CORBA::SystemException
@@ -5433,7 +5433,7 @@ TAO_NAMESPACE  IR
 
                     virtual CORBA_ValueDef_ptr primary_key (
                         CORBA_Object *_collocated_tao_target_
-                        TAO_ENV_ARG_DECL
+                        ACE_ENV_ARG_DECL
                       )
                       ACE_THROW_SPEC ((
                         CORBA::SystemException
@@ -5465,7 +5465,7 @@ TAO_NAMESPACE  IR
                     virtual CORBA::Boolean is_a (
                         CORBA_Object *_collocated_tao_target_,
                         const char * primary_key_id
-                        TAO_ENV_ARG_DECL
+                        ACE_ENV_ARG_DECL
                       )
                       ACE_THROW_SPEC ((
                         CORBA::SystemException
@@ -5473,7 +5473,7 @@ TAO_NAMESPACE  IR
 
                     virtual CORBA_ValueDef_ptr primary_key (
                         CORBA_Object *_collocated_tao_target_
-                        TAO_ENV_ARG_DECL
+                        ACE_ENV_ARG_DECL
                       )
                       ACE_THROW_SPEC ((
                         CORBA::SystemException
@@ -5502,7 +5502,7 @@ TAO_NAMESPACE  IR
                     virtual ~_TAO_PrimaryKeyDef_Proxy_Broker (void);
                     virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
                         PrimaryKeyDef *object
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS
                       ) = 0;
 
                   protected:
@@ -5529,7 +5529,7 @@ TAO_NAMESPACE  IR
 
                     virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
                         PrimaryKeyDef *object
-                        TAO_ENV_ARG_DECL
+                        ACE_ENV_ARG_DECL
                       );
 
                     private:
@@ -5647,12 +5647,12 @@ TAO_NAMESPACE  IR
 
                       static FactoryDef_ptr _narrow (
                           CORBA::Object_ptr obj
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                       static FactoryDef_ptr _unchecked_narrow (
                           CORBA::Object_ptr obj
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                       static FactoryDef_ptr _nil (void)
@@ -5664,7 +5664,7 @@ TAO_NAMESPACE  IR
 
                       virtual CORBA::Boolean _is_a (
                           const CORBA::Char *type_id
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                       virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -5758,7 +5758,7 @@ TAO_NAMESPACE  IR
                       virtual ~_TAO_FactoryDef_Proxy_Broker (void);
                       virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
                           FactoryDef *object
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS
                         ) = 0;
 
                     protected:
@@ -5785,7 +5785,7 @@ TAO_NAMESPACE  IR
 
                       virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
                           FactoryDef *object
-                          TAO_ENV_ARG_DECL
+                          ACE_ENV_ARG_DECL
                         );
 
                       private:
@@ -5833,12 +5833,12 @@ TAO_NAMESPACE  IR
 
                         static FinderDef_ptr _narrow (
                             CORBA::Object_ptr obj
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                         static FinderDef_ptr _unchecked_narrow (
                             CORBA::Object_ptr obj
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                         static FinderDef_ptr _nil (void)
@@ -5850,7 +5850,7 @@ TAO_NAMESPACE  IR
 
                         virtual CORBA::Boolean _is_a (
                             const CORBA::Char *type_id
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                         virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -5944,7 +5944,7 @@ TAO_NAMESPACE  IR
                         virtual ~_TAO_FinderDef_Proxy_Broker (void);
                         virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
                             FinderDef *object
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS
                           ) = 0;
 
                       protected:
@@ -5971,7 +5971,7 @@ TAO_NAMESPACE  IR
 
                         virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
                             FinderDef *object
-                            TAO_ENV_ARG_DECL
+                            ACE_ENV_ARG_DECL
                           );
 
                         private:
@@ -6019,12 +6019,12 @@ TAO_NAMESPACE  IR
 
                           static HomeDef_ptr _narrow (
                               CORBA::Object_ptr obj
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                           static HomeDef_ptr _unchecked_narrow (
                               CORBA::Object_ptr obj
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                           static HomeDef_ptr _nil (void)
@@ -6035,42 +6035,42 @@ TAO_NAMESPACE  IR
                           static void _tao_any_destructor (void*);
 
                           virtual IR::HomeDef_ptr base_home (
-                              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
                             ));
 
                           virtual IR::ComponentDef_ptr managed_component (
-                              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
                             ));
 
                           virtual IR::PrimaryKeyDef_ptr primary_key (
-                              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
                             ));
 
                           virtual IR::FactoryDefSeq * factories (
-                              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
                             ));
 
                           virtual IR::FinderDefSeq * finders (
-                              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
                             ));
 
                           virtual CORBA::Boolean is_basic (
-                              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6081,7 +6081,7 @@ TAO_NAMESPACE  IR
                               const char * name,
                               const char * version,
                               CORBA_ValueDef_ptr primary_key
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6093,7 +6093,7 @@ TAO_NAMESPACE  IR
                               const char * version,
                               const CORBA_ParDescriptionSeq & params,
                               const CORBA_ExceptionDefSeq & exceptions
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6105,7 +6105,7 @@ TAO_NAMESPACE  IR
                               const char * version,
                               const CORBA_ParDescriptionSeq & params,
                               const CORBA_ExceptionDefSeq & exceptions
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6113,7 +6113,7 @@ TAO_NAMESPACE  IR
 
                           virtual CORBA::Boolean _is_a (
                               const CORBA::Char *type_id
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
                           virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -6163,7 +6163,7 @@ TAO_NAMESPACE  IR
                           virtual ~_TAO_HomeDef_Proxy_Impl (void) { }
                           virtual IR::HomeDef_ptr base_home (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6171,7 +6171,7 @@ TAO_NAMESPACE  IR
 
                           virtual IR::ComponentDef_ptr managed_component (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6179,7 +6179,7 @@ TAO_NAMESPACE  IR
 
                           virtual IR::PrimaryKeyDef_ptr primary_key (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6187,7 +6187,7 @@ TAO_NAMESPACE  IR
 
                           virtual IR::FactoryDefSeq * factories (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6195,7 +6195,7 @@ TAO_NAMESPACE  IR
 
                           virtual IR::FinderDefSeq * finders (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6203,7 +6203,7 @@ TAO_NAMESPACE  IR
 
                           virtual CORBA::Boolean is_basic (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6215,7 +6215,7 @@ TAO_NAMESPACE  IR
                               const char * name,
                               const char * version,
                               CORBA_ValueDef_ptr primary_key
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6228,7 +6228,7 @@ TAO_NAMESPACE  IR
                               const char * version,
                               const CORBA_ParDescriptionSeq & params,
                               const CORBA_ExceptionDefSeq & exceptions
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6241,7 +6241,7 @@ TAO_NAMESPACE  IR
                               const char * version,
                               const CORBA_ParDescriptionSeq & params,
                               const CORBA_ExceptionDefSeq & exceptions
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6272,7 +6272,7 @@ TAO_NAMESPACE  IR
                           virtual ~_TAO_HomeDef_Remote_Proxy_Impl (void) { }
                           virtual IR::HomeDef_ptr base_home (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6280,7 +6280,7 @@ TAO_NAMESPACE  IR
 
                           virtual IR::ComponentDef_ptr managed_component (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6288,7 +6288,7 @@ TAO_NAMESPACE  IR
 
                           virtual IR::PrimaryKeyDef_ptr primary_key (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6296,7 +6296,7 @@ TAO_NAMESPACE  IR
 
                           virtual IR::FactoryDefSeq * factories (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6304,7 +6304,7 @@ TAO_NAMESPACE  IR
 
                           virtual IR::FinderDefSeq * finders (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6312,7 +6312,7 @@ TAO_NAMESPACE  IR
 
                           virtual CORBA::Boolean is_basic (
                               CORBA_Object *_collocated_tao_target_
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6324,7 +6324,7 @@ TAO_NAMESPACE  IR
                               const char * name,
                               const char * version,
                               CORBA_ValueDef_ptr primary_key
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6337,7 +6337,7 @@ TAO_NAMESPACE  IR
                               const char * version,
                               const CORBA_ParDescriptionSeq & params,
                               const CORBA_ExceptionDefSeq & exceptions
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6350,7 +6350,7 @@ TAO_NAMESPACE  IR
                               const char * version,
                               const CORBA_ParDescriptionSeq & params,
                               const CORBA_ExceptionDefSeq & exceptions
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             )
                             ACE_THROW_SPEC ((
                               CORBA::SystemException
@@ -6379,7 +6379,7 @@ TAO_NAMESPACE  IR
                           virtual ~_TAO_HomeDef_Proxy_Broker (void);
                           virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
                               HomeDef *object
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS
                             ) = 0;
 
                         protected:
@@ -6406,7 +6406,7 @@ TAO_NAMESPACE  IR
 
                           virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
                               HomeDef *object
-                              TAO_ENV_ARG_DECL
+                              ACE_ENV_ARG_DECL
                             );
 
                           private:
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index 32bb3083735..2db5acb3533 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -66,10 +66,10 @@ tao_CORBA_FixedDef_nil (
 CORBA_FixedDef_ptr
 tao_CORBA_FixedDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_FixedDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_FixedDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -193,10 +193,10 @@ CORBA_FixedDef_var::tao_nil (void)
 ::CORBA_FixedDef_ptr
 CORBA_FixedDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_FixedDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_FixedDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -274,21 +274,21 @@ public:
   TAO_ClientRequestInfo_CORBA_FixedDef_digits_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -304,30 +304,30 @@ private:
 TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::TAO_ClientRequestInfo_CORBA_FixedDef_digits_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -335,13 +335,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::exceptions (TAO_ENV_SINGLE_ARG_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_FixedDef_digits_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -364,21 +364,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::UShort & digits
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -394,19 +394,19 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::TAO_ClientRequestInfo_CORBA_Fix
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::UShort & digits
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     digits_ (digits)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -422,12 +422,12 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::arguments (TAO_ENV_SINGLE_ARG_D
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -435,13 +435,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::exceptions (TAO_ENV_SINGLE_ARG_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_FixedDef_digits_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -453,21 +453,21 @@ public:
   TAO_ClientRequestInfo_CORBA_FixedDef_scale_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -483,30 +483,30 @@ private:
 TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::TAO_ClientRequestInfo_CORBA_FixedDef_scale_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -514,13 +514,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::exceptions (TAO_ENV_SINGLE_ARG_D
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_FixedDef_scale_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -543,21 +543,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Short & scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -573,19 +573,19 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::TAO_ClientRequestInfo_CORBA_Fixe
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::Short & scale
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     scale_ (scale)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -601,12 +601,12 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::arguments (TAO_ENV_SINGLE_ARG_DE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -614,13 +614,13 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::exceptions (TAO_ENV_SINGLE_ARG_D
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -642,7 +642,7 @@ _TAO_CORBA_FixedDef_Remote_Proxy_Impl::_TAO_CORBA_FixedDef_Remote_Proxy_Impl (vo
 
 CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -684,7 +684,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
       TAO_ClientRequestInfo_CORBA_FixedDef_digits_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -700,7 +700,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -712,17 +712,17 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -739,7 +739,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -766,7 +766,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -776,12 +776,12 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -792,7 +792,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -809,7 +809,7 @@ return _tao_retval;
 void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
     CORBA_Object *_collocated_tao_target_,
     CORBA::UShort digits
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -852,7 +852,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
         &_tao_call,
         _collocated_tao_target_,
         digits
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -868,7 +868,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -880,12 +880,12 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -898,7 +898,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -914,7 +914,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -928,7 +928,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -938,12 +938,12 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -954,7 +954,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -970,7 +970,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
 
 CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1012,7 +1012,7 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
       TAO_ClientRequestInfo_CORBA_FixedDef_scale_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -1028,7 +1028,7 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1040,17 +1040,17 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1067,7 +1067,7 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1094,7 +1094,7 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1104,12 +1104,12 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1120,7 +1120,7 @@ CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1137,7 +1137,7 @@ return _tao_retval;
 void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Short scale
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1180,7 +1180,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
         &_tao_call,
         _collocated_tao_target_,
         scale
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -1196,7 +1196,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1208,12 +1208,12 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -1226,7 +1226,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1242,7 +1242,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1256,7 +1256,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1266,12 +1266,12 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1282,7 +1282,7 @@ void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1337,7 +1337,7 @@ _TAO_CORBA_FixedDef_Remote_Proxy_Broker::~_TAO_CORBA_FixedDef_Remote_Proxy_Broke
 _TAO_CORBA_FixedDef_Proxy_Impl&
 _TAO_CORBA_FixedDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_FixedDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -1380,24 +1380,24 @@ void CORBA_FixedDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_FixedDef_ptr CORBA_FixedDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_FixedDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/FixedDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/FixedDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_FixedDef::_nil ());
       if (is_a == 0)
         return CORBA_FixedDef::_nil ();
     }
-  return CORBA_FixedDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_FixedDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_FixedDef_ptr CORBA_FixedDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1452,7 +1452,7 @@ CORBA_FixedDef::_duplicate (CORBA_FixedDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) ||
@@ -1461,7 +1461,7 @@ CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_FixedDef::_tao_QueryInterface (ptr_arith_t type)
@@ -1510,74 +1510,74 @@ const char* CORBA_FixedDef::_interface_repository_id (void) const
 }
 
 CORBA::UShort CORBA_FixedDef::digits (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_FixedDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.digits (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_FixedDef::digits (
     CORBA::UShort digits
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_FixedDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.digits (
       this,
       digits
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Short CORBA_FixedDef::scale (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_FixedDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.scale (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_FixedDef::scale (
     CORBA::Short scale
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_FixedDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.scale (
       this,
       scale
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1711,10 +1711,10 @@ tao_CORBA_ValueMemberDef_nil (
 CORBA_ValueMemberDef_ptr
 tao_CORBA_ValueMemberDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_ValueMemberDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_ValueMemberDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1838,10 +1838,10 @@ CORBA_ValueMemberDef_var::tao_nil (void)
 ::CORBA_ValueMemberDef_ptr
 CORBA_ValueMemberDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ValueMemberDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_ValueMemberDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1919,21 +1919,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -1949,30 +1949,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -1980,13 +1980,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2008,21 +2008,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2038,30 +2038,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -2069,13 +2069,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (TAO_ENV_SIN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2098,21 +2098,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2128,19 +2128,19 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ClientRequestInfo_C
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     type_def_ (type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2156,12 +2156,12 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (TAO_ENV_SING
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -2169,13 +2169,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (TAO_ENV_SIN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2187,21 +2187,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2217,30 +2217,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -2248,13 +2248,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2277,21 +2277,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Visibility & access
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2307,19 +2307,19 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ClientRequestInfo_COR
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::Visibility & access
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     access_ (access)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2335,12 +2335,12 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -2348,13 +2348,13 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2376,7 +2376,7 @@ _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::_TAO_CORBA_ValueMemberDef_Remote_Pr
 
 CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2419,7 +2419,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2435,7 +2435,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2447,17 +2447,17 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2474,7 +2474,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2502,7 +2502,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2512,12 +2512,12 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2528,7 +2528,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2544,7 +2544,7 @@ return _tao_safe_retval._retn ();
 
 CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2587,7 +2587,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -2603,7 +2603,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2615,17 +2615,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2642,7 +2642,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2670,7 +2670,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2680,12 +2680,12 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2696,7 +2696,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2713,7 +2713,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2756,7 +2756,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
         &_tao_call,
         _collocated_tao_target_,
         type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -2772,7 +2772,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2784,12 +2784,12 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -2802,7 +2802,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2818,7 +2818,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2832,7 +2832,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2842,12 +2842,12 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2858,7 +2858,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -2874,7 +2874,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
 
 CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2916,7 +2916,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
       TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -2932,7 +2932,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -2944,17 +2944,17 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -2971,7 +2971,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -2998,7 +2998,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3008,12 +3008,12 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3024,7 +3024,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3041,7 +3041,7 @@ return _tao_retval;
 void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Visibility access
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3084,7 +3084,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
         &_tao_call,
         _collocated_tao_target_,
         access
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -3100,7 +3100,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3112,12 +3112,12 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -3130,7 +3130,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3146,7 +3146,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3160,7 +3160,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3170,12 +3170,12 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3186,7 +3186,7 @@ void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3241,7 +3241,7 @@ _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueMemberDef_Remote
 _TAO_CORBA_ValueMemberDef_Proxy_Impl&
 _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ValueMemberDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -3284,24 +3284,24 @@ void CORBA_ValueMemberDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_ValueMemberDef_ptr CORBA_ValueMemberDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ValueMemberDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueMemberDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueMemberDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ValueMemberDef::_nil ());
       if (is_a == 0)
         return CORBA_ValueMemberDef::_nil ();
     }
-  return CORBA_ValueMemberDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_ValueMemberDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueMemberDef_ptr CORBA_ValueMemberDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3356,7 +3356,7 @@ CORBA_ValueMemberDef::_duplicate (CORBA_ValueMemberDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) ||
@@ -3365,7 +3365,7 @@ CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value TAO_ENV_ARG
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
@@ -3414,91 +3414,91 @@ const char* CORBA_ValueMemberDef::_interface_repository_id (void) const
 }
 
 CORBA::TypeCode_ptr CORBA_ValueMemberDef::type (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_IDLType_ptr CORBA_ValueMemberDef::type_def (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.type_def (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueMemberDef::type_def (
     CORBA_IDLType_ptr type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.type_def (
       this,
       type_def
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Visibility CORBA_ValueMemberDef::access (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.access (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueMemberDef::access (
     CORBA::Visibility access
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.access (
       this,
       access
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -3529,10 +3529,10 @@ tao_CORBA_ValueDef_nil (
 CORBA_ValueDef_ptr
 tao_CORBA_ValueDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_ValueDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_ValueDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3656,10 +3656,10 @@ CORBA_ValueDef_var::tao_nil (void)
 ::CORBA_ValueDef_ptr
 CORBA_ValueDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ValueDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_ValueDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3737,21 +3737,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3767,30 +3767,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -3798,13 +3798,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (TAO_E
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3827,21 +3827,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_InterfaceDefSeq & supported_interfaces
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3857,19 +3857,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ClientRequest
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     supported_interfaces_ (supported_interfaces)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3885,12 +3885,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (TAO_EN
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -3898,13 +3898,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (TAO_E
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3916,21 +3916,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3946,30 +3946,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -3977,13 +3977,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4006,21 +4006,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_InitializerSeq & initializers
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4036,19 +4036,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::TAO_ClientRequestInfo_COR
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     initializers_ (initializers)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4064,12 +4064,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4077,13 +4077,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4095,21 +4095,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4125,30 +4125,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4156,13 +4156,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4185,21 +4185,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_ValueDef_ptr base_value
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4215,19 +4215,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::TAO_ClientRequestInfo_CORBA
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_ValueDef_ptr base_value
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     base_value_ (base_value)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4243,12 +4243,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::arguments (TAO_ENV_SINGLE_A
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4256,13 +4256,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4274,21 +4274,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4304,30 +4304,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4335,13 +4335,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (TAO_E
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4364,21 +4364,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA_ValueDefSeq & abstract_base_values
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4394,19 +4394,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ClientRequest
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA_ValueDefSeq & abstract_base_values
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     abstract_base_values_ (abstract_base_values)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4422,12 +4422,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (TAO_EN
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4435,13 +4435,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (TAO_E
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4453,21 +4453,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4483,30 +4483,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4514,13 +4514,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (TAO_ENV_SINGLE
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4543,21 +4543,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Boolean & is_abstract
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4573,19 +4573,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ClientRequestInfo_CORB
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::Boolean & is_abstract
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     is_abstract_ (is_abstract)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4601,12 +4601,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (TAO_ENV_SINGLE_
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4614,13 +4614,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (TAO_ENV_SINGLE
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4632,21 +4632,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4662,30 +4662,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4693,13 +4693,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (TAO_ENV_SINGLE_A
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4722,21 +4722,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Boolean & is_custom
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4752,19 +4752,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ClientRequestInfo_CORBA_
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::Boolean & is_custom
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     is_custom_ (is_custom)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4780,12 +4780,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::arguments (TAO_ENV_SINGLE_AR
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4793,13 +4793,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (TAO_ENV_SINGLE_A
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4811,21 +4811,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4841,30 +4841,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4872,13 +4872,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (TAO_ENV_SIN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4901,21 +4901,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::Boolean & is_truncatable
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -4931,19 +4931,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ClientRequestInfo_C
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::Boolean & is_truncatable
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     is_truncatable_ (is_truncatable)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4959,12 +4959,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (TAO_ENV_SING
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4972,13 +4972,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (TAO_ENV_SIN
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4991,21 +4991,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5023,19 +5023,19 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::TAO_ClientRequestInfo_CORBA_ValueDef_
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * id
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_a::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5051,12 +5051,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_a::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -5064,13 +5064,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_is_a::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5092,21 +5092,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_describe_value (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5122,30 +5122,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::TAO_ClientRequestInfo_CORBA_ValueDef_describe_value (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -5153,13 +5153,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::exceptions (TAO_ENV_SINGLE_
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5186,21 +5186,21 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       const CORBA::Visibility & access
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5226,7 +5226,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::TAO_ClientRequestInfo_
     const char * version,
     CORBA_IDLType_ptr type,
     const CORBA::Visibility & access
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -5237,12 +5237,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::TAO_ClientRequestInfo_
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5270,12 +5270,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::arguments (TAO_ENV_SIN
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -5283,13 +5283,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::exceptions (TAO_ENV_SI
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5316,21 +5316,21 @@ public:
       const char * version,
       CORBA_IDLType_ptr type,
       CORBA::AttributeMode & mode
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5356,7 +5356,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::TAO_ClientRequestInfo_COR
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -5367,12 +5367,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::TAO_ClientRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5400,12 +5400,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -5413,13 +5413,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5449,21 +5449,21 @@ public:
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
       const CORBA_ContextIdSeq & contexts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5495,7 +5495,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::TAO_ClientRequestInfo_COR
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     id_ (id),
@@ -5509,12 +5509,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::TAO_ClientRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5551,12 +5551,12 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::arguments (TAO_ENV_SINGLE
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -5564,13 +5564,13 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::exceptions (TAO_ENV_SINGL
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5602,7 +5602,7 @@ _TAO_CORBA_ValueDef_Remote_Proxy_Impl::_TAO_CORBA_ValueDef_Remote_Proxy_Impl (vo
 
 CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5646,7 +5646,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
       TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -5662,7 +5662,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5674,17 +5674,17 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -5701,7 +5701,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -5729,7 +5729,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5739,12 +5739,12 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -5755,7 +5755,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfa
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -5772,7 +5772,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5815,7 +5815,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
         &_tao_call,
         _collocated_tao_target_,
         supported_interfaces
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -5831,7 +5831,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5843,12 +5843,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -5861,7 +5861,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -5877,7 +5877,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -5891,7 +5891,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -5901,12 +5901,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -5917,7 +5917,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -5933,7 +5933,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
 
 CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5977,7 +5977,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
       TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -5993,7 +5993,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6005,17 +6005,17 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6032,7 +6032,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6060,7 +6060,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6070,12 +6070,12 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6086,7 +6086,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6103,7 +6103,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6146,7 +6146,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
         &_tao_call,
         _collocated_tao_target_,
         initializers
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -6162,7 +6162,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6174,12 +6174,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -6192,7 +6192,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6208,7 +6208,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6222,7 +6222,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6232,12 +6232,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6248,7 +6248,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6264,7 +6264,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
 
 CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6307,7 +6307,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
       TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -6323,7 +6323,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6335,17 +6335,17 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6362,7 +6362,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6390,7 +6390,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6400,12 +6400,12 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6416,7 +6416,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6433,7 +6433,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
     CORBA_Object *_collocated_tao_target_,
     CORBA_ValueDef_ptr base_value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6476,7 +6476,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
         &_tao_call,
         _collocated_tao_target_,
         base_value
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -6492,7 +6492,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6504,12 +6504,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -6522,7 +6522,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6538,7 +6538,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6552,7 +6552,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6562,12 +6562,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6578,7 +6578,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6594,7 +6594,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
 
 CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6638,7 +6638,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
       TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -6654,7 +6654,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6666,17 +6666,17 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6693,7 +6693,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6721,7 +6721,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6731,12 +6731,12 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6747,7 +6747,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6764,7 +6764,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
     CORBA_Object *_collocated_tao_target_,
     const CORBA_ValueDefSeq & abstract_base_values
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6807,7 +6807,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
         &_tao_call,
         _collocated_tao_target_,
         abstract_base_values
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -6823,7 +6823,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6835,12 +6835,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -6853,7 +6853,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6869,7 +6869,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6883,7 +6883,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6893,12 +6893,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6909,7 +6909,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6925,7 +6925,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
 
 CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6967,7 +6967,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
       TAO_ClientRequestInfo_CORBA_ValueDef_is_abstract_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -6983,7 +6983,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6995,17 +6995,17 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7022,7 +7022,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7049,7 +7049,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7059,12 +7059,12 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7075,7 +7075,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7092,7 +7092,7 @@ return _tao_retval;
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Boolean is_abstract
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7135,7 +7135,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
         &_tao_call,
         _collocated_tao_target_,
         is_abstract
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -7151,7 +7151,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7163,12 +7163,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -7181,7 +7181,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7197,7 +7197,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7211,7 +7211,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7221,12 +7221,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7237,7 +7237,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7253,7 +7253,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
 
 CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7295,7 +7295,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
       TAO_ClientRequestInfo_CORBA_ValueDef_is_custom_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -7311,7 +7311,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7323,17 +7323,17 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7350,7 +7350,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7377,7 +7377,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7387,12 +7387,12 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7403,7 +7403,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7420,7 +7420,7 @@ return _tao_retval;
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Boolean is_custom
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7463,7 +7463,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
         &_tao_call,
         _collocated_tao_target_,
         is_custom
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -7479,7 +7479,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7491,12 +7491,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -7509,7 +7509,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7525,7 +7525,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7539,7 +7539,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7549,12 +7549,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7565,7 +7565,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7581,7 +7581,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
 
 CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7623,7 +7623,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
       TAO_ClientRequestInfo_CORBA_ValueDef_is_truncatable_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -7639,7 +7639,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7651,17 +7651,17 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7678,7 +7678,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7705,7 +7705,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7715,12 +7715,12 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7731,7 +7731,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7748,7 +7748,7 @@ return _tao_retval;
 void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Boolean is_truncatable
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7791,7 +7791,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
         &_tao_call,
         _collocated_tao_target_,
         is_truncatable
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -7807,7 +7807,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7819,12 +7819,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -7837,7 +7837,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -7853,7 +7853,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -7867,7 +7867,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7877,12 +7877,12 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7893,7 +7893,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -7910,7 +7910,7 @@ void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
 CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7953,7 +7953,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
         &_tao_call,
         _collocated_tao_target_,
         id
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -7969,7 +7969,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -7981,12 +7981,12 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
@@ -8000,7 +8000,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8017,7 +8017,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8044,7 +8044,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8054,12 +8054,12 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8070,7 +8070,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8086,7 +8086,7 @@ return _tao_retval;
 
 CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::describe_value (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8129,7 +8129,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
       TAO_ClientRequestInfo_CORBA_ValueDef_describe_value ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8145,7 +8145,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8157,17 +8157,17 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8184,7 +8184,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8212,7 +8212,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8222,12 +8222,12 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8238,7 +8238,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::de
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8259,7 +8259,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::Visibility access
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8307,7 +8307,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
         version,
         type,
         access
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8323,7 +8323,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8335,12 +8335,12 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -8358,7 +8358,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8375,7 +8375,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8403,7 +8403,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8413,12 +8413,12 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8429,7 +8429,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_mem
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8450,7 +8450,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8498,7 +8498,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
         version,
         type,
         mode
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8514,7 +8514,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8526,12 +8526,12 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -8549,7 +8549,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8566,7 +8566,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8594,7 +8594,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8604,12 +8604,12 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8620,7 +8620,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8644,7 +8644,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8695,7 +8695,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
         params,
         exceptions,
         contexts
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -8711,7 +8711,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8723,12 +8723,12 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -8749,7 +8749,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -8766,7 +8766,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -8794,7 +8794,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -8804,12 +8804,12 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8820,7 +8820,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -8875,7 +8875,7 @@ _TAO_CORBA_ValueDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueDef_Remote_Proxy_Broke
 _TAO_CORBA_ValueDef_Proxy_Impl&
 _TAO_CORBA_ValueDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ValueDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -8922,24 +8922,24 @@ void CORBA_ValueDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_ValueDef_ptr CORBA_ValueDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ValueDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ValueDef::_nil ());
       if (is_a == 0)
         return CORBA_ValueDef::_nil ();
     }
-  return CORBA_ValueDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_ValueDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueDef_ptr CORBA_ValueDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -8994,7 +8994,7 @@ CORBA_ValueDef::_duplicate (CORBA_ValueDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) ||
@@ -9005,7 +9005,7 @@ CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ValueDef::_tao_QueryInterface (ptr_arith_t type)
@@ -9078,273 +9078,273 @@ const char* CORBA_ValueDef::_interface_repository_id (void) const
 }
 
 CORBA_InterfaceDefSeq * CORBA_ValueDef::supported_interfaces (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.supported_interfaces (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::supported_interfaces (
     const CORBA_InterfaceDefSeq & supported_interfaces
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.supported_interfaces (
       this,
       supported_interfaces
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_InitializerSeq * CORBA_ValueDef::initializers (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.initializers (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::initializers (
     const CORBA_InitializerSeq & initializers
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.initializers (
       this,
       initializers
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ValueDef_ptr CORBA_ValueDef::base_value (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.base_value (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::base_value (
     CORBA_ValueDef_ptr base_value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.base_value (
       this,
       base_value
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA_ValueDefSeq * CORBA_ValueDef::abstract_base_values (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.abstract_base_values (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::abstract_base_values (
     const CORBA_ValueDefSeq & abstract_base_values
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.abstract_base_values (
       this,
       abstract_base_values
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean CORBA_ValueDef::is_abstract (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_abstract (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::is_abstract (
     CORBA::Boolean is_abstract
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.is_abstract (
       this,
       is_abstract
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean CORBA_ValueDef::is_custom (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_custom (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::is_custom (
     CORBA::Boolean is_custom
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.is_custom (
       this,
       is_custom
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean CORBA_ValueDef::is_truncatable (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_truncatable (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueDef::is_truncatable (
     CORBA::Boolean is_truncatable
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.is_truncatable (
       this,
       is_truncatable
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Boolean CORBA_ValueDef::is_a (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.is_a (
       this,
       id
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -10728,19 +10728,19 @@ void CORBA_ValueDef::FullValueDescription::_tao_any_destructor (void *_tao_void_
 }
 
 CORBA_ValueDef::FullValueDescription * CORBA_ValueDef::describe_value (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.describe_value (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -10750,14 +10750,14 @@ CORBA_ValueMemberDef_ptr CORBA_ValueDef::create_value_member (
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::Visibility access
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_value_member (
@@ -10767,7 +10767,7 @@ CORBA_ValueMemberDef_ptr CORBA_ValueDef::create_value_member (
       version,
       type,
       access
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -10777,14 +10777,14 @@ CORBA_AttributeDef_ptr CORBA_ValueDef::create_attribute (
     const char * version,
     CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_attribute (
@@ -10794,7 +10794,7 @@ CORBA_AttributeDef_ptr CORBA_ValueDef::create_attribute (
       version,
       type,
       mode
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -10807,14 +10807,14 @@ CORBA_OperationDef_ptr CORBA_ValueDef::create_operation (
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
     const CORBA_ContextIdSeq & contexts
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.create_operation (
@@ -10827,7 +10827,7 @@ CORBA_OperationDef_ptr CORBA_ValueDef::create_operation (
       params,
       exceptions,
       contexts
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -10865,10 +10865,10 @@ tao_CORBA_ValueBoxDef_nil (
 CORBA_ValueBoxDef_ptr
 tao_CORBA_ValueBoxDef_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_ValueBoxDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_ValueBoxDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -10992,10 +10992,10 @@ CORBA_ValueBoxDef_var::tao_nil (void)
 ::CORBA_ValueBoxDef_ptr
 CORBA_ValueBoxDef_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_ValueBoxDef::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_ValueBoxDef::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -11073,21 +11073,21 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -11103,30 +11103,30 @@ private:
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -11134,13 +11134,13 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (TAO_E
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11163,21 +11163,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       CORBA_IDLType_ptr original_type_def
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -11193,19 +11193,19 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ClientRequest
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     original_type_def_ (original_type_def)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -11221,12 +11221,12 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (TAO_EN
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -11234,13 +11234,13 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (TAO_E
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -11262,7 +11262,7 @@ _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::_TAO_CORBA_ValueBoxDef_Remote_Proxy_Im
 
 CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11305,7 +11305,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
       TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -11321,7 +11321,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11333,17 +11333,17 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11360,7 +11360,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11388,7 +11388,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11398,12 +11398,12 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11414,7 +11414,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11431,7 +11431,7 @@ return _tao_safe_retval._retn ();
 void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11474,7 +11474,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
         &_tao_call,
         _collocated_tao_target_,
         original_type_def
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -11490,7 +11490,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11502,12 +11502,12 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -11520,7 +11520,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -11536,7 +11536,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -11550,7 +11550,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -11560,12 +11560,12 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11576,7 +11576,7 @@ void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -11631,7 +11631,7 @@ _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueBoxDef_Remote_Proxy
 _TAO_CORBA_ValueBoxDef_Proxy_Impl&
 _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ValueBoxDef *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -11674,24 +11674,24 @@ void CORBA_ValueBoxDef::_tao_any_destructor (void *_tao_void_pointer)
 
 CORBA_ValueBoxDef_ptr CORBA_ValueBoxDef::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_ValueBoxDef::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueBoxDef:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueBoxDef:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
       if (is_a == 0)
         return CORBA_ValueBoxDef::_nil ();
     }
-  return CORBA_ValueBoxDef::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_ValueBoxDef::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueBoxDef_ptr CORBA_ValueBoxDef::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -11746,7 +11746,7 @@ CORBA_ValueBoxDef::_duplicate (CORBA_ValueBoxDef_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) ||
@@ -11757,7 +11757,7 @@ CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value TAO_ENV_ARG_DE
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA_ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
@@ -11830,38 +11830,38 @@ const char* CORBA_ValueBoxDef::_interface_repository_id (void) const
 }
 
 CORBA_IDLType_ptr CORBA_ValueBoxDef::original_type_def (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.original_type_def (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA_ValueBoxDef::original_type_def (
     CORBA_IDLType_ptr original_type_def
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy =
-    this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.original_type_def (
       this,
       original_type_def
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -11888,7 +11888,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_FixedDef_ptr &_tao
     _tao_elem = CORBA_FixedDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_FixedDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_FixedDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -11963,7 +11963,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueMember
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMember TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMember ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12054,7 +12054,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueMemberS
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12123,7 +12123,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueMemberDef_ptr
     _tao_elem = CORBA_ValueMemberDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12184,7 +12184,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueDef_ptr &_tao
     _tao_elem = CORBA_ValueDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12259,7 +12259,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDef::Fu
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA_ValueDef::_tc_FullValueDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA_ValueDef::_tc_FullValueDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12342,7 +12342,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDescrip
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDescription TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDescription ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12411,7 +12411,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueBoxDef_ptr &_
     _tao_elem = CORBA_ValueBoxDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueBoxDef TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueBoxDef ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -12472,7 +12472,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_FixedDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -12550,7 +12550,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_ValueMemberDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -12586,7 +12586,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_ValueDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -12622,7 +12622,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA_ValueBoxDef::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
index fe1c8246aff..c0e04325f97 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h
@@ -93,7 +93,7 @@ public:
   static CORBA_FixedDef_ptr tao_nil (void);
   static CORBA_FixedDef_ptr tao_narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * tao_upcast (void *);
 
@@ -157,12 +157,12 @@ public:
 
   static CORBA_FixedDef_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static CORBA_FixedDef_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static CORBA_FixedDef_ptr _nil (void)
@@ -173,7 +173,7 @@ public:
   static void _tao_any_destructor (void*);
 
   virtual CORBA::UShort digits (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -181,14 +181,14 @@ public:
 
   virtual void digits (
       CORBA::UShort digits
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
   virtual CORBA::Short scale (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -196,7 +196,7 @@ public:
 
   virtual void scale (
       CORBA::Short scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -204,7 +204,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -254,7 +254,7 @@ public:
   virtual ~_TAO_CORBA_FixedDef_Proxy_Impl (void) { }
   virtual CORBA::UShort digits (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -263,7 +263,7 @@ public:
   virtual void digits (
       CORBA_Object *_collocated_tao_target_,
       CORBA::UShort digits
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -271,7 +271,7 @@ public:
 
   virtual CORBA::Short scale (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -280,7 +280,7 @@ public:
   virtual void scale (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Short scale
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -311,7 +311,7 @@ public:
   virtual ~_TAO_CORBA_FixedDef_Remote_Proxy_Impl (void) { }
   virtual CORBA::UShort digits (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -320,7 +320,7 @@ public:
   virtual void digits (
       CORBA_Object *_collocated_tao_target_,
       CORBA::UShort digits
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -328,7 +328,7 @@ public:
 
   virtual CORBA::Short scale (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -337,7 +337,7 @@ public:
   virtual void scale (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Short scale
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -366,7 +366,7 @@ public:
   virtual ~_TAO_CORBA_FixedDef_Proxy_Broker (void);
   virtual _TAO_CORBA_FixedDef_Proxy_Impl &select_proxy (
       CORBA_FixedDef *object
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) = 0;
 
 protected:
@@ -393,7 +393,7 @@ public:
 
   virtual _TAO_CORBA_FixedDef_Proxy_Impl &select_proxy (
       CORBA_FixedDef *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -685,7 +685,7 @@ public:
     static CORBA_ValueMemberDef_ptr tao_nil (void);
     static CORBA_ValueMemberDef_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -749,12 +749,12 @@ public:
 
     static CORBA_ValueMemberDef_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static CORBA_ValueMemberDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static CORBA_ValueMemberDef_ptr _nil (void)
@@ -765,14 +765,14 @@ public:
     static void _tao_any_destructor (void*);
 
     virtual CORBA::TypeCode_ptr type (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual CORBA_IDLType_ptr type_def (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -780,14 +780,14 @@ public:
 
     virtual void type_def (
         CORBA_IDLType_ptr type_def
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual CORBA::Visibility access (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -795,7 +795,7 @@ public:
 
     virtual void access (
         CORBA::Visibility access
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -803,7 +803,7 @@ public:
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -853,7 +853,7 @@ public:
     virtual ~_TAO_CORBA_ValueMemberDef_Proxy_Impl (void) { }
     virtual CORBA::TypeCode_ptr type (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -861,7 +861,7 @@ public:
 
     virtual CORBA_IDLType_ptr type_def (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -870,7 +870,7 @@ public:
     virtual void type_def (
         CORBA_Object *_collocated_tao_target_,
         CORBA_IDLType_ptr type_def
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -878,7 +878,7 @@ public:
 
     virtual CORBA::Visibility access (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -887,7 +887,7 @@ public:
     virtual void access (
         CORBA_Object *_collocated_tao_target_,
         CORBA::Visibility access
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -918,7 +918,7 @@ public:
     virtual ~_TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl (void) { }
     virtual CORBA::TypeCode_ptr type (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -926,7 +926,7 @@ public:
 
     virtual CORBA_IDLType_ptr type_def (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -935,7 +935,7 @@ public:
     virtual void type_def (
         CORBA_Object *_collocated_tao_target_,
         CORBA_IDLType_ptr type_def
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -943,7 +943,7 @@ public:
 
     virtual CORBA::Visibility access (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -952,7 +952,7 @@ public:
     virtual void access (
         CORBA_Object *_collocated_tao_target_,
         CORBA::Visibility access
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -981,7 +981,7 @@ public:
     virtual ~_TAO_CORBA_ValueMemberDef_Proxy_Broker (void);
     virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy (
         CORBA_ValueMemberDef *object
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
 
   protected:
@@ -1008,7 +1008,7 @@ public:
 
     virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy (
         CORBA_ValueMemberDef *object
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     private:
@@ -1069,7 +1069,7 @@ public:
       static CORBA_ValueDef_ptr tao_nil (void);
       static CORBA_ValueDef_ptr tao_narrow (
           CORBA::Object *
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
       static CORBA::Object * tao_upcast (void *);
 
@@ -1135,12 +1135,12 @@ public:
 
       static CORBA_ValueDef_ptr _narrow (
           CORBA::Object_ptr obj
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
       static CORBA_ValueDef_ptr _unchecked_narrow (
           CORBA::Object_ptr obj
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
       static CORBA_ValueDef_ptr _nil (void)
@@ -1151,7 +1151,7 @@ public:
       static void _tao_any_destructor (void*);
 
       virtual CORBA_InterfaceDefSeq * supported_interfaces (
-          TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1159,14 +1159,14 @@ public:
 
       virtual void supported_interfaces (
           const CORBA_InterfaceDefSeq & supported_interfaces
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
 
       virtual CORBA_InitializerSeq * initializers (
-          TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1174,14 +1174,14 @@ public:
 
       virtual void initializers (
           const CORBA_InitializerSeq & initializers
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
 
       virtual CORBA_ValueDef_ptr base_value (
-          TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1189,14 +1189,14 @@ public:
 
       virtual void base_value (
           CORBA_ValueDef_ptr base_value
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
 
       virtual CORBA_ValueDefSeq * abstract_base_values (
-          TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1204,14 +1204,14 @@ public:
 
       virtual void abstract_base_values (
           const CORBA_ValueDefSeq & abstract_base_values
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
 
       virtual CORBA::Boolean is_abstract (
-          TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1219,14 +1219,14 @@ public:
 
       virtual void is_abstract (
           CORBA::Boolean is_abstract
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
 
       virtual CORBA::Boolean is_custom (
-          TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1234,14 +1234,14 @@ public:
 
       virtual void is_custom (
           CORBA::Boolean is_custom
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
         ));
 
       virtual CORBA::Boolean is_truncatable (
-          TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1249,7 +1249,7 @@ public:
 
       virtual void is_truncatable (
           CORBA::Boolean is_truncatable
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1257,7 +1257,7 @@ public:
 
       virtual CORBA::Boolean is_a (
           const char * id
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1344,7 +1344,7 @@ public:
       static CORBA::TypeCode_ptr _tc_FullValueDescription;
 
       virtual CORBA_ValueDef::FullValueDescription * describe_value (
-          TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1356,7 +1356,7 @@ public:
           const char * version,
           CORBA_IDLType_ptr type,
           CORBA::Visibility access
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1368,7 +1368,7 @@ public:
           const char * version,
           CORBA_IDLType_ptr type,
           CORBA::AttributeMode mode
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1383,7 +1383,7 @@ public:
           const CORBA_ParDescriptionSeq & params,
           const CORBA_ExceptionDefSeq & exceptions,
           const CORBA_ContextIdSeq & contexts
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1391,7 +1391,7 @@ public:
 
       virtual CORBA::Boolean _is_a (
           const CORBA::Char *type_id
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
       virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -1443,7 +1443,7 @@ public:
       virtual ~_TAO_CORBA_ValueDef_Proxy_Impl (void) { }
       virtual CORBA_InterfaceDefSeq * supported_interfaces (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1452,7 +1452,7 @@ public:
       virtual void supported_interfaces (
           CORBA_Object *_collocated_tao_target_,
           const CORBA_InterfaceDefSeq & supported_interfaces
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1460,7 +1460,7 @@ public:
 
       virtual CORBA_InitializerSeq * initializers (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1469,7 +1469,7 @@ public:
       virtual void initializers (
           CORBA_Object *_collocated_tao_target_,
           const CORBA_InitializerSeq & initializers
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1477,7 +1477,7 @@ public:
 
       virtual CORBA_ValueDef_ptr base_value (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1486,7 +1486,7 @@ public:
       virtual void base_value (
           CORBA_Object *_collocated_tao_target_,
           CORBA_ValueDef_ptr base_value
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1494,7 +1494,7 @@ public:
 
       virtual CORBA_ValueDefSeq * abstract_base_values (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1503,7 +1503,7 @@ public:
       virtual void abstract_base_values (
           CORBA_Object *_collocated_tao_target_,
           const CORBA_ValueDefSeq & abstract_base_values
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1511,7 +1511,7 @@ public:
 
       virtual CORBA::Boolean is_abstract (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1520,7 +1520,7 @@ public:
       virtual void is_abstract (
           CORBA_Object *_collocated_tao_target_,
           CORBA::Boolean is_abstract
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1528,7 +1528,7 @@ public:
 
       virtual CORBA::Boolean is_custom (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1537,7 +1537,7 @@ public:
       virtual void is_custom (
           CORBA_Object *_collocated_tao_target_,
           CORBA::Boolean is_custom
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1545,7 +1545,7 @@ public:
 
       virtual CORBA::Boolean is_truncatable (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1554,7 +1554,7 @@ public:
       virtual void is_truncatable (
           CORBA_Object *_collocated_tao_target_,
           CORBA::Boolean is_truncatable
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1563,7 +1563,7 @@ public:
       virtual CORBA::Boolean is_a (
           CORBA_Object *_collocated_tao_target_,
           const char * id
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1571,7 +1571,7 @@ public:
 
       virtual CORBA_ValueDef::FullValueDescription * describe_value (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1584,7 +1584,7 @@ public:
           const char * version,
           CORBA_IDLType_ptr type,
           CORBA::Visibility access
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1597,7 +1597,7 @@ public:
           const char * version,
           CORBA_IDLType_ptr type,
           CORBA::AttributeMode mode
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1613,7 +1613,7 @@ public:
           const CORBA_ParDescriptionSeq & params,
           const CORBA_ExceptionDefSeq & exceptions,
           const CORBA_ContextIdSeq & contexts
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1646,7 +1646,7 @@ public:
       virtual ~_TAO_CORBA_ValueDef_Remote_Proxy_Impl (void) { }
       virtual CORBA_InterfaceDefSeq * supported_interfaces (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1655,7 +1655,7 @@ public:
       virtual void supported_interfaces (
           CORBA_Object *_collocated_tao_target_,
           const CORBA_InterfaceDefSeq & supported_interfaces
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1663,7 +1663,7 @@ public:
 
       virtual CORBA_InitializerSeq * initializers (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1672,7 +1672,7 @@ public:
       virtual void initializers (
           CORBA_Object *_collocated_tao_target_,
           const CORBA_InitializerSeq & initializers
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1680,7 +1680,7 @@ public:
 
       virtual CORBA_ValueDef_ptr base_value (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1689,7 +1689,7 @@ public:
       virtual void base_value (
           CORBA_Object *_collocated_tao_target_,
           CORBA_ValueDef_ptr base_value
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1697,7 +1697,7 @@ public:
 
       virtual CORBA_ValueDefSeq * abstract_base_values (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1706,7 +1706,7 @@ public:
       virtual void abstract_base_values (
           CORBA_Object *_collocated_tao_target_,
           const CORBA_ValueDefSeq & abstract_base_values
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1714,7 +1714,7 @@ public:
 
       virtual CORBA::Boolean is_abstract (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1723,7 +1723,7 @@ public:
       virtual void is_abstract (
           CORBA_Object *_collocated_tao_target_,
           CORBA::Boolean is_abstract
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1731,7 +1731,7 @@ public:
 
       virtual CORBA::Boolean is_custom (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1740,7 +1740,7 @@ public:
       virtual void is_custom (
           CORBA_Object *_collocated_tao_target_,
           CORBA::Boolean is_custom
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1748,7 +1748,7 @@ public:
 
       virtual CORBA::Boolean is_truncatable (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1757,7 +1757,7 @@ public:
       virtual void is_truncatable (
           CORBA_Object *_collocated_tao_target_,
           CORBA::Boolean is_truncatable
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1766,7 +1766,7 @@ public:
       virtual CORBA::Boolean is_a (
           CORBA_Object *_collocated_tao_target_,
           const char * id
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1774,7 +1774,7 @@ public:
 
       virtual CORBA_ValueDef::FullValueDescription * describe_value (
           CORBA_Object *_collocated_tao_target_
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1787,7 +1787,7 @@ public:
           const char * version,
           CORBA_IDLType_ptr type,
           CORBA::Visibility access
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1800,7 +1800,7 @@ public:
           const char * version,
           CORBA_IDLType_ptr type,
           CORBA::AttributeMode mode
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1816,7 +1816,7 @@ public:
           const CORBA_ParDescriptionSeq & params,
           const CORBA_ExceptionDefSeq & exceptions,
           const CORBA_ContextIdSeq & contexts
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         )
         ACE_THROW_SPEC ((
           CORBA::SystemException
@@ -1845,7 +1845,7 @@ public:
       virtual ~_TAO_CORBA_ValueDef_Proxy_Broker (void);
       virtual _TAO_CORBA_ValueDef_Proxy_Impl &select_proxy (
           CORBA_ValueDef *object
-          TAO_ENV_ARG_DECL_WITH_DEFAULTS
+          ACE_ENV_ARG_DECL_WITH_DEFAULTS
         ) = 0;
 
     protected:
@@ -1872,7 +1872,7 @@ public:
 
       virtual _TAO_CORBA_ValueDef_Proxy_Impl &select_proxy (
           CORBA_ValueDef *object
-          TAO_ENV_ARG_DECL
+          ACE_ENV_ARG_DECL
         );
 
       private:
@@ -2006,7 +2006,7 @@ public:
         static CORBA_ValueBoxDef_ptr tao_nil (void);
         static CORBA_ValueBoxDef_ptr tao_narrow (
             CORBA::Object *
-            TAO_ENV_ARG_DECL_NOT_USED
+            ACE_ENV_ARG_DECL_NOT_USED
           );
         static CORBA::Object * tao_upcast (void *);
 
@@ -2070,12 +2070,12 @@ public:
 
         static CORBA_ValueBoxDef_ptr _narrow (
             CORBA::Object_ptr obj
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
         static CORBA_ValueBoxDef_ptr _unchecked_narrow (
             CORBA::Object_ptr obj
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
         static CORBA_ValueBoxDef_ptr _nil (void)
@@ -2086,7 +2086,7 @@ public:
         static void _tao_any_destructor (void*);
 
         virtual CORBA_IDLType_ptr original_type_def (
-            TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+            ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -2094,7 +2094,7 @@ public:
 
         virtual void original_type_def (
             CORBA_IDLType_ptr original_type_def
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -2102,7 +2102,7 @@ public:
 
         virtual CORBA::Boolean _is_a (
             const CORBA::Char *type_id
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
         virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -2152,7 +2152,7 @@ public:
         virtual ~_TAO_CORBA_ValueBoxDef_Proxy_Impl (void) { }
         virtual CORBA_IDLType_ptr original_type_def (
             CORBA_Object *_collocated_tao_target_
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -2161,7 +2161,7 @@ public:
         virtual void original_type_def (
             CORBA_Object *_collocated_tao_target_,
             CORBA_IDLType_ptr original_type_def
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -2192,7 +2192,7 @@ public:
         virtual ~_TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl (void) { }
         virtual CORBA_IDLType_ptr original_type_def (
             CORBA_Object *_collocated_tao_target_
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -2201,7 +2201,7 @@ public:
         virtual void original_type_def (
             CORBA_Object *_collocated_tao_target_,
             CORBA_IDLType_ptr original_type_def
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           )
           ACE_THROW_SPEC ((
             CORBA::SystemException
@@ -2230,7 +2230,7 @@ public:
         virtual ~_TAO_CORBA_ValueBoxDef_Proxy_Broker (void);
         virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy (
             CORBA_ValueBoxDef *object
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS
           ) = 0;
 
       protected:
@@ -2257,7 +2257,7 @@ public:
 
         virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy (
             CORBA_ValueBoxDef *object
-            TAO_ENV_ARG_DECL
+            ACE_ENV_ARG_DECL
           );
 
         private:
diff --git a/TAO/tao/IFR_Client_Adapter.cpp b/TAO/tao/IFR_Client_Adapter.cpp
index 9aff98f44fe..a8328362bd6 100644
--- a/TAO/tao/IFR_Client_Adapter.cpp
+++ b/TAO/tao/IFR_Client_Adapter.cpp
@@ -32,14 +32,14 @@ TAO_IFR_Client_Adapter::dispose (CORBA_InterfaceDef_ptr)
 CORBA_InterfaceDef_ptr
 TAO_IFR_Client_Adapter::get_interface (CORBA::ORB_ptr,
                                        const char *
-                                       TAO_ENV_ARG_DECL_NOT_USED)
+                                       ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 CORBA_InterfaceDef_ptr
 TAO_IFR_Client_Adapter::get_interface_remote (const CORBA::Object_ptr
-                                              TAO_ENV_ARG_DECL_NOT_USED)
+                                              ACE_ENV_ARG_DECL_NOT_USED)
 {
   return 0;
 }
diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h
index f6158f80841..f2bbb4cc512 100644
--- a/TAO/tao/IFR_Client_Adapter.h
+++ b/TAO/tao/IFR_Client_Adapter.h
@@ -54,12 +54,12 @@ public:
   virtual CORBA_InterfaceDef_ptr get_interface (
       CORBA::ORB_ptr orb,
       const char *repo_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual CORBA_InterfaceDef_ptr get_interface_remote (
       const CORBA::Object_ptr target
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 };
 
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index 5ff8b03195e..928dd51e586 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -256,7 +256,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::ListenPoint
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (IIOP::_tc_ListenPoint TAO_ENV_ARG_PARAMETER);
+      type->equivalent (IIOP::_tc_ListenPoint ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -349,7 +349,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::ListenPointL
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (IIOP::_tc_ListenPointList TAO_ENV_ARG_PARAMETER);
+      type->equivalent (IIOP::_tc_ListenPointList ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -435,7 +435,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IIOP::BiDirIIOPSer
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
       type->equivalent (IIOP::_tc_BiDirIIOPServiceContext
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index d029ef9154b..371b49d9f84 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -906,7 +906,7 @@ TAO_IIOP_Acceptor::init_tcp_properties (void)
   int recv_buffer_size = this->orb_core_->orb_params ()->sock_rcvbuf_size ();
   int no_delay = this->orb_core_->orb_params ()->nodelay ();
 
-  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (tph != 0)
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index ec0bac2b60c..412aa22e33d 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -117,7 +117,7 @@ TAO_IIOP_Connector::close (void)
 int
 TAO_IIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
                              TAO_Transport_Descriptor_Interface *desc
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
 {
   TAO_Transport *&transport = invocation->transport ();
   ACE_Time_Value *max_wait_time = invocation->max_wait_time ();
@@ -427,7 +427,7 @@ TAO_IIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_IIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL)
+TAO_IIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
@@ -494,7 +494,7 @@ TAO_IIOP_Connector::init_tcp_properties (void)
   // lookup and caching are not done based on protocol
   // properties.
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   // Initialize the settings to the ORB defaults.  If RT CORBA is enabled,
   // it may override these.
@@ -502,7 +502,7 @@ TAO_IIOP_Connector::init_tcp_properties (void)
   int recv_buffer_size = this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
   int no_delay = this->orb_core ()->orb_params ()->nodelay ();
 
-  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (tph != 0)
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index b6b10fbc772..c15310d8972 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -58,7 +58,7 @@ public:
   int close (void);
   int connect (TAO_GIOP_Invocation *invocation,
                TAO_Transport_Descriptor_Interface *desc
-               TAO_ENV_ARG_DECL);
+               ACE_ENV_ARG_DECL);
   int preconnect (const char *preconnections);
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -70,7 +70,7 @@ protected:
 
   /// More TAO_Connector methods, please check the documentation on
   /// Pluggable.h
-  virtual TAO_Profile *make_profile (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Obtain tcp properties that must be used by this connector, i.e.,
   /// initialize <tcp_properties_>.
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 7b31e4acce5..923c34df9a4 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -163,7 +163,7 @@ TAO_IIOP_Profile::decode (TAO_InputCDR& cdr)
 
 void
 TAO_IIOP_Profile::parse_string (const char *ior
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   if (!ior || !*ior)
     {
@@ -329,7 +329,7 @@ TAO_IIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
 
 CORBA::ULong
 TAO_IIOP_Profile::hash (CORBA::ULong max
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
@@ -374,7 +374,7 @@ TAO_IIOP_Profile::add_endpoint (TAO_IIOP_Endpoint *endp)
 }
 
 char *
-TAO_IIOP_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
   TAO_ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index b837f202439..8b55bead27f 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -75,7 +75,7 @@ public:
   /// Initialize this object using the given input string.
   /// Url-style string contain only one endpoint.
   virtual void parse_string (const char *string
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /**
    * Return a string representation for this profile.
@@ -83,7 +83,7 @@ public:
    * This is used to create url-style reference.  Only one
    * endpoint is included into the string.
    */
-  virtual char * to_string (TAO_ENV_SINGLE_ARG_DECL);
+  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Initialize this object using the given CDR octet string.
   virtual int decode (TAO_InputCDR& cdr);
@@ -140,7 +140,7 @@ public:
 
   /// Return a hash value for this object.
   virtual CORBA::ULong hash (CORBA::ULong max
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /// Please refer to Profile.h for the documentation of this
   /// function.
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 376ff91f2ed..2fd12da18b4 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -1597,10 +1597,10 @@ tao_IOP_Codec_nil (
 IOP::Codec_ptr
 tao_IOP_Codec_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IOP::Codec::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IOP::Codec::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1721,10 +1721,10 @@ IOP::Codec_var::tao_nil (void)
 ::IOP::Codec_ptr
 IOP::Codec_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IOP::Codec::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IOP::Codec::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1806,15 +1806,15 @@ IOP::Codec::~Codec (void)
 
 IOP::Codec_ptr IOP::Codec::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Codec::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return Codec::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IOP::Codec_ptr IOP::Codec::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1909,7 +1909,7 @@ void IOP::Codec::InvalidTypeForEncoding::_raise ()
 
 void IOP::Codec::InvalidTypeForEncoding::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -1917,7 +1917,7 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_encode (
 
 void IOP::Codec::InvalidTypeForEncoding::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -1977,7 +1977,7 @@ void IOP::Codec::FormatMismatch::_raise ()
 
 void IOP::Codec::FormatMismatch::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -1985,7 +1985,7 @@ void IOP::Codec::FormatMismatch::_tao_encode (
 
 void IOP::Codec::FormatMismatch::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -2045,7 +2045,7 @@ void IOP::Codec::TypeMismatch::_raise ()
 
 void IOP::Codec::TypeMismatch::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -2053,7 +2053,7 @@ void IOP::Codec::TypeMismatch::_tao_encode (
 
 void IOP::Codec::TypeMismatch::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -2211,10 +2211,10 @@ tao_IOP_CodecFactory_nil (
 IOP::CodecFactory_ptr
 tao_IOP_CodecFactory_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IOP::CodecFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IOP::CodecFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2337,10 +2337,10 @@ IOP::CodecFactory_var::tao_nil (void)
 ::IOP::CodecFactory_ptr
 IOP::CodecFactory_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IOP::CodecFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IOP::CodecFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2422,15 +2422,15 @@ IOP::CodecFactory::~CodecFactory (void)
 
 IOP::CodecFactory_ptr IOP::CodecFactory::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CodecFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CodecFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IOP::CodecFactory_ptr IOP::CodecFactory::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2525,7 +2525,7 @@ void IOP::CodecFactory::UnknownEncoding::_raise ()
 
 void IOP::CodecFactory::UnknownEncoding::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -2533,7 +2533,7 @@ void IOP::CodecFactory::UnknownEncoding::_tao_encode (
 
 void IOP::CodecFactory::UnknownEncoding::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -2584,7 +2584,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedProfile
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedProfile TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedProfile ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2667,7 +2667,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::IOR *&_tao_el
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_IOR TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_IOR ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2750,7 +2750,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponent TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponent ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2841,7 +2841,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::MultipleCompo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_MultipleComponentProfile TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_MultipleComponentProfile ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2932,7 +2932,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentList TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentList ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3023,7 +3023,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3106,7 +3106,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContext TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContext ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3197,7 +3197,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContextList TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContextList ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3287,7 +3287,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::Encoding *&_t
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (IOP::_tc_Encoding TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (IOP::_tc_Encoding ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index 61303ca2cc6..87393af40d0 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -1280,7 +1280,7 @@ TAO_NAMESPACE  IOP
     static Codec_ptr tao_duplicate (Codec_ptr);
     static void tao_release (Codec_ptr);
     static Codec_ptr tao_nil (void);
-    static Codec_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static Codec_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1335,11 +1335,11 @@ class TAO_Export Codec : public virtual CORBA_Object
   static Codec_ptr _duplicate (Codec_ptr obj);
   static Codec_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static Codec_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static Codec_ptr _nil (void)
     {
@@ -1369,12 +1369,12 @@ class TAO_Export Codec : public virtual CORBA_Object
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static InvalidTypeForEncoding *_downcast (CORBA::Exception *);
@@ -1410,12 +1410,12 @@ class TAO_Export Codec : public virtual CORBA_Object
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static FormatMismatch *_downcast (CORBA::Exception *);
@@ -1451,12 +1451,12 @@ class TAO_Export Codec : public virtual CORBA_Object
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static TypeMismatch *_downcast (CORBA::Exception *);
@@ -1471,7 +1471,7 @@ class TAO_Export Codec : public virtual CORBA_Object
 
     virtual CORBA::OctetSeq * encode (
         const CORBA::Any & data
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1480,7 +1480,7 @@ class TAO_Export Codec : public virtual CORBA_Object
 
     virtual CORBA::Any * decode (
         const CORBA::OctetSeq & data
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1489,7 +1489,7 @@ class TAO_Export Codec : public virtual CORBA_Object
 
     virtual CORBA::OctetSeq * encode_value (
         const CORBA::Any & data
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1499,7 +1499,7 @@ class TAO_Export Codec : public virtual CORBA_Object
     virtual CORBA::Any * decode_value (
         const CORBA::OctetSeq & data,
         CORBA::TypeCode_ptr tc
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1619,7 +1619,7 @@ class TAO_Export Codec : public virtual CORBA_Object
     static CodecFactory_ptr tao_duplicate (CodecFactory_ptr);
     static void tao_release (CodecFactory_ptr);
     static CodecFactory_ptr tao_nil (void);
-    static CodecFactory_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static CodecFactory_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1674,11 +1674,11 @@ class TAO_Export CodecFactory : public virtual CORBA_Object
   static CodecFactory_ptr _duplicate (CodecFactory_ptr obj);
   static CodecFactory_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CodecFactory_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CodecFactory_ptr _nil (void)
     {
@@ -1708,12 +1708,12 @@ class TAO_Export CodecFactory : public virtual CORBA_Object
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static UnknownEncoding *_downcast (CORBA::Exception *);
@@ -1728,7 +1728,7 @@ class TAO_Export CodecFactory : public virtual CORBA_Object
 
     virtual IOP::Codec_ptr create_codec (
         const IOP::Encoding & enc
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index 783f085ef51..6432a6ef17f 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -84,7 +84,7 @@ void TAO_IOP::EmptyProfileList::_raise ()
 
 void TAO_IOP::EmptyProfileList::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -97,7 +97,7 @@ void TAO_IOP::EmptyProfileList::_tao_encode (
 
 void TAO_IOP::EmptyProfileList::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -210,7 +210,7 @@ void TAO_IOP::NotFound::_raise ()
 
 void TAO_IOP::NotFound::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -223,7 +223,7 @@ void TAO_IOP::NotFound::_tao_encode (
 
 void TAO_IOP::NotFound::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -332,7 +332,7 @@ void TAO_IOP::Duplicate::_raise ()
 
 void TAO_IOP::Duplicate::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -345,7 +345,7 @@ void TAO_IOP::Duplicate::_tao_encode (
 
 void TAO_IOP::Duplicate::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -454,7 +454,7 @@ void TAO_IOP::Invalid_IOR::_raise ()
 
 void TAO_IOP::Invalid_IOR::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -467,7 +467,7 @@ void TAO_IOP::Invalid_IOR::_tao_encode (
 
 void TAO_IOP::Invalid_IOR::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -576,7 +576,7 @@ void TAO_IOP::MultiProfileList::_raise ()
 
 void TAO_IOP::MultiProfileList::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -589,7 +589,7 @@ void TAO_IOP::MultiProfileList::_tao_encode (
 
 void TAO_IOP::MultiProfileList::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -761,10 +761,10 @@ TAO_IOP::TAO_IOR_Property_var::tao_nil (void)
 ::TAO_IOP::TAO_IOR_Property_ptr
 TAO_IOP::TAO_IOR_Property_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::TAO_IOP::TAO_IOR_Property::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::TAO_IOP::TAO_IOR_Property::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -846,15 +846,15 @@ TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void)
 
 TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return TAO_IOR_Property::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return TAO_IOR_Property::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1014,10 +1014,10 @@ TAO_IOP::TAO_IOR_Manipulation_var::tao_nil (void)
 ::TAO_IOP::TAO_IOR_Manipulation_ptr
 TAO_IOP::TAO_IOR_Manipulation_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::TAO_IOP::TAO_IOR_Manipulation::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::TAO_IOP::TAO_IOR_Manipulation::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1099,15 +1099,15 @@ TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
 
 TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return TAO_IOR_Manipulation::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return TAO_IOR_Manipulation::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1230,11 +1230,11 @@ const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_downcast (
       void* target,
       CORBA_Object *src
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
     CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, target);
-    *tmp = CORBA::Object::_narrow (src TAO_ENV_ARG_PARAMETER);
+    *tmp = CORBA::Object::_narrow (src ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -1337,7 +1337,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::EmptyProf
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_EmptyProfileList TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_EmptyProfileList ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -1427,7 +1427,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::NotFound
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_NotFound TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_NotFound ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -1517,7 +1517,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Duplicate
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Duplicate TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Duplicate ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -1607,7 +1607,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Invalid_I
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Invalid_IOR TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Invalid_IOR ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -1697,7 +1697,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::MultiProf
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_MultiProfileList TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_MultiProfileList ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index ed6557ecc35..601190f4f12 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -90,12 +90,12 @@ TAO_NAMESPACE  TAO_IOP
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
 
     static EmptyProfileList *_downcast (CORBA::Exception *);
@@ -136,12 +136,12 @@ TAO_NAMESPACE  TAO_IOP
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
 
     static NotFound *_downcast (CORBA::Exception *);
@@ -182,12 +182,12 @@ TAO_NAMESPACE  TAO_IOP
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
 
     static Duplicate *_downcast (CORBA::Exception *);
@@ -228,12 +228,12 @@ TAO_NAMESPACE  TAO_IOP
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
 
     static Invalid_IOR *_downcast (CORBA::Exception *);
@@ -274,12 +274,12 @@ TAO_NAMESPACE  TAO_IOP
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
 
     static MultiProfileList *_downcast (CORBA::Exception *);
@@ -334,7 +334,7 @@ TAO_NAMESPACE  TAO_IOP
     static TAO_IOR_Property_ptr tao_duplicate (TAO_IOR_Property_ptr);
     static void tao_release (TAO_IOR_Property_ptr);
     static TAO_IOR_Property_ptr tao_nil (void);
-    static TAO_IOR_Property_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static TAO_IOR_Property_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -389,11 +389,11 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
     static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj);
     static TAO_IOR_Property_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static TAO_IOR_Property_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static TAO_IOR_Property_ptr _nil (void)
       {
@@ -402,7 +402,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
 
     virtual CORBA::Boolean set_property (
         CORBA::Object_ptr ior
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -412,7 +412,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
     virtual CORBA::Boolean set_primary (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -422,7 +422,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
 
     virtual CORBA::Object_ptr get_primary (
         CORBA::Object_ptr ior
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -431,7 +431,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
 
     virtual CORBA::Boolean is_primary_set (
         CORBA::Object_ptr ior
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -492,7 +492,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
     static TAO_IOR_Manipulation_ptr tao_duplicate (TAO_IOR_Manipulation_ptr);
     static void tao_release (TAO_IOR_Manipulation_ptr);
     static TAO_IOR_Manipulation_ptr tao_nil (void);
-    static TAO_IOR_Manipulation_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static TAO_IOR_Manipulation_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -547,11 +547,11 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
     static TAO_IOR_Manipulation_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static TAO_IOR_Manipulation_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static TAO_IOR_Manipulation_ptr _nil (void)
       {
@@ -590,7 +590,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
         virtual void _downcast (
             void* target,
             CORBA_Object *src
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
         virtual CORBA_Object* _upcast (void *src) const;
 
@@ -709,7 +709,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 
     virtual CORBA::Object_ptr merge_iors (
         const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -721,7 +721,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     virtual CORBA::Object_ptr add_profiles (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -733,7 +733,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     virtual CORBA::Object_ptr remove_profiles (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -745,7 +745,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     virtual CORBA::Boolean set_property (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -757,7 +757,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -770,7 +770,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     virtual CORBA::Object_ptr get_primary (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -780,7 +780,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     virtual CORBA::Boolean is_primary_set (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -789,7 +789,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     virtual CORBA::ULong is_in_ior (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -798,7 +798,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 
     virtual CORBA::ULong get_profile_count (
         CORBA::Object_ptr ior
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.i
index 073be5e1c98..f7d24f5143b 100644
--- a/TAO/tao/IORManipulation/IORC.i
+++ b/TAO/tao/IORManipulation/IORC.i
@@ -70,10 +70,10 @@ tao_TAO_IOP_TAO_IOR_Property_nil (
 ACE_INLINE TAO_IOP::TAO_IOR_Property_ptr
 tao_TAO_IOP_TAO_IOR_Property_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return TAO_IOP::TAO_IOR_Property::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return TAO_IOP::TAO_IOR_Property::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -494,10 +494,10 @@ tao_TAO_IOP_TAO_IOR_Manipulation_nil (
 ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
 tao_TAO_IOP_TAO_IOR_Manipulation_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return TAO_IOP::TAO_IOR_Manipulation::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return TAO_IOP::TAO_IOR_Manipulation::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.cpp b/TAO/tao/IORManipulation/IORManip_Loader.cpp
index 46365ab2016..2ac6b5b4597 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp
@@ -27,7 +27,7 @@ CORBA::Object_ptr
 TAO_IORManip_Loader::create_object (CORBA::ORB_ptr,
                                     int,
                                     char *[]
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj;
diff --git a/TAO/tao/IORManipulation/IORManip_Loader.h b/TAO/tao/IORManipulation/IORManip_Loader.h
index 68d63af9f64..af9b77b1984 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.h
+++ b/TAO/tao/IORManipulation/IORManip_Loader.h
@@ -36,7 +36,7 @@ public:
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            char *argv []
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Creates a IORManip factory and returns it.
 
diff --git a/TAO/tao/IORManipulation/IORManipulation.cpp b/TAO/tao/IORManipulation/IORManipulation.cpp
index 95df98ceb57..728d357f902 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -50,7 +50,7 @@ TAO_IOR_Manipulation_impl::_remove_ref (void)
 CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::merge_iors (
     const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        TAO_IOP::EmptyProfileList,
                        TAO_IOP::Duplicate,
@@ -121,7 +121,7 @@ TAO_IOR_Manipulation_impl::merge_iors (
 
   TAO_Stub *stub = orb_core->create_stub (id._retn (), // give the id string
                                           Merged_Profiles
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Make the stub memory allocation exception safe for the duration
@@ -156,7 +156,7 @@ CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::add_profiles (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList,
@@ -170,14 +170,14 @@ TAO_IOR_Manipulation_impl::add_profiles (
   buffer [0] = ior1;
   buffer [1] = ior2;
   TAO_IOP::TAO_IOR_Manipulation::IORList iors (2, 2, buffer, 0);
-  return this->merge_iors (iors TAO_ENV_ARG_PARAMETER);
+  return this->merge_iors (iors ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::remove_profiles (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::Invalid_IOR,
@@ -225,7 +225,7 @@ TAO_IOR_Manipulation_impl::remove_profiles (
 
   TAO_Stub *stub = orb_core->create_stub (id._retn (), // give the id string
                                           Diff_Profiles
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Make the stub memory allocation exception safe for the duration
@@ -260,7 +260,7 @@ CORBA::Boolean
 TAO_IOR_Manipulation_impl::set_property (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr ior
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -275,7 +275,7 @@ TAO_IOR_Manipulation_impl::set_property (
 
   // Call the implementation object to
   return prop->set_property (ior
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
@@ -283,7 +283,7 @@ TAO_IOR_Manipulation_impl::set_primary (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr ior1,
       CORBA::Object_ptr ior2
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -306,14 +306,14 @@ TAO_IOR_Manipulation_impl::set_primary (
   // Call the callback object to do the rest of the processing.
   return prop->set_primary (ior1,
                             ior2
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object_ptr
 TAO_IOR_Manipulation_impl::get_primary (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr ior
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -329,27 +329,27 @@ TAO_IOR_Manipulation_impl::get_primary (
   // here?
 
   return prop->get_primary (ior
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_IOR_Manipulation_impl::is_primary_set (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr ior
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ))
 {
-  return prop->is_primary_set (ior TAO_ENV_ARG_PARAMETER);
+  return prop->is_primary_set (ior ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::ULong
 TAO_IOR_Manipulation_impl::is_in_ior (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
@@ -381,7 +381,7 @@ TAO_IOR_Manipulation_impl::is_in_ior (
 CORBA::ULong
 TAO_IOR_Manipulation_impl::get_profile_count (
     CORBA::Object_ptr ior
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index f446acfdb12..2fe4a8cc396 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -63,7 +63,7 @@ public:
 
   virtual CORBA::Object_ptr merge_iors (
     const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList,
@@ -74,7 +74,7 @@ public:
   virtual CORBA::Object_ptr add_profiles (
       CORBA::Object_ptr ior1,
       CORBA::Object_ptr ior2
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList,
@@ -85,7 +85,7 @@ public:
   virtual CORBA::Object_ptr remove_profiles (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::Invalid_IOR,
@@ -96,7 +96,7 @@ public:
   virtual CORBA::Boolean set_property (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr ior
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -108,7 +108,7 @@ public:
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr ior1,
       CORBA::Object_ptr ior2
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -120,7 +120,7 @@ public:
   virtual CORBA::Object_ptr get_primary (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr ior
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -130,7 +130,7 @@ public:
   virtual CORBA::Boolean is_primary_set (
       TAO_IOP::TAO_IOR_Property_ptr prop,
       CORBA::Object_ptr ior
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -139,7 +139,7 @@ public:
   virtual CORBA::ULong is_in_ior (
     CORBA::Object_ptr ior1,
     CORBA::Object_ptr ior2
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::NotFound
@@ -147,7 +147,7 @@ public:
 
   virtual CORBA::ULong get_profile_count (
     CORBA::Object_ptr ior
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList
diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp
index 1569daf4738..bfbc2936542 100644
--- a/TAO/tao/IORTable/IORTableC.cpp
+++ b/TAO/tao/IORTable/IORTableC.cpp
@@ -81,7 +81,7 @@ void IORTable::AlreadyBound::_raise ()
 
 void IORTable::AlreadyBound::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -89,7 +89,7 @@ void IORTable::AlreadyBound::_tao_encode (
 
 void IORTable::AlreadyBound::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -155,7 +155,7 @@ void IORTable::NotFound::_raise ()
 
 void IORTable::NotFound::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -163,7 +163,7 @@ void IORTable::NotFound::_tao_encode (
 
 void IORTable::NotFound::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -288,10 +288,10 @@ IORTable::Table_var::tao_nil (void)
 ::IORTable::Table_ptr
 IORTable::Table_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IORTable::Table::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IORTable::Table::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -373,15 +373,15 @@ IORTable::Table::~Table (void)
 
 IORTable::Table_ptr IORTable::Table::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Table::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return Table::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IORTable::Table_ptr IORTable::Table::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -541,10 +541,10 @@ IORTable::Locator_var::tao_nil (void)
 ::IORTable::Locator_ptr
 IORTable::Locator_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::IORTable::Locator::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::IORTable::Locator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -626,15 +626,15 @@ IORTable::Locator::~Locator (void)
 
 IORTable::Locator_ptr IORTable::Locator::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Locator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return Locator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 IORTable::Locator_ptr IORTable::Locator::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h
index 71ba8c9b18a..1f38984aab5 100644
--- a/TAO/tao/IORTable/IORTableC.h
+++ b/TAO/tao/IORTable/IORTableC.h
@@ -95,7 +95,7 @@ TAO_NAMESPACE  IORTable
     static Locator_ptr tao_duplicate (Locator_ptr);
     static void tao_release (Locator_ptr);
     static Locator_ptr tao_nil (void);
-    static Locator_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static Locator_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -157,12 +157,12 @@ TAO_NAMESPACE  IORTable
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
 
     static AlreadyBound *_downcast (CORBA::Exception *);
@@ -200,12 +200,12 @@ TAO_NAMESPACE  IORTable
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
 
     static NotFound *_downcast (CORBA::Exception *);
@@ -257,7 +257,7 @@ TAO_NAMESPACE  IORTable
     static Table_ptr tao_duplicate (Table_ptr);
     static void tao_release (Table_ptr);
     static Table_ptr tao_nil (void);
-    static Table_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static Table_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -312,11 +312,11 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
     static Table_ptr _duplicate (Table_ptr obj);
     static Table_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static Table_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static Table_ptr _nil (void)
       {
@@ -326,7 +326,7 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
     virtual void bind (
         const char * object_key,
         const char * IOR
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -336,7 +336,7 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
     virtual void rebind (
         const char * object_key,
         const char * IOR
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -344,7 +344,7 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
 
     virtual void unbind (
         const char * object_key
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -353,7 +353,7 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
 
     virtual void set_locator (
         IORTable::Locator_ptr the_locator
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -393,11 +393,11 @@ class TAO_IORTable_Export Locator : public virtual CORBA_Object
     static Locator_ptr _duplicate (Locator_ptr obj);
     static Locator_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static Locator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static Locator_ptr _nil (void)
       {
@@ -406,7 +406,7 @@ class TAO_IORTable_Export Locator : public virtual CORBA_Object
 
     virtual char * locate (
         const char * object_key
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/tao/IORTable/IORTableC.i b/TAO/tao/IORTable/IORTableC.i
index 061931da125..fd10672764d 100644
--- a/TAO/tao/IORTable/IORTableC.i
+++ b/TAO/tao/IORTable/IORTableC.i
@@ -58,10 +58,10 @@ tao_IORTable_Table_nil (
 ACE_INLINE IORTable::Table_ptr
 tao_IORTable_Table_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IORTable::Table::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IORTable::Table::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -108,10 +108,10 @@ tao_IORTable_Locator_nil (
 ACE_INLINE IORTable::Locator_ptr
 tao_IORTable_Locator_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return IORTable::Locator::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return IORTable::Locator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp
index ef8768a0139..79445cba79a 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp
@@ -16,7 +16,7 @@ TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void)
 
 char *
 TAO_IOR_Table_Impl::find (const char *object_key
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         IORTable::NotFound
@@ -37,14 +37,14 @@ TAO_IOR_Table_Impl::find (const char *object_key
       ACE_THROW_RETURN (IORTable::NotFound (), 0);
   }
 
-  return this->locator_->locate (object_key TAO_ENV_ARG_PARAMETER);
+  return this->locator_->locate (object_key ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_IOR_Table_Impl::bind (
         const char * object_key,
         const char * IOR
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -60,7 +60,7 @@ void
 TAO_IOR_Table_Impl::rebind (
         const char * object_key,
         const char * IOR
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -73,7 +73,7 @@ TAO_IOR_Table_Impl::rebind (
 void
 TAO_IOR_Table_Impl::unbind (
         const char * object_key
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -88,7 +88,7 @@ TAO_IOR_Table_Impl::unbind (
 void
 TAO_IOR_Table_Impl::set_locator (
         IORTable::Locator_ptr locator
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h
index cd2dabbde71..c14fe8a1c93 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/IOR_Table_Impl.h
@@ -40,7 +40,7 @@ public:
   /// Find the object, using the locator if it is not on the table.
   char *find (
       const char *object_key
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -52,7 +52,7 @@ public:
     virtual void bind (
         const char * object_key,
         const char * IOR
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -62,7 +62,7 @@ public:
     virtual void rebind (
         const char * object_key,
         const char * IOR
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -70,7 +70,7 @@ public:
 
     virtual void unbind (
         const char * object_key
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -79,7 +79,7 @@ public:
 
     virtual void set_locator (
         IORTable::Locator_ptr the_locator
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
index c3399cc3e0b..f5a34bc3a93 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -26,7 +26,7 @@ TAO_Table_Adapter::~TAO_Table_Adapter (void)
 }
 
 void
-TAO_Table_Adapter::open (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Table_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->root_,
                     TAO_IOR_Table_Impl (),
@@ -35,14 +35,14 @@ TAO_Table_Adapter::open (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Table_Adapter::close (int  TAO_ENV_ARG_DECL_NOT_USED)
+TAO_Table_Adapter::close (int  ACE_ENV_ARG_DECL_NOT_USED)
 {
   CORBA::release (this->root_);
   this->root_ = 0;
 }
 
 void
-TAO_Table_Adapter::check_close (int  TAO_ENV_ARG_DECL_NOT_USED)
+TAO_Table_Adapter::check_close (int  ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -56,7 +56,7 @@ int
 TAO_Table_Adapter::dispatch (TAO_ObjectKey &key,
                              TAO_ServerRequest &,
                              CORBA::Object_out forward_to
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var object_key;
@@ -65,12 +65,12 @@ TAO_Table_Adapter::dispatch (TAO_ObjectKey &key,
   ACE_TRY
     {
       CORBA::String_var ior =
-        this->root_->find (object_key.in () TAO_ENV_ARG_PARAMETER);
+        this->root_->find (object_key.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       forward_to =
         this->orb_core_->orb ()->string_to_object (ior.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (IORTable::NotFound, nf_ex)
diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h
index 7c50ffdc202..40f87cc5b12 100644
--- a/TAO/tao/IORTable/Table_Adapter.h
+++ b/TAO/tao/IORTable/Table_Adapter.h
@@ -37,16 +37,16 @@ public:
 
   // = The TAO_Adapter methods, please check tao/Adapter.h for the
   // documentation
-  virtual void open (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void open (ACE_ENV_SINGLE_ARG_DECL);
   virtual void close (int wait_for_completion
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   virtual void check_close (int wait_for_completion
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual int priority (void) const;
   virtual int dispatch (TAO_ObjectKey &key,
                         TAO_ServerRequest &request,
                         CORBA::Object_out foward_to
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual const char *name (void) const;
   virtual CORBA::Object_ptr root (void);
diff --git a/TAO/tao/IOR_Parser.h b/TAO/tao/IOR_Parser.h
index 14d8d99ee2a..6525cd02835 100644
--- a/TAO/tao/IOR_Parser.h
+++ b/TAO/tao/IOR_Parser.h
@@ -50,7 +50,7 @@ public:
    */
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
diff --git a/TAO/tao/Interceptor_List.cpp b/TAO/tao/Interceptor_List.cpp
index dc19a516650..bd409204bfc 100644
--- a/TAO/tao/Interceptor_List.cpp
+++ b/TAO/tao/Interceptor_List.cpp
@@ -25,7 +25,7 @@ TAO_Interceptor_List::~TAO_Interceptor_List (void)
 size_t
 TAO_Interceptor_List::add_interceptor_i (
     PortableInterceptor::Interceptor_ptr interceptor
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
@@ -34,7 +34,7 @@ TAO_Interceptor_List::add_interceptor_i (
       /// If the Interceptor is not anonymous, make sure an
       /// Interceptor with the same isn't already registered.
       CORBA::String_var name = interceptor->name (
-        TAO_ENV_SINGLE_ARG_PARAMETER);
+        ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       size_t old_len = this->length ();
@@ -122,10 +122,10 @@ TAO_ClientRequestInterceptor_List::interceptor (size_t index)
 void
 TAO_ClientRequestInterceptor_List::add_interceptor (
   PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   size_t index = this->add_interceptor_i (interceptor
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->interceptors_[index] =
@@ -168,10 +168,10 @@ TAO_ServerRequestInterceptor_List::interceptor (size_t index)
 void
 TAO_ServerRequestInterceptor_List::add_interceptor (
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   size_t index = this->add_interceptor_i (interceptor
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->interceptors_[index] =
@@ -216,10 +216,10 @@ TAO_IORInterceptor_List::interceptor (size_t index)
 void
 TAO_IORInterceptor_List::add_interceptor (
   PortableInterceptor::IORInterceptor_ptr interceptor
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   size_t index = this->add_interceptor_i (interceptor
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->interceptors_[index] =
diff --git a/TAO/tao/Interceptor_List.h b/TAO/tao/Interceptor_List.h
index 4c0df6e96fe..75a8a8e70d6 100644
--- a/TAO/tao/Interceptor_List.h
+++ b/TAO/tao/Interceptor_List.h
@@ -48,7 +48,7 @@ protected:
   /// Register an in interceptor with interceptor list.
   size_t add_interceptor_i (
       PortableInterceptor::Interceptor_ptr interceptor
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
@@ -89,7 +89,7 @@ public:
 
   /// Register a client request interceptor.
   void add_interceptor (PortableInterceptor::ClientRequestInterceptor_ptr i
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
   /// Return reference to the underlying Portable Interceptor array.
   TYPE &interceptors (void);
@@ -137,7 +137,7 @@ public:
 
   /// Register a server request interceptor.
   void add_interceptor (PortableInterceptor::ServerRequestInterceptor_ptr i
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
   /// Return reference to the underlying Portable Interceptor array.
   TYPE &interceptors (void);
@@ -186,7 +186,7 @@ public:
 
   /// Register an IOR interceptor.
   void add_interceptor (PortableInterceptor::IORInterceptor_ptr i
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
   /// Return reference to the underlying Portable Interceptor array.
   TYPE &interceptors (void);
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index 5623bb81f82..a7ee6ba2e74 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -146,7 +146,7 @@ TAO_GIOP_Invocation::~TAO_GIOP_Invocation (void)
 // restarted (e.g. request forwarding).  This is the start/restart entry.
 
 void
-TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
+TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (TAO_GIOP_INVOCATION_START_ENTER);
@@ -187,7 +187,7 @@ TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
       this->endpoint_selector_ =
         this->orb_core_->endpoint_selector_factory ()->get_selector (
           this
-           TAO_ENV_ARG_PARAMETER);
+           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -207,7 +207,7 @@ TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
   this->countdown_ = &countdown;
 
   this->endpoint_selector_->select_endpoint (this
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Set the unique request ID associated with this request.
@@ -219,7 +219,7 @@ TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
 
 int
 TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   // Get the transport object.
   if (this->transport_ != 0)
@@ -250,7 +250,7 @@ TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc
   // Obtain a connection.
   int result = conn_reg->connect (this,
                                   &desc
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   if (result == 0)
@@ -296,7 +296,7 @@ TAO_GIOP_Invocation::perform_call (TAO_Transport_Descriptor_Interface &desc
 
 void
 TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Then fill in the rest of the RequestHeader
@@ -307,11 +307,11 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags
   this->orb_core_->service_context_list (this->stub_,
                                          this->request_service_context (),
                                          this->restart_flag_
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Set the target specification mode
-  switch (this->profile_->addressing_mode ()) 
+  switch (this->profile_->addressing_mode ())
     {
     case TAO_Target_Specification::Key_Addr:
       this->target_spec_.target_specifier (
@@ -333,7 +333,7 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags
       IOP::IOR *ior_info = 0;
       int retval = this->stub_->create_ior_info (ior_info,
                                                  index
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (retval == -1)
@@ -368,7 +368,7 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags
 // Send request.
 int
 TAO_GIOP_Invocation::invoke (CORBA::Boolean is_synchronous
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Countdown_Time countdown (this->max_wait_time_);
@@ -463,7 +463,7 @@ TAO_GIOP_Invocation::close_connection (void)
 // Replace the IIOP Profile.
 int
 TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // It can be assumed that the GIOP header and the reply header
@@ -481,7 +481,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream
   // in order to obtain the profiles.
   TAO_Stub *stubobj = this->forward_reference_->_stubobj ();
 
-  this->location_forward_i (stubobj TAO_ENV_ARG_PARAMETER);
+  this->location_forward_i (stubobj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
   return TAO_INVOKE_RESTART;
@@ -489,7 +489,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream
 
 int
 TAO_GIOP_Invocation::location_forward (CORBA::Object_ptr forward
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (forward))
@@ -501,7 +501,7 @@ TAO_GIOP_Invocation::location_forward (CORBA::Object_ptr forward
   // in order to obtain the profiles.
   TAO_Stub *stubobj = forward->_stubobj ();
 
-  this->location_forward_i (stubobj TAO_ENV_ARG_PARAMETER);
+  this->location_forward_i (stubobj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
   return TAO_INVOKE_RESTART;
@@ -509,7 +509,7 @@ TAO_GIOP_Invocation::location_forward (CORBA::Object_ptr forward
 
 void
 TAO_GIOP_Invocation::location_forward_i (TAO_Stub *stubobj
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the profiles in the given stub object to the list of forward
@@ -523,7 +523,7 @@ TAO_GIOP_Invocation::location_forward_i (TAO_Stub *stubobj
       this->endpoint_selector_ =
         this->orb_core_->endpoint_selector_factory ()->get_selector (
           this
-           TAO_ENV_ARG_PARAMETER);
+           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -531,7 +531,7 @@ TAO_GIOP_Invocation::location_forward_i (TAO_Stub *stubobj
   // profiles.
   this->endpoint_selector_->forward (this,
                                      stubobj->base_profiles ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->received_location_forward_ = 1;
@@ -557,7 +557,7 @@ TAO_GIOP_Synch_Invocation::~TAO_GIOP_Synch_Invocation (void)
 
 int
 TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Register a reply dispatcher for this invocation. Use the
@@ -584,7 +584,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request
     }
 
   // Just send the request, without trying to wait for the reply.
-  int retval = TAO_GIOP_Invocation::invoke (1 TAO_ENV_ARG_PARAMETER);
+  int retval = TAO_GIOP_Invocation::invoke (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (retval);
 
   if (retval != TAO_INVOKE_OK)
@@ -673,7 +673,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request
       // loaded services.
       return this->orb_core_->service_raise_comm_failure (this,
                                                           this->profile_
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
     }
 
   // @@ Alex: the old version of this had some error handling code,
@@ -734,7 +734,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request
 
         CORBA::SystemException* ex =
           TAO_Exceptions::create_system_exception (type_id.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (TAO_INVOKE_OK);
 
         if (ex == 0)
@@ -751,7 +751,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request
         ex->completed (CORBA::CompletionStatus (completion));
 
         // Raise the exception.
-        TAO_ENV_RAISE (ex);
+        ACE_ENV_RAISE (ex);
 
         return TAO_INVOKE_OK;
       }
@@ -761,7 +761,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request
       // Handle the forwarding and return so the stub restarts the
       // request!
       return this->location_forward (this->inp_stream ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
     case TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE:
       {
         // We have received an exception with a request to change the
@@ -780,7 +780,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request
         // Now set this addressing mode in the profile, so that
         // the next invocation need not go through this.
         this->profile_->addressing_mode (addr_mode
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 
         // Now restart the invocation
         return TAO_INVOKE_RESTART;
@@ -794,10 +794,10 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request
 // ****************************************************************
 
 void
-TAO_GIOP_Twoway_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
+TAO_GIOP_Twoway_Invocation::start (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->rd_.state_changed (TAO_LF_Event::LFS_ACTIVE);
@@ -824,12 +824,12 @@ TAO_GIOP_Twoway_Invocation::reset_states (void)
 int
 TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
                                     CORBA::ULong except_count
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::Exception))
 {
   TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_INVOCATION_INVOKE_START);
 
-  int retval = this->invoke_i (0 TAO_ENV_ARG_PARAMETER);
+  int retval = this->invoke_i (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (retval);
 
   // A TAO_INVOKE_EXCEPTION status, but no exception raised means that
@@ -871,7 +871,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
             }
 
           exception->_tao_decode (this->inp_stream ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
           if (TAO_debug_level > 5)
@@ -931,30 +931,30 @@ TAO_GIOP_Oneway_Invocation::TAO_GIOP_Oneway_Invocation (
 }
 
 void
-TAO_GIOP_Oneway_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
+TAO_GIOP_Oneway_Invocation::start (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 }
 
 int
-TAO_GIOP_Oneway_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL)
+TAO_GIOP_Oneway_Invocation::invoke (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->sync_scope_ == TAO::SYNC_NONE
       || this->sync_scope_ == TAO::SYNC_EAGER_BUFFERING
       || this->sync_scope_ == TAO::SYNC_DELAYED_BUFFERING)
     {
-      return TAO_GIOP_Invocation::invoke (0 TAO_ENV_ARG_PARAMETER);
+      return TAO_GIOP_Invocation::invoke (0 ACE_ENV_ARG_PARAMETER);
     }
   if (this->sync_scope_ == TAO::SYNC_WITH_TRANSPORT)
     {
-      return TAO_GIOP_Invocation::invoke (1 TAO_ENV_ARG_PARAMETER);
+      return TAO_GIOP_Invocation::invoke (1 ACE_ENV_ARG_PARAMETER);
     }
 
-  int retval = this->invoke_i (0 TAO_ENV_ARG_PARAMETER);
+  int retval = this->invoke_i (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
   // A TAO_INVOKE_EXCEPTION status, but no exception raised means that
@@ -987,10 +987,10 @@ TAO_GIOP_Oneway_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL)
 // ****************************************************************
 
 void
-TAO_GIOP_Locate_Request_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
+TAO_GIOP_Locate_Request_Invocation::start (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_GIOP_Invocation::start (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_GIOP_Invocation::start (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->transport_->generate_locate_request (this->target_spec_,
@@ -1001,7 +1001,7 @@ TAO_GIOP_Locate_Request_Invocation::start (TAO_ENV_SINGLE_ARG_DECL)
 
 // Send request, block until any reply comes back.
 int
-TAO_GIOP_Locate_Request_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL)
+TAO_GIOP_Locate_Request_Invocation::invoke (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->transport_ == 0)
@@ -1010,7 +1010,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL)
                         TAO_INVOKE_EXCEPTION);
     }
 
-  CORBA::ULong locate_status = this->invoke_i (1 TAO_ENV_ARG_PARAMETER);
+  CORBA::ULong locate_status = this->invoke_i (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
 
   switch (locate_status)
@@ -1024,7 +1024,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL)
       // NOTREACHED.
     case TAO_GIOP_OBJECT_FORWARD:
       return this->location_forward (this->inp_stream ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
     case TAO_GIOP_LOC_SYSTEM_EXCEPTION:
       {
         // Pull the exception from the stream.
@@ -1064,7 +1064,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (TAO_ENV_SINGLE_ARG_DECL)
         // Now set this addressing mode in the profile, so that
         // the next invocation need not go through this.
         this->profile_->addressing_mode (addr_mode
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 
         // Restart the invocation.
         return TAO_INVOKE_RESTART;
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index feb311a46aa..b7419f8da40 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -100,7 +100,7 @@ public:
    * raises the CORBA::TRANSIENT exception.
    */
   void prepare_header (CORBA::Octet response_flags
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Accessor to the request ServiceContextList.  Only valid when
@@ -130,16 +130,16 @@ public:
 
   /// Establishes a connection to the remote server, initializes
   /// the GIOP headers in the output CDR.
-  void start (TAO_ENV_SINGLE_ARG_DECL)
+  void start (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Called by the invocation endpoint selector for each selected
   /// endpoint.
   int perform_call (TAO_Transport_Descriptor_Interface &desc
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
 
   /// Dynamically allocate \param inconsistent_policies_ PolicyList.
-  void init_inconsistent_policies (TAO_ENV_SINGLE_ARG_DECL)
+  void init_inconsistent_policies (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return PolicyList stored in \param inconsistent_policies_ and
@@ -157,7 +157,7 @@ public:
    * It returns TAO_INVOKE_RESTART unless an exception is raised.
    */
   int location_forward (CORBA::Object_ptr forward
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the object reference returned in the LOCATION_FORWARD
@@ -218,7 +218,7 @@ protected:
    * resources.
    */
   int invoke (CORBA::Boolean is_synchronous
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -230,7 +230,7 @@ protected:
    * It returns TAO_INVOKE_RESTART unless an exception is raised.
    */
   int location_forward (TAO_InputCDR &inp_stream
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -242,7 +242,7 @@ protected:
    * forward_reference() method in this class.
    */
   void location_forward_i (TAO_Stub *stubobj
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -367,7 +367,7 @@ protected:
   /// Implementation of the invoke() methods, handles the basic
   /// send/reply code and the system exceptions.
   int invoke_i (CORBA::Boolean is_locate_request
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Reply dispatcher for the current synchronous invocation.
@@ -404,7 +404,7 @@ public:
 
   /// Establishes a connection to the remote server, initializes
   /// the GIOP headers in the output CDR.
-  void start (TAO_ENV_SINGLE_ARG_DECL)
+  void start (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -415,7 +415,7 @@ public:
    */
   int invoke (TAO_Exception_Data *excepts,
               CORBA::ULong except_count
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::Exception));
 
   /**
@@ -452,11 +452,11 @@ public:
 
   /// Establishes a connection to the remote server, initializes
   /// the GIOP headers in the output CDR.
-  void start (TAO_ENV_SINGLE_ARG_DECL)
+  void start (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Send request, without blocking for any response.
-  int invoke (TAO_ENV_SINGLE_ARG_DECL)
+  int invoke (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Accessor for private member.
@@ -488,11 +488,11 @@ public:
 
   /// Establishes a connection to the remote server, initializes
   /// the GIOP headers in the output CDR.
-  void start (TAO_ENV_SINGLE_ARG_DECL)
+  void start (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Send request, without blocking for any response.
-  int invoke (TAO_ENV_SINGLE_ARG_DECL)
+  int invoke (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i
index 2dca45fb2c2..64ad12a8b4c 100644
--- a/TAO/tao/Invocation.i
+++ b/TAO/tao/Invocation.i
@@ -53,7 +53,7 @@ TAO_GIOP_Invocation::received_location_forward (void) const
 
 ACE_INLINE void
 TAO_GIOP_Invocation::init_inconsistent_policies (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_NEW_THROW_EX (this->inconsistent_policies_,
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index f58e71ed890..ae09e505a18 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -37,7 +37,7 @@ TAO_Default_Endpoint_Selector::~TAO_Default_Endpoint_Selector (void)
 void
 TAO_Default_Endpoint_Selector::select_endpoint (
   TAO_GIOP_Invocation *invocation
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   do
     {
@@ -45,7 +45,7 @@ TAO_Default_Endpoint_Selector::select_endpoint (
       invocation->endpoint (invocation->profile ()->endpoint ());
 
       int status =
-        this->endpoint_from_profile (invocation TAO_ENV_ARG_PARAMETER);
+        this->endpoint_from_profile (invocation ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (status == 1)
@@ -62,7 +62,7 @@ TAO_Default_Endpoint_Selector::select_endpoint (
 // @@ RTCORBA_Subsetting - next should be deprecated...
 void
 TAO_Default_Endpoint_Selector::next (TAO_GIOP_Invocation *
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("This method is DEPRECATED!\n")));
   // if (invocation->stub_->next_profile_retry () == 0)
@@ -74,7 +74,7 @@ void
 TAO_Default_Endpoint_Selector::forward (TAO_GIOP_Invocation
                                         *invocation,
                                         const TAO_MProfile &mprofile
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   invocation->stub ()->add_forward_profiles (mprofile);
   // This has to be and is thread safe.
@@ -111,7 +111,7 @@ TAO_Default_Endpoint_Selector::close_connection (TAO_GIOP_Invocation *invocation
 int
 TAO_Default_Endpoint_Selector::endpoint_from_profile (
     TAO_GIOP_Invocation *invocation
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   size_t endpoint_count =
     invocation->profile ()->endpoint_count();
@@ -124,7 +124,7 @@ TAO_Default_Endpoint_Selector::endpoint_from_profile (
           TAO_Base_Transport_Property desc (invocation->endpoint ());
 
           int status =
-            invocation->perform_call (desc TAO_ENV_ARG_PARAMETER);
+            invocation->perform_call (desc ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           // Check if the invocation has completed.
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.h b/TAO/tao/Invocation_Endpoint_Selectors.h
index cd655d1d64c..34424283069 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/Invocation_Endpoint_Selectors.h
@@ -54,7 +54,7 @@ public:
   /// Select the endpoint and set <invocation>'s <profile_> and
   /// <endpoint_> data members accordingly.
   virtual void select_endpoint (TAO_GIOP_Invocation *invocation
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /**
    * This method must be called when previously selected endpoint
@@ -63,7 +63,7 @@ public:
    * <select_endpoint> call picks a new endpoint.
    */
     virtual void next (TAO_GIOP_Invocation *invocation
-                   TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /**
    * This method must be called if the invocation attempt on a
@@ -73,7 +73,7 @@ public:
    */
   virtual void forward (TAO_GIOP_Invocation *invocation,
                         const TAO_MProfile &mprofile
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /// Update the state to indicate that the selected endpoint/profile
   /// were used successfully.
@@ -108,12 +108,12 @@ public:
   virtual ~TAO_Default_Endpoint_Selector (void);
 
   virtual void select_endpoint (TAO_GIOP_Invocation *invocation
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual void next (TAO_GIOP_Invocation *invocation
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual void forward (TAO_GIOP_Invocation *invocation,
                         const TAO_MProfile &mprofile
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual void success (TAO_GIOP_Invocation *invocation);
   virtual void close_connection (TAO_GIOP_Invocation *invocation);
 
@@ -121,7 +121,7 @@ protected:
   /// This method selects an endpoint from the profile in the
   /// invocation object.
   int endpoint_from_profile (TAO_GIOP_Invocation *invocation
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
index 7ee8c18104d..57ea56ffdf1 100644
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
+++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
@@ -37,14 +37,14 @@ TAO_Leader_Follower_Flushing_Strategy::flush_transport (TAO_Transport *transport
 {
   // @todo This is not the right way to do this....
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       TAO_ORB_Core *orb_core = transport->orb_core ();
 
       while (!transport->queue_is_empty ())
         {
-          int result = orb_core->run (0, 1 TAO_ENV_ARG_PARAMETER);
+          int result = orb_core->run (0, 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (result == -1)
diff --git a/TAO/tao/LocalObject.cpp b/TAO/tao/LocalObject.cpp
index 65e3f6abf53..6188a7f0763 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -37,7 +37,7 @@ CORBA_LocalObject::_remove_ref (void)
 
 CORBA::ULong
 CORBA_LocalObject::_hash (CORBA::ULong maximum
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
 {
   // Note that we reinterpret_cast to an "unsigned long" instead of
   // CORBA::ULong since we need to first cast to an integer large
@@ -57,7 +57,7 @@ CORBA_LocalObject::_hash (CORBA::ULong maximum
 
 CORBA::Boolean
 CORBA_LocalObject::_is_equivalent (CORBA_Object_ptr other_obj
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC (())
 {
   return (other_obj == this) ? 1 : 0;
@@ -67,7 +67,7 @@ CORBA_LocalObject::_is_equivalent (CORBA_Object_ptr other_obj
 
 
 TAO_ObjectKey *
-CORBA_LocalObject::_key (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_LocalObject::_key (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_ERROR((LM_ERROR,
              ACE_TEXT ("(%P|%t) Cannot get _key froma LocalObject!!!\n")));
@@ -103,7 +103,7 @@ CORBA_LocalObject::_tao_QueryInterface (ptr_arith_t type)
 // the latter case, return FALSE.
 
 CORBA::Boolean
-CORBA_LocalObject::_non_existent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA_LocalObject::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // Always return false.
   return 0;
@@ -116,7 +116,7 @@ CORBA_LocalObject::_create_request (CORBA::Context_ptr,
                                     CORBA::NamedValue_ptr,
                                     CORBA::Request_ptr &,
                                     CORBA::Flags
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   // @@ Correct minor code?  CCM spec says one thing CORBA spec says
   //    another!
@@ -133,7 +133,7 @@ CORBA_LocalObject::_create_request (CORBA::Context_ptr,
                                     CORBA::ContextList_ptr,
                                     CORBA::Request_ptr &,
                                     CORBA::Flags
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   // @@ Correct minor code?  CCM spec says one thing CORBA spec says
   //    another!
@@ -143,7 +143,7 @@ CORBA_LocalObject::_create_request (CORBA::Context_ptr,
 
 CORBA::Request_ptr
 CORBA_LocalObject::_request (const CORBA::Char *
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   // @@ Correct minor code?  CCM spec says one thing CORBA spec says
   //    another!
@@ -153,13 +153,13 @@ CORBA_LocalObject::_request (const CORBA::Char *
 }
 
 CORBA_InterfaceDef_ptr
-CORBA_LocalObject::_get_interface (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_LocalObject::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::ImplementationDef_ptr
-CORBA_LocalObject::_get_implementation (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_LocalObject::_get_implementation (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
@@ -184,7 +184,7 @@ TAO_Local_RefCounted_Object::_remove_ref (void)
 
 CORBA::Policy_ptr
 CORBA_LocalObject::_get_policy (CORBA::PolicyType
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
                     CORBA::Policy::_nil ());
@@ -192,7 +192,7 @@ CORBA_LocalObject::_get_policy (CORBA::PolicyType
 
 CORBA::Policy_ptr
 CORBA_LocalObject::_get_client_policy (CORBA::PolicyType
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
 }
@@ -200,21 +200,21 @@ CORBA_LocalObject::_get_client_policy (CORBA::PolicyType
 CORBA::Object_ptr
 CORBA_LocalObject::_set_policy_overrides (const CORBA::PolicyList &,
                                           CORBA::SetOverrideType
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
 }
 
 CORBA::PolicyList *
 CORBA_LocalObject::_get_policy_overrides (const CORBA::PolicyTypeSeq &
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
 CORBA_LocalObject::_validate_connection (CORBA::PolicyList_out
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h
index fe565cd2180..acac9399955 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -55,25 +55,25 @@ public:
    * CORBA_Object.  I'll take the easier route for now.
    */
   static CORBA_LocalObject_ptr _narrow (CORBA::Object_ptr obj
-                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// No-op it is just here to simplify some templates.
   static CORBA_LocalObject_ptr _unchecked_narrow (
              CORBA::Object_ptr obj
-             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
   /// Always returns false.
-  virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Throws CORBA::NO_IMPLEMENT.
   virtual CORBA::ImplementationDef_ptr
-      _get_implementation (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      _get_implementation (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Gets info about object from the Interface Repository.
   virtual CORBA_InterfaceDef_ptr _get_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     );
 
   /// Throws NO_IMPLEMENT.
@@ -83,7 +83,7 @@ public:
                                 CORBA::NamedValue_ptr result,
                                 CORBA::Request_ptr &request,
                                 CORBA::Flags req_flags
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual void _create_request (CORBA::Context_ptr ctx,
                                 const CORBA::Char *operation,
@@ -93,11 +93,11 @@ public:
                                 CORBA::ContextList_ptr ctxtlist,
                                 CORBA::Request_ptr &request,
                                 CORBA::Flags req_flags
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Throws NO_IMPLEMENT.
   virtual CORBA::Request_ptr _request (const CORBA::Char *operation
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
@@ -106,32 +106,32 @@ public:
   /// Throws CORBA::NO_IMPLEMENT.
   CORBA::Policy_ptr _get_policy (
       CORBA::PolicyType type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   /// Throws CORBA::NO_IMPLEMENT.
   CORBA::Policy_ptr _get_client_policy (
       CORBA::PolicyType type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   /// Throws CORBA::NO_IMPLEMENT.
   CORBA::Object_ptr _set_policy_overrides (
       const CORBA::PolicyList & policies,
       CORBA::SetOverrideType set_add
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   /// Throws CORBA::NO_IMPLEMENT.
   CORBA::PolicyList * _get_policy_overrides (
       const CORBA::PolicyTypeSeq & types
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   /// Throws CORBA::NO_IMPLEMENT.
   CORBA::Boolean _validate_connection (
       CORBA::PolicyList_out inconsistent_policies
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
@@ -142,7 +142,7 @@ public:
    * non-unique.
    */
   virtual CORBA::ULong _hash (CORBA::ULong maximum
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Try to determine if this object is the same as <other_obj>.  This
@@ -151,7 +151,7 @@ public:
    * protocols are in use) there is no default implementation.
    */
   virtual CORBA::Boolean _is_equivalent (CORBA_Object_ptr other_obj
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (());
 
   // = Reference count managment.
@@ -164,7 +164,7 @@ public:
   // = TAO extensions
 
   /// Throws CORBA::NO_IMPLEMENT.
-  virtual TAO_ObjectKey *_key (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   /// Useful for template programming.
diff --git a/TAO/tao/LocalObject.i b/TAO/tao/LocalObject.i
index 2630bd0d0a1..9a10edac5c2 100644
--- a/TAO/tao/LocalObject.i
+++ b/TAO/tao/LocalObject.i
@@ -22,7 +22,7 @@ CORBA_LocalObject::_nil (void)
 
 ACE_INLINE CORBA_LocalObject_ptr
 CORBA_LocalObject::_narrow (CORBA_Object_ptr obj
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (obj->_is_local () != 0)
     return
@@ -37,7 +37,7 @@ CORBA_LocalObject::_narrow (CORBA_Object_ptr obj
 
 ACE_INLINE CORBA_LocalObject_ptr
 CORBA_LocalObject::_unchecked_narrow (CORBA_Object_ptr obj
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (obj->_is_local () != 0)
     return
diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp
index 6a449260658..9d242b261fa 100644
--- a/TAO/tao/MCAST_Parser.cpp
+++ b/TAO/tao/MCAST_Parser.cpp
@@ -36,7 +36,7 @@ TAO_MCAST_Parser::match_prefix (const char *ior_string) const
 CORBA::Object_ptr
 TAO_MCAST_Parser::parse_string (const char *ior,
                                 CORBA::ORB_ptr orb
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   const char *mcast_name =
@@ -62,7 +62,7 @@ TAO_MCAST_Parser::parse_string (const char *ior,
                                  this->mcast_nic_.in (),
                                  orb,
                                  timeout
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return object;
@@ -76,7 +76,7 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name,
                                         const char *mcast_nic,
                                         CORBA::ORB_ptr orb,
                                         ACE_Time_Value *timeout
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   char buf[2048];
   char *ior = buf;
@@ -106,7 +106,7 @@ TAO_MCAST_Parser::multicast_to_service (const char *service_name,
       // Convert IOR to an object reference.
       return_value =
         orb->string_to_object (ior
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_Object::_nil ());
     }
 
diff --git a/TAO/tao/MCAST_Parser.h b/TAO/tao/MCAST_Parser.h
index 10c2aafa339..7ff1edbd784 100644
--- a/TAO/tao/MCAST_Parser.h
+++ b/TAO/tao/MCAST_Parser.h
@@ -50,7 +50,7 @@ public:
   /// Parse the ior-string that is passed.
   virtual CORBA::Object_ptr parse_string (const char *ior,
                                           CORBA::ORB_ptr orb
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -62,7 +62,7 @@ private:
                                          const char *mcast_nic,
                                          CORBA::ORB_ptr orb,
                                          ACE_Time_Value *timeout
-                                         TAO_ENV_ARG_DECL_NOT_USED);
+                                         ACE_ENV_ARG_DECL_NOT_USED);
 
   int multicast_query (char *&buf,
                        const char *service_name,
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index bcc25e545fb..50346df28d6 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -201,7 +201,7 @@ TAO_MProfile::is_equivalent (const TAO_MProfile *rhs)
 }
 
 CORBA::ULong
-TAO_MProfile::hash (CORBA::ULong max TAO_ENV_ARG_DECL)
+TAO_MProfile::hash (CORBA::ULong max ACE_ENV_ARG_DECL)
 {
   CORBA::ULong hashval = 0;
 
@@ -210,7 +210,7 @@ TAO_MProfile::hash (CORBA::ULong max TAO_ENV_ARG_DECL)
 
   for (TAO_PHandle h = 0; h < this->last_ ; ++h)
     {
-      hashval += pfiles_[h]->hash (max TAO_ENV_ARG_PARAMETER);
+      hashval += pfiles_[h]->hash (max ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -222,20 +222,20 @@ TAO_MProfile::hash (CORBA::ULong max TAO_ENV_ARG_DECL)
 }
 
 void
-TAO_MProfile::init_policy_list (TAO_ENV_SINGLE_ARG_DECL)
+TAO_MProfile::init_policy_list (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The first time this method is called
   // it causes the initialization of the policies
   // for the current profile.
 
-  this->get_current_profile ()->policies (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->get_current_profile ()->policies (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->is_policy_list_initialized_ = 1;
 }
 
 CORBA::PolicyList *
-TAO_MProfile::policy_list (TAO_ENV_SINGLE_ARG_DECL)
+TAO_MProfile::policy_list (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!this->is_policy_list_initialized_)
     {
@@ -246,10 +246,10 @@ TAO_MProfile::policy_list (TAO_ENV_SINGLE_ARG_DECL)
 
       if (this->policy_list_ == 0)
         {
-          this->create_policy_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->create_policy_list (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          this->init_policy_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->init_policy_list (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
     }
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index 771bfd4797f..9108fc39e55 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -159,13 +159,13 @@ public:
    * NON-THREAD SAFE.
    */
   CORBA::ULong hash (CORBA::ULong max
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 protected:
 
   /// This method handle the dynamic allocation of the data member
   /// <policy_list_>.
- void create_policy_list (TAO_ENV_SINGLE_ARG_DECL);
+ void create_policy_list (ACE_ENV_SINGLE_ARG_DECL);
 
 public:
 
@@ -175,12 +175,12 @@ public:
 
   /// Gets the policies list associated with the profiles
   /// owned by the TAO_MProfile.
-  CORBA::PolicyList *policy_list (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::PolicyList *policy_list (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
 
   /// Initialize the policy list, demarsharling the policy.
-  void init_policy_list (TAO_ENV_SINGLE_ARG_DECL);
+  void init_policy_list (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
   /// Stores the policy list for the profile of this MProfile.
diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i
index b93fd987b7d..99264a0695b 100644
--- a/TAO/tao/MProfile.i
+++ b/TAO/tao/MProfile.i
@@ -253,7 +253,7 @@ TAO_MProfile::add_profile (TAO_Profile *pfile)
 }
 
 ACE_INLINE void
-TAO_MProfile::create_policy_list (TAO_ENV_SINGLE_ARG_DECL)
+TAO_MProfile::create_policy_list (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->policy_list_,
                     CORBA::PolicyList,
diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp
index 19f86d55362..2af5c1fb987 100644
--- a/TAO/tao/Marshal.cpp
+++ b/TAO/tao/Marshal.cpp
@@ -38,9 +38,9 @@ TAO_Marshal_Object::~TAO_Marshal_Object (void)
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc,
                                   TAO_InputCDR *stream
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
-  CORBA::ULong kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   switch (kind)
@@ -73,73 +73,73 @@ TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc,
     case CORBA::tk_enum:
       {
         TAO_Marshal_Primitive marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
 
     case CORBA::tk_any:
       {
         TAO_Marshal_Any marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_TypeCode:
       {
         TAO_Marshal_TypeCode marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_Principal:
       {
         TAO_Marshal_Principal marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_objref:
       {
         TAO_Marshal_ObjRef marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_struct:
       {
         TAO_Marshal_Struct marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_union:
       {
         TAO_Marshal_Union marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_string:
       {
         TAO_Marshal_String marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_sequence:
       {
         TAO_Marshal_Sequence marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_array:
       {
         TAO_Marshal_Array marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_alias:
       {
         TAO_Marshal_Alias marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_except:
       {
         TAO_Marshal_Except marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_wstring:
       {
         TAO_Marshal_WString marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_value:
       {
         TAO_Marshal_Value marshal;
-        return marshal.skip (tc, stream TAO_ENV_ARG_PARAMETER);
+        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
       }
     }
 }
@@ -148,9 +148,9 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc,
                                     TAO_InputCDR *src,
                                     TAO_OutputCDR *dest
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  CORBA::ULong kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   switch (kind)
@@ -183,73 +183,73 @@ TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc,
     case CORBA::tk_enum:
       {
         TAO_Marshal_Primitive marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
 
     case CORBA::tk_any:
       {
         TAO_Marshal_Any marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_TypeCode:
       {
         TAO_Marshal_TypeCode marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_Principal:
       {
         TAO_Marshal_Principal marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_objref:
       {
         TAO_Marshal_ObjRef marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_struct:
       {
         TAO_Marshal_Struct marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_union:
       {
         TAO_Marshal_Union marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_string:
       {
         TAO_Marshal_String marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_sequence:
       {
         TAO_Marshal_Sequence marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_array:
       {
         TAO_Marshal_Array marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_alias:
       {
         TAO_Marshal_Alias marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_except:
       {
         TAO_Marshal_Except marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_wstring:
       {
         TAO_Marshal_WString marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
     case CORBA::tk_value:
       {
         TAO_Marshal_Value marshal;
-        return marshal.append (tc, src, dest TAO_ENV_ARG_PARAMETER);
+        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
       }
     }
 }
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
index 1e1b5aad274..f3e4313f768 100644
--- a/TAO/tao/Marshal.h
+++ b/TAO/tao/Marshal.h
@@ -73,12 +73,12 @@ public:
   static CORBA::TypeCode::traverse_status
     perform_skip (CORBA::TypeCode_ptr tc,
                   TAO_InputCDR *context
-                  TAO_ENV_ARG_DECL);
+                  ACE_ENV_ARG_DECL);
 
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL) = 0;
+                                                 ACE_ENV_ARG_DECL) = 0;
 
   /// append entry point, it allocates the right kind of Marshal_Object
   /// and invokes skip on it.
@@ -86,13 +86,13 @@ public:
     perform_append (CORBA::TypeCode_ptr tc,
                     TAO_InputCDR *src,
                     TAO_OutputCDR *dest
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL) = 0;
+                                                   ACE_ENV_ARG_DECL) = 0;
 };
 
 /**
@@ -110,13 +110,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 };
 
@@ -135,13 +135,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 };
 
@@ -160,13 +160,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 };
 
@@ -185,13 +185,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 };
 
@@ -210,13 +210,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 };
 
@@ -235,13 +235,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 };
 
@@ -260,13 +260,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 };
 
@@ -285,13 +285,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 };
 
@@ -310,13 +310,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 };
 
@@ -335,13 +335,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 };
 
@@ -360,13 +360,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 };
 
@@ -385,13 +385,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 };
 
@@ -410,13 +410,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 };
 
@@ -435,13 +435,13 @@ public:
   /// skip operation
   virtual CORBA::TypeCode::traverse_status skip (CORBA::TypeCode_ptr tc,
                                                  TAO_InputCDR *context
-                                                 TAO_ENV_ARG_DECL);
+                                                 ACE_ENV_ARG_DECL);
 
   /// append operation
   virtual CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
                                                    TAO_InputCDR *src,
                                                    TAO_OutputCDR *dest
-                                                   TAO_ENV_ARG_DECL);
+                                                   ACE_ENV_ARG_DECL);
 
 private:
   CORBA::Boolean nested_processing_;
diff --git a/TAO/tao/Messaging.cpp b/TAO/tao/Messaging.cpp
index 3c28211481f..fb164333818 100644
--- a/TAO/tao/Messaging.cpp
+++ b/TAO/tao/Messaging.cpp
@@ -15,7 +15,7 @@ exception_holder_raise (TAO_Exception_Data *exception_data,
                         CORBA::ULong marshaled_data_length,
                         CORBA::Boolean byte_order,
                         CORBA::Boolean is_system_exception
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   TAO_InputCDR _tao_in ((const char*) marshaled_data,
                         marshaled_data_length,
@@ -30,7 +30,7 @@ exception_holder_raise (TAO_Exception_Data *exception_data,
       ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                  CORBA::COMPLETED_YES));
     }
-  
+
   if (is_system_exception)
     {
       CORBA::ULong minor = 0;
@@ -41,7 +41,7 @@ exception_holder_raise (TAO_Exception_Data *exception_data,
                                    CORBA::COMPLETED_MAYBE));
       CORBA::SystemException* exception =
         TAO_Exceptions::create_system_exception (type_id.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (exception == 0)
@@ -53,9 +53,9 @@ exception_holder_raise (TAO_Exception_Data *exception_data,
         }
       exception->minor (minor);
       exception->completed (CORBA::CompletionStatus (completion));
-      
+
       // Raise the exception.
-      TAO_ENV_RAISE (exception);
+      ACE_ENV_RAISE (exception);
 
       return;
     }
@@ -67,24 +67,24 @@ exception_holder_raise (TAO_Exception_Data *exception_data,
     {
       if (ACE_OS::strcmp (type_id.in (), exception_data[i].id) != 0)
         continue;
-          
+
       CORBA::Exception *exception = exception_data[i].alloc ();
-          
+
       if (exception == 0)
         ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
                                      CORBA::COMPLETED_YES));
-      exception->_tao_decode (_tao_in TAO_ENV_ARG_PARAMETER);
+      exception->_tao_decode (_tao_in ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Raise the exception.
-      TAO_ENV_RAISE (exception);
-          
+      ACE_ENV_RAISE (exception);
+
       return;
     }
-      
+
   // If we couldn't find the right exception, report it as
   // CORBA::UNKNOWN.
-      
+
   // @@ It would seem like if the remote exception is a
   //    UserException we can assume that the request was
   //    completed.
diff --git a/TAO/tao/Messaging.h b/TAO/tao/Messaging.h
index 1f5eec64b81..165e3b31ea4 100644
--- a/TAO/tao/Messaging.h
+++ b/TAO/tao/Messaging.h
@@ -45,7 +45,7 @@ typedef void (*TAO_Reply_Handler_Skeleton)(
     TAO_InputCDR &,
     Messaging::ReplyHandler *,
     CORBA::ULong reply_status
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
     );
 
 struct TAO_Exception_Data;
@@ -66,7 +66,7 @@ namespace TAO_Messaging_Helper
                                           CORBA::ULong marshaled_data_length,
                                           CORBA::Boolean byte_order,
                                           CORBA::Boolean is_system_exception
-                                          TAO_ENV_ARG_DECL);
+                                          ACE_ENV_ARG_DECL);
 }
 
 #endif /* TAO_HAS_AMI_CALLBACK */
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index d88fc70ff7b..e828fbc5324 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -445,10 +445,10 @@ Messaging::RebindPolicy_var::tao_nil (void)
 ::Messaging::RebindPolicy_ptr
 Messaging::RebindPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RebindPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::RebindPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -529,15 +529,15 @@ Messaging::RebindPolicy::~RebindPolicy (void)
 
 Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RebindPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return RebindPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -719,10 +719,10 @@ Messaging::SyncScopePolicy_var::tao_nil (void)
 ::Messaging::SyncScopePolicy_ptr
 Messaging::SyncScopePolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::SyncScopePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::SyncScopePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -802,15 +802,15 @@ Messaging::SyncScopePolicy::~SyncScopePolicy (void)
 
 Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return SyncScopePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return SyncScopePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1077,10 +1077,10 @@ Messaging::RequestPriorityPolicy_var::tao_nil (void)
 ::Messaging::RequestPriorityPolicy_ptr
 Messaging::RequestPriorityPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RequestPriorityPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::RequestPriorityPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1161,15 +1161,15 @@ Messaging::RequestPriorityPolicy::~RequestPriorityPolicy (void)
 
 Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RequestPriorityPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return RequestPriorityPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1347,10 +1347,10 @@ Messaging::ReplyPriorityPolicy_var::tao_nil (void)
 ::Messaging::ReplyPriorityPolicy_ptr
 Messaging::ReplyPriorityPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::ReplyPriorityPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::ReplyPriorityPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1431,15 +1431,15 @@ Messaging::ReplyPriorityPolicy::~ReplyPriorityPolicy (void)
 
 Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ReplyPriorityPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ReplyPriorityPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1621,10 +1621,10 @@ Messaging::RequestStartTimePolicy_var::tao_nil (void)
 ::Messaging::RequestStartTimePolicy_ptr
 Messaging::RequestStartTimePolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RequestStartTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::RequestStartTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1705,15 +1705,15 @@ Messaging::RequestStartTimePolicy::~RequestStartTimePolicy (void)
 
 Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RequestStartTimePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return RequestStartTimePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1895,10 +1895,10 @@ Messaging::RequestEndTimePolicy_var::tao_nil (void)
 ::Messaging::RequestEndTimePolicy_ptr
 Messaging::RequestEndTimePolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RequestEndTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::RequestEndTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1979,15 +1979,15 @@ Messaging::RequestEndTimePolicy::~RequestEndTimePolicy (void)
 
 Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RequestEndTimePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return RequestEndTimePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2169,10 +2169,10 @@ Messaging::ReplyStartTimePolicy_var::tao_nil (void)
 ::Messaging::ReplyStartTimePolicy_ptr
 Messaging::ReplyStartTimePolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::ReplyStartTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::ReplyStartTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2253,15 +2253,15 @@ Messaging::ReplyStartTimePolicy::~ReplyStartTimePolicy (void)
 
 Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ReplyStartTimePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ReplyStartTimePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2443,10 +2443,10 @@ Messaging::ReplyEndTimePolicy_var::tao_nil (void)
 ::Messaging::ReplyEndTimePolicy_ptr
 Messaging::ReplyEndTimePolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::ReplyEndTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::ReplyEndTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2527,15 +2527,15 @@ Messaging::ReplyEndTimePolicy::~ReplyEndTimePolicy (void)
 
 Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ReplyEndTimePolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ReplyEndTimePolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2717,10 +2717,10 @@ Messaging::RelativeRequestTimeoutPolicy_var::tao_nil (void)
 ::Messaging::RelativeRequestTimeoutPolicy_ptr
 Messaging::RelativeRequestTimeoutPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RelativeRequestTimeoutPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::RelativeRequestTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2801,15 +2801,15 @@ Messaging::RelativeRequestTimeoutPolicy::~RelativeRequestTimeoutPolicy (void)
 
 Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RelativeRequestTimeoutPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return RelativeRequestTimeoutPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2991,10 +2991,10 @@ Messaging::RelativeRoundtripTimeoutPolicy_var::tao_nil (void)
 ::Messaging::RelativeRoundtripTimeoutPolicy_ptr
 Messaging::RelativeRoundtripTimeoutPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3075,15 +3075,15 @@ Messaging::RelativeRoundtripTimeoutPolicy::~RelativeRoundtripTimeoutPolicy (void
 
 Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3354,10 +3354,10 @@ Messaging::RoutingPolicy_var::tao_nil (void)
 ::Messaging::RoutingPolicy_ptr
 Messaging::RoutingPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::RoutingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::RoutingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3438,15 +3438,15 @@ Messaging::RoutingPolicy::~RoutingPolicy (void)
 
 Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RoutingPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return RoutingPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3628,10 +3628,10 @@ Messaging::MaxHopsPolicy_var::tao_nil (void)
 ::Messaging::MaxHopsPolicy_ptr
 Messaging::MaxHopsPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::MaxHopsPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::MaxHopsPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3712,15 +3712,15 @@ Messaging::MaxHopsPolicy::~MaxHopsPolicy (void)
 
 Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return MaxHopsPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return MaxHopsPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3902,10 +3902,10 @@ Messaging::QueueOrderPolicy_var::tao_nil (void)
 ::Messaging::QueueOrderPolicy_ptr
 Messaging::QueueOrderPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::QueueOrderPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::QueueOrderPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3986,15 +3986,15 @@ Messaging::QueueOrderPolicy::~QueueOrderPolicy (void)
 
 Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return QueueOrderPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return QueueOrderPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4564,10 +4564,10 @@ Messaging::ReplyHandler_var::tao_nil (void)
 ::Messaging::ReplyHandler_ptr
 Messaging::ReplyHandler_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::Messaging::ReplyHandler::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::Messaging::ReplyHandler::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4693,7 +4693,7 @@ Messaging::_TAO_ReplyHandler_Remote_Proxy_Broker::~_TAO_ReplyHandler_Remote_Prox
 Messaging::_TAO_ReplyHandler_Proxy_Impl&
 Messaging::_TAO_ReplyHandler_Remote_Proxy_Broker::select_proxy (
   ::Messaging::ReplyHandler *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -4734,24 +4734,24 @@ void Messaging::ReplyHandler::_tao_any_destructor (void *x)
 
 Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ReplyHandler::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/Messaging/ReplyHandler:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/Messaging/ReplyHandler:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ReplyHandler::_nil ());
       if (is_a == 0)
         return ReplyHandler::_nil ();
     }
-  return ReplyHandler::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ReplyHandler::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4808,14 +4808,14 @@ Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj)
   return obj;
 }
 
-CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/Messaging/ReplyHandler:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *Messaging::ReplyHandler::_tao_QueryInterface (ptr_arith_t type)
@@ -5039,7 +5039,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::Priorit
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Messaging::_tc_PriorityRange TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (Messaging::_tc_PriorityRange ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5207,7 +5207,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::Routing
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Messaging::_tc_RoutingTypeRange TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (Messaging::_tc_RoutingTypeRange ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5321,7 +5321,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValue TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValue ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5412,7 +5412,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::PolicyV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValueSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (Messaging::_tc_PolicyValueSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5483,7 +5483,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyHandler_
     _tao_elem = Messaging::ReplyHandler::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (Messaging::_tc_ReplyHandler TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (Messaging::_tc_ReplyHandler ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5665,7 +5665,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       Messaging::ReplyHandler::_unchecked_narrow (
           obj.in ()
-           TAO_ENV_ARG_PARAMETER
+           ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index 89409f83658..297ce5776fb 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -177,7 +177,7 @@ TAO_NAMESPACE  Messaging
     static RebindPolicy_ptr tao_duplicate (RebindPolicy_ptr);
     static void tao_release (RebindPolicy_ptr);
     static RebindPolicy_ptr tao_nil (void);
-    static RebindPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static RebindPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -232,11 +232,11 @@ TAO_NAMESPACE  Messaging
     static RebindPolicy_ptr _duplicate (RebindPolicy_ptr obj);
     static RebindPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RebindPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RebindPolicy_ptr _nil (void)
       {
@@ -244,7 +244,7 @@ TAO_NAMESPACE  Messaging
       }
 
     virtual Messaging::RebindMode rebind_mode (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -311,7 +311,7 @@ TAO_NAMESPACE  Messaging
     static SyncScopePolicy_ptr tao_duplicate (SyncScopePolicy_ptr);
     static void tao_release (SyncScopePolicy_ptr);
     static SyncScopePolicy_ptr tao_nil (void);
-    static SyncScopePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static SyncScopePolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -366,11 +366,11 @@ TAO_NAMESPACE  Messaging
     static SyncScopePolicy_ptr _duplicate (SyncScopePolicy_ptr obj);
     static SyncScopePolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static SyncScopePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static SyncScopePolicy_ptr _nil (void)
       {
@@ -378,7 +378,7 @@ TAO_NAMESPACE  Messaging
       }
 
     virtual Messaging::SyncScope synchronization (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -495,7 +495,7 @@ TAO_NAMESPACE  Messaging
     static RequestPriorityPolicy_ptr tao_duplicate (RequestPriorityPolicy_ptr);
     static void tao_release (RequestPriorityPolicy_ptr);
     static RequestPriorityPolicy_ptr tao_nil (void);
-    static RequestPriorityPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static RequestPriorityPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -550,11 +550,11 @@ TAO_NAMESPACE  Messaging
     static RequestPriorityPolicy_ptr _duplicate (RequestPriorityPolicy_ptr obj);
     static RequestPriorityPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RequestPriorityPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RequestPriorityPolicy_ptr _nil (void)
       {
@@ -562,7 +562,7 @@ TAO_NAMESPACE  Messaging
       }
 
     virtual Messaging::PriorityRange priority_range (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -625,7 +625,7 @@ TAO_NAMESPACE  Messaging
     static ReplyPriorityPolicy_ptr tao_duplicate (ReplyPriorityPolicy_ptr);
     static void tao_release (ReplyPriorityPolicy_ptr);
     static ReplyPriorityPolicy_ptr tao_nil (void);
-    static ReplyPriorityPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static ReplyPriorityPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -680,11 +680,11 @@ TAO_NAMESPACE  Messaging
     static ReplyPriorityPolicy_ptr _duplicate (ReplyPriorityPolicy_ptr obj);
     static ReplyPriorityPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static ReplyPriorityPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static ReplyPriorityPolicy_ptr _nil (void)
       {
@@ -692,7 +692,7 @@ TAO_NAMESPACE  Messaging
       }
 
     virtual Messaging::PriorityRange priority_range (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -759,7 +759,7 @@ TAO_NAMESPACE  Messaging
     static RequestStartTimePolicy_ptr tao_duplicate (RequestStartTimePolicy_ptr);
     static void tao_release (RequestStartTimePolicy_ptr);
     static RequestStartTimePolicy_ptr tao_nil (void);
-    static RequestStartTimePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static RequestStartTimePolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -814,11 +814,11 @@ TAO_NAMESPACE  Messaging
     static RequestStartTimePolicy_ptr _duplicate (RequestStartTimePolicy_ptr obj);
     static RequestStartTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RequestStartTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RequestStartTimePolicy_ptr _nil (void)
       {
@@ -826,7 +826,7 @@ TAO_NAMESPACE  Messaging
       }
 
     virtual TimeBase::UtcT start_time (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -893,7 +893,7 @@ TAO_NAMESPACE  Messaging
     static RequestEndTimePolicy_ptr tao_duplicate (RequestEndTimePolicy_ptr);
     static void tao_release (RequestEndTimePolicy_ptr);
     static RequestEndTimePolicy_ptr tao_nil (void);
-    static RequestEndTimePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static RequestEndTimePolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -948,11 +948,11 @@ TAO_NAMESPACE  Messaging
     static RequestEndTimePolicy_ptr _duplicate (RequestEndTimePolicy_ptr obj);
     static RequestEndTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RequestEndTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RequestEndTimePolicy_ptr _nil (void)
       {
@@ -960,7 +960,7 @@ TAO_NAMESPACE  Messaging
       }
 
     virtual TimeBase::UtcT end_time (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1027,7 +1027,7 @@ TAO_NAMESPACE  Messaging
     static ReplyStartTimePolicy_ptr tao_duplicate (ReplyStartTimePolicy_ptr);
     static void tao_release (ReplyStartTimePolicy_ptr);
     static ReplyStartTimePolicy_ptr tao_nil (void);
-    static ReplyStartTimePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static ReplyStartTimePolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1082,11 +1082,11 @@ TAO_NAMESPACE  Messaging
     static ReplyStartTimePolicy_ptr _duplicate (ReplyStartTimePolicy_ptr obj);
     static ReplyStartTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static ReplyStartTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static ReplyStartTimePolicy_ptr _nil (void)
       {
@@ -1094,7 +1094,7 @@ TAO_NAMESPACE  Messaging
       }
 
     virtual TimeBase::UtcT start_time (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1161,7 +1161,7 @@ TAO_NAMESPACE  Messaging
     static ReplyEndTimePolicy_ptr tao_duplicate (ReplyEndTimePolicy_ptr);
     static void tao_release (ReplyEndTimePolicy_ptr);
     static ReplyEndTimePolicy_ptr tao_nil (void);
-    static ReplyEndTimePolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static ReplyEndTimePolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1216,11 +1216,11 @@ TAO_NAMESPACE  Messaging
     static ReplyEndTimePolicy_ptr _duplicate (ReplyEndTimePolicy_ptr obj);
     static ReplyEndTimePolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static ReplyEndTimePolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static ReplyEndTimePolicy_ptr _nil (void)
       {
@@ -1228,7 +1228,7 @@ TAO_NAMESPACE  Messaging
       }
 
     virtual TimeBase::UtcT end_time (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1295,7 +1295,7 @@ TAO_NAMESPACE  Messaging
     static RelativeRequestTimeoutPolicy_ptr tao_duplicate (RelativeRequestTimeoutPolicy_ptr);
     static void tao_release (RelativeRequestTimeoutPolicy_ptr);
     static RelativeRequestTimeoutPolicy_ptr tao_nil (void);
-    static RelativeRequestTimeoutPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static RelativeRequestTimeoutPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1350,11 +1350,11 @@ TAO_NAMESPACE  Messaging
     static RelativeRequestTimeoutPolicy_ptr _duplicate (RelativeRequestTimeoutPolicy_ptr obj);
     static RelativeRequestTimeoutPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RelativeRequestTimeoutPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RelativeRequestTimeoutPolicy_ptr _nil (void)
       {
@@ -1362,7 +1362,7 @@ TAO_NAMESPACE  Messaging
       }
 
     virtual TimeBase::TimeT relative_expiry (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1429,7 +1429,7 @@ TAO_NAMESPACE  Messaging
     static RelativeRoundtripTimeoutPolicy_ptr tao_duplicate (RelativeRoundtripTimeoutPolicy_ptr);
     static void tao_release (RelativeRoundtripTimeoutPolicy_ptr);
     static RelativeRoundtripTimeoutPolicy_ptr tao_nil (void);
-    static RelativeRoundtripTimeoutPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static RelativeRoundtripTimeoutPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1484,11 +1484,11 @@ TAO_NAMESPACE  Messaging
     static RelativeRoundtripTimeoutPolicy_ptr _duplicate (RelativeRoundtripTimeoutPolicy_ptr obj);
     static RelativeRoundtripTimeoutPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RelativeRoundtripTimeoutPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RelativeRoundtripTimeoutPolicy_ptr _nil (void)
       {
@@ -1496,7 +1496,7 @@ TAO_NAMESPACE  Messaging
       }
 
     virtual TimeBase::TimeT relative_expiry (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1613,7 +1613,7 @@ TAO_NAMESPACE  Messaging
     static RoutingPolicy_ptr tao_duplicate (RoutingPolicy_ptr);
     static void tao_release (RoutingPolicy_ptr);
     static RoutingPolicy_ptr tao_nil (void);
-    static RoutingPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static RoutingPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1668,11 +1668,11 @@ TAO_NAMESPACE  Messaging
     static RoutingPolicy_ptr _duplicate (RoutingPolicy_ptr obj);
     static RoutingPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RoutingPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static RoutingPolicy_ptr _nil (void)
       {
@@ -1680,7 +1680,7 @@ TAO_NAMESPACE  Messaging
       }
 
     virtual Messaging::RoutingTypeRange routing_range (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1747,7 +1747,7 @@ TAO_NAMESPACE  Messaging
     static MaxHopsPolicy_ptr tao_duplicate (MaxHopsPolicy_ptr);
     static void tao_release (MaxHopsPolicy_ptr);
     static MaxHopsPolicy_ptr tao_nil (void);
-    static MaxHopsPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static MaxHopsPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1802,11 +1802,11 @@ TAO_NAMESPACE  Messaging
     static MaxHopsPolicy_ptr _duplicate (MaxHopsPolicy_ptr obj);
     static MaxHopsPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static MaxHopsPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static MaxHopsPolicy_ptr _nil (void)
       {
@@ -1814,7 +1814,7 @@ TAO_NAMESPACE  Messaging
       }
 
     virtual CORBA::UShort max_hops (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1881,7 +1881,7 @@ TAO_NAMESPACE  Messaging
     static QueueOrderPolicy_ptr tao_duplicate (QueueOrderPolicy_ptr);
     static void tao_release (QueueOrderPolicy_ptr);
     static QueueOrderPolicy_ptr tao_nil (void);
-    static QueueOrderPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static QueueOrderPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -1936,11 +1936,11 @@ TAO_NAMESPACE  Messaging
     static QueueOrderPolicy_ptr _duplicate (QueueOrderPolicy_ptr obj);
     static QueueOrderPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static QueueOrderPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static QueueOrderPolicy_ptr _nil (void)
       {
@@ -1948,7 +1948,7 @@ TAO_NAMESPACE  Messaging
       }
 
     virtual Messaging::Ordering allowed_orders (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2466,7 +2466,7 @@ TAO_NAMESPACE  Messaging
     static ReplyHandler_ptr tao_duplicate (ReplyHandler_ptr);
     static void tao_release (ReplyHandler_ptr);
     static ReplyHandler_ptr tao_nil (void);
-    static ReplyHandler_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static ReplyHandler_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -2527,11 +2527,11 @@ TAO_NAMESPACE  Messaging
     static ReplyHandler_ptr _duplicate (ReplyHandler_ptr obj);
     static ReplyHandler_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static ReplyHandler_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static ReplyHandler_ptr _nil (void)
       {
@@ -2542,7 +2542,7 @@ TAO_NAMESPACE  Messaging
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -2636,7 +2636,7 @@ public:
   virtual ~_TAO_ReplyHandler_Proxy_Broker (void);
   virtual _TAO_ReplyHandler_Proxy_Impl &select_proxy (
     ReplyHandler *object
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS
   ) = 0;
 
 protected:
@@ -2662,7 +2662,7 @@ public:
 
   virtual _TAO_ReplyHandler_Proxy_Impl &select_proxy (
     ReplyHandler *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i
index 620f4b1b7d0..5196d6b3135 100644
--- a/TAO/tao/MessagingC.i
+++ b/TAO/tao/MessagingC.i
@@ -52,10 +52,10 @@ tao_Messaging_RebindPolicy_nil (
 ACE_INLINE Messaging::RebindPolicy_ptr
 tao_Messaging_RebindPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::RebindPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::RebindPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -106,10 +106,10 @@ tao_Messaging_SyncScopePolicy_nil (
 ACE_INLINE Messaging::SyncScopePolicy_ptr
 tao_Messaging_SyncScopePolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::SyncScopePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::SyncScopePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -305,10 +305,10 @@ tao_Messaging_RequestPriorityPolicy_nil (
 ACE_INLINE Messaging::RequestPriorityPolicy_ptr
 tao_Messaging_RequestPriorityPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::RequestPriorityPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::RequestPriorityPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -355,10 +355,10 @@ tao_Messaging_ReplyPriorityPolicy_nil (
 ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
 tao_Messaging_ReplyPriorityPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::ReplyPriorityPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::ReplyPriorityPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -409,10 +409,10 @@ tao_Messaging_RequestStartTimePolicy_nil (
 ACE_INLINE Messaging::RequestStartTimePolicy_ptr
 tao_Messaging_RequestStartTimePolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::RequestStartTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::RequestStartTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -463,10 +463,10 @@ tao_Messaging_RequestEndTimePolicy_nil (
 ACE_INLINE Messaging::RequestEndTimePolicy_ptr
 tao_Messaging_RequestEndTimePolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::RequestEndTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::RequestEndTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -517,10 +517,10 @@ tao_Messaging_ReplyStartTimePolicy_nil (
 ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
 tao_Messaging_ReplyStartTimePolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::ReplyStartTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::ReplyStartTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -571,10 +571,10 @@ tao_Messaging_ReplyEndTimePolicy_nil (
 ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
 tao_Messaging_ReplyEndTimePolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::ReplyEndTimePolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::ReplyEndTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -625,10 +625,10 @@ tao_Messaging_RelativeRequestTimeoutPolicy_nil (
 ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
 tao_Messaging_RelativeRequestTimeoutPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::RelativeRequestTimeoutPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::RelativeRequestTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -679,10 +679,10 @@ tao_Messaging_RelativeRoundtripTimeoutPolicy_nil (
 ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
 tao_Messaging_RelativeRoundtripTimeoutPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -878,10 +878,10 @@ tao_Messaging_RoutingPolicy_nil (
 ACE_INLINE Messaging::RoutingPolicy_ptr
 tao_Messaging_RoutingPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::RoutingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::RoutingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -932,10 +932,10 @@ tao_Messaging_MaxHopsPolicy_nil (
 ACE_INLINE Messaging::MaxHopsPolicy_ptr
 tao_Messaging_MaxHopsPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::MaxHopsPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::MaxHopsPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -986,10 +986,10 @@ tao_Messaging_QueueOrderPolicy_nil (
 ACE_INLINE Messaging::QueueOrderPolicy_ptr
 tao_Messaging_QueueOrderPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::QueueOrderPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::QueueOrderPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1826,10 +1826,10 @@ tao_Messaging_ReplyHandler_nil (
 ACE_INLINE Messaging::ReplyHandler_ptr
 tao_Messaging_ReplyHandler_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Messaging::ReplyHandler::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return Messaging::ReplyHandler::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging_ORBInitializer.cpp
index 7d545faa4af..85ccd36c800 100644
--- a/TAO/tao/Messaging_ORBInitializer.cpp
+++ b/TAO/tao/Messaging_ORBInitializer.cpp
@@ -16,7 +16,7 @@ ACE_RCSID (TAO,
 void
 TAO_Messaging_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
@@ -32,18 +32,18 @@ TAO_Messaging_ORBInitializer::pre_init (
 void
 TAO_Messaging_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_Messaging_ORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   // Register the Messaging policy factories.
 
@@ -73,13 +73,13 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
   type = TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
@@ -87,7 +87,7 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
   type = TAO_BUFFERING_CONSTRAINT_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
@@ -95,68 +95,68 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
   type = TAO_MESSAGING_REBIND_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 
   type = TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_ROUTING_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_MAX_HOPS_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE;
   info->register_policy_factory (type,
                                  this->policy_factory_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tao/Messaging_ORBInitializer.h b/TAO/tao/Messaging_ORBInitializer.h
index d8827062e16..faf82ec7ccb 100644
--- a/TAO/tao/Messaging_ORBInitializer.h
+++ b/TAO/tao/Messaging_ORBInitializer.h
@@ -57,11 +57,11 @@ public:
   //@{
 
   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));
 
   //@}
@@ -71,7 +71,7 @@ private:
   /// Register Messaging policy factories.
   void register_policy_factories (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/tao/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging_PolicyFactory.cpp
index 8b7769da9cd..df0babeb44c 100644
--- a/TAO/tao/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging_PolicyFactory.cpp
@@ -16,7 +16,7 @@ CORBA::Policy_ptr
 TAO_Messaging_PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &value
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
@@ -28,7 +28,7 @@ TAO_Messaging_PolicyFactory::create_policy (
   case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE:
       return TAO_RelativeRoundtripTimeoutPolicy::create (
                value
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
 
 #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
@@ -37,7 +37,7 @@ TAO_Messaging_PolicyFactory::create_policy (
 
     case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE:
       return TAO_Sync_Scope_Policy::create (value
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
 
 #endif  /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
 
@@ -45,7 +45,7 @@ TAO_Messaging_PolicyFactory::create_policy (
 
     case TAO_BUFFERING_CONSTRAINT_POLICY_TYPE:
       return TAO_Buffering_Constraint_Policy::create (value
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
 
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
diff --git a/TAO/tao/Messaging_PolicyFactory.h b/TAO/tao/Messaging_PolicyFactory.h
index 61842bb4802..396f261141b 100644
--- a/TAO/tao/Messaging_PolicyFactory.h
+++ b/TAO/tao/Messaging_PolicyFactory.h
@@ -46,7 +46,7 @@ public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                            const CORBA::Any & value
-                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 };
diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp
index d0f1e8c2e60..c544b9e1ee2 100644
--- a/TAO/tao/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging_Policy_i.cpp
@@ -25,14 +25,14 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TA
 }
 
 TimeBase::TimeT
-TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->relative_expiry_;
 }
 
 CORBA::PolicyType
-TAO_RelativeRoundtripTimeoutPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RelativeRoundtripTimeoutPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how this minimizes the
@@ -62,10 +62,10 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
     {
       Messaging::RelativeRoundtripTimeoutPolicy_var p =
         Messaging::RelativeRoundtripTimeoutPolicy::_narrow (policy.in ()
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      TimeBase::TimeT t = p->relative_expiry (TAO_ENV_SINGLE_ARG_PARAMETER);
+      TimeBase::TimeT t = p->relative_expiry (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       TimeBase::TimeT seconds = t / 10000000u;
       TimeBase::TimeT microseconds = (t % 10000000u) / 10;
@@ -93,7 +93,7 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
 
 CORBA::Policy_ptr
 TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
 {
   // Future policy implementors: notice how the following code is
   // exception safe!
@@ -124,7 +124,7 @@ TAO_RelativeRoundtripTimeoutPolicy::clone (void) const
 }
 
 CORBA::Policy_ptr
-TAO_RelativeRoundtripTimeoutPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RelativeRoundtripTimeoutPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Future policy implementors: notice how the following code is
@@ -140,7 +140,7 @@ TAO_RelativeRoundtripTimeoutPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_RelativeRoundtripTimeoutPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RelativeRoundtripTimeoutPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -188,7 +188,7 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs)
 }
 
 CORBA::PolicyType
-TAO_Sync_Scope_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Sync_Scope_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Messaging::SYNC_SCOPE_POLICY_TYPE;
@@ -242,7 +242,7 @@ TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core,
 
 CORBA::Policy_ptr
 TAO_Sync_Scope_Policy::create (const CORBA::Any& val
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   Messaging::SyncScope synchronization;
   if ((val >>= synchronization) == 0)
@@ -269,14 +269,14 @@ TAO_Sync_Scope_Policy::clone (void) const
 }
 
 Messaging::SyncScope
-TAO_Sync_Scope_Policy::synchronization (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Sync_Scope_Policy::synchronization (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->synchronization_;
 }
 
 CORBA::Policy_ptr
-TAO_Sync_Scope_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Sync_Scope_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Sync_Scope_Policy *servant = 0;
@@ -289,7 +289,7 @@ TAO_Sync_Scope_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Sync_Scope_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Sync_Scope_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h
index 96c53cbdbd3..835cd50c021 100644
--- a/TAO/tao/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging_Policy_i.h
@@ -55,22 +55,22 @@ public:
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
   static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Returns a copy of <this>.
   virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const;
 
   // = The Messaging::RelativeRoundtripTimeoutPolicy methods
-  virtual TimeBase::TimeT relative_expiry (TAO_ENV_SINGLE_ARG_DECL)
+  virtual TimeBase::TimeT relative_expiry (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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));
 
   /// Change the CORBA representation to the ACE representation.
@@ -118,25 +118,25 @@ public:
   /// Helper method for the implementation of
   /// CORBA::ORB::create_policy.
   static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Returns a copy of <this>.
   virtual TAO_Sync_Scope_Policy *clone (void) const;
 
   // = The Messaging::SyncScopePolicy methods.
 
-  virtual Messaging::SyncScope synchronization (TAO_ENV_SINGLE_ARG_DECL)
+  virtual Messaging::SyncScope synchronization (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void get_synchronization (Messaging::SyncScope &synchronization) const;
 
-  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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));
 
   // Return the cached policy type for this policy.
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index b2589d0ac54..436dfa6e70a 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -96,20 +96,20 @@ CORBA_NVList::~CORBA_NVList (void)
 // add an element and just initialize its flags
 CORBA::NamedValue_ptr
 CORBA_NVList::add (CORBA::Flags flags
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   // call the helper to allocate a NamedValue element (if necessary)
-  return this->add_element (flags TAO_ENV_ARG_PARAMETER);
+  return this->add_element (flags ACE_ENV_ARG_PARAMETER);
 }
 
 // add an element and just initialize its flags and name
 CORBA::NamedValue_ptr
 CORBA_NVList::add_item (const char *name,
                         CORBA::Flags flags
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER);
+  CORBA::NamedValue_ptr nv = this->add_element (flags ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (nv)
@@ -127,10 +127,10 @@ CORBA::NamedValue_ptr
 CORBA_NVList::add_value (const char *name,
                          const CORBA::Any &value,
                          CORBA::Flags flags
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER);
+  CORBA::NamedValue_ptr nv = this->add_element (flags ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   if (nv)
     {
@@ -163,11 +163,11 @@ CORBA_NVList::add_value (const char *name,
 CORBA::NamedValue_ptr
 CORBA_NVList::add_item_consume (char *name,
                                 CORBA::Flags flags
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
 
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER);
+  CORBA::NamedValue_ptr nv = this->add_element (flags ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (nv)
@@ -187,10 +187,10 @@ CORBA::NamedValue_ptr
 CORBA_NVList::add_value_consume (char * name,
                                  CORBA::Any * value,
                                  CORBA::Flags flags
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags TAO_ENV_ARG_PARAMETER);
+  CORBA::NamedValue_ptr nv = this->add_element (flags ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (nv)
@@ -211,7 +211,7 @@ CORBA_NVList::add_value_consume (char * name,
 
 //CORBA::Status
 void
-CORBA_NVList::remove (CORBA::ULong /*n*/ TAO_ENV_ARG_DECL_NOT_USED/*env*/)
+CORBA_NVList::remove (CORBA::ULong /*n*/ ACE_ENV_ARG_DECL_NOT_USED/*env*/)
 {
   // not implemented
   // @@ (ASG) - TODO
@@ -220,9 +220,9 @@ CORBA_NVList::remove (CORBA::ULong /*n*/ TAO_ENV_ARG_DECL_NOT_USED/*env*/)
 // Helper method
 CORBA::NamedValue_ptr
 CORBA_NVList::add_element (CORBA::Flags flags
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
-  this->evaluate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
 
   if (ACE_BIT_DISABLED (flags,
@@ -248,9 +248,9 @@ CORBA_NVList::add_element (CORBA::Flags flags
 
 // return the item at location n
 CORBA::NamedValue_ptr
-CORBA_NVList::item (CORBA::ULong n TAO_ENV_ARG_DECL)
+CORBA_NVList::item (CORBA::ULong n ACE_ENV_ARG_DECL)
 {
-  this->evaluate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
 
   if (n >= this->max_) // 0 based indexing
@@ -266,7 +266,7 @@ void
 CORBA_NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
                                  int flag,
                                  int &lazy_evaluation
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   // If the list is empty then using lazy evaluation is the only
   // choice.
@@ -280,7 +280,7 @@ CORBA_NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
     {
       this->_tao_decode (cdr,
                          flag
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       return;
     }
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_);
@@ -298,7 +298,7 @@ void
 CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr,
                            TAO_ORB_Core *orb_core,
                            int flag
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_);
   if (this->incoming_ != 0)
@@ -341,7 +341,7 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr,
           (void) TAO_Marshal_Object::perform_append (tc.in (),
                                                      this->incoming_,
                                                      &cdr
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -368,7 +368,7 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr,
 
       nv->value ()->_tao_encode (cdr,
                                  orb_core
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -376,7 +376,7 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr,
 void
 CORBA_NVList::_tao_decode (TAO_InputCDR &incoming,
                            int flag
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   if (TAO_debug_level > 3)
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n")));
@@ -405,7 +405,7 @@ CORBA_NVList::_tao_decode (TAO_InputCDR &incoming,
 
       CORBA::Any_ptr any = nv->value ();
       any->_tao_decode (incoming
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -423,7 +423,7 @@ CORBA_NVList::_tao_target_alignment (void)
 }
 
 void
-CORBA_NVList::evaluate (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_NVList::evaluate (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->refcount_lock_);
   if (this->incoming_ == 0)
@@ -434,7 +434,7 @@ CORBA_NVList::evaluate (TAO_ENV_SINGLE_ARG_DECL)
 
   this->_tao_decode (*(incoming.get ()),
                      this->incoming_flag_
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
index 0c56ac91a6f..ee96cea184c 100644
--- a/TAO/tao/NVList.h
+++ b/TAO/tao/NVList.h
@@ -181,44 +181,44 @@ public:
   ~CORBA_NVList (void);
 
   /// return the current number of elements in the list
-  CORBA::ULong count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  CORBA::ULong count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// add an element and just initialize the flags
   CORBA_NamedValue_ptr add (CORBA::Flags
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// add an element and initialize its name and flags
   CORBA_NamedValue_ptr add_item (const char *,
                                  CORBA::Flags
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// initializes a value, name, and flags
   CORBA_NamedValue_ptr add_value (const char *,
                                   const CORBA::Any &,
                                   CORBA::Flags
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// just like add_item. In addition, memory management of char * name
   /// is taken over by the NVList
   CORBA_NamedValue_ptr add_item_consume (char *,
                                          CORBA::Flags
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// just like add_value. In addition, the NVList controls the memory
   /// management of the char *name and Any *value parameter
   CORBA_NamedValue_ptr add_value_consume (char *,
                                           CORBA::Any_ptr,
                                           CORBA::Flags
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// retrieve the item at the nth location. Raises Bounds
   CORBA_NamedValue_ptr item (CORBA::ULong n
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   //  CORBA::Status
   /// remove element at index n. Raises Bounds
   void remove (CORBA::ULong n
-               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // The pseudo object static methods..
   static CORBA_NVList* _duplicate (CORBA_NVList*);
@@ -239,19 +239,19 @@ public:
   void _tao_incoming_cdr (TAO_InputCDR &cdr,
                           int flag,
                           int &lazy_evaluation
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
 
   /// Encode the NVList into the CDR stream. <flag> masks the type of
   /// arguments (IN, OUT or INOUT) that are to be marshaled.
   void _tao_encode (TAO_OutputCDR &cdr,
                     TAO_ORB_Core *orb_core,
                     int flag
-                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Decode the NVList arguments from the <cdr> stream.
   void _tao_decode (TAO_InputCDR &cdr,
                     int flag
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
 
   /**
    * Return the required alignment to marshal the NVList without any
@@ -281,11 +281,11 @@ private:
   /// helper to increase the list size. This is used by all the add_
   /// methods of the NVList class
   CORBA_NamedValue_ptr add_element (CORBA::Flags
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Lazy evaluation routine to fill up the Anys in the NVList from
   /// the CDR stream.
-  void evaluate (TAO_ENV_SINGLE_ARG_DECL);
+  void evaluate (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// internal list of parameters stored as NamedValues
diff --git a/TAO/tao/NVList.i b/TAO/tao/NVList.i
index 29d94e96a7e..81c69a9f738 100644
--- a/TAO/tao/NVList.i
+++ b/TAO/tao/NVList.i
@@ -247,9 +247,9 @@ CORBA_NVList::CORBA_NVList (void)
 }
 
 ACE_INLINE CORBA::ULong
-CORBA_NVList::count (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_NVList::count (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  (ACE_const_cast(CORBA_NVList*,this))->evaluate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  (ACE_const_cast(CORBA_NVList*,this))->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return this->max_;
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index b342cb27858..6bf5aaffc58 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -136,7 +136,7 @@ void CORBA_ORB::InvalidName::_raise (void)
 }
 
 void CORBA_ORB::InvalidName::_tao_encode (TAO_OutputCDR &cdr
-                                          TAO_ENV_ARG_DECL) const
+                                          ACE_ENV_ARG_DECL) const
 {
   if (cdr << *this)
     return;
@@ -144,7 +144,7 @@ void CORBA_ORB::InvalidName::_tao_encode (TAO_OutputCDR &cdr
 }
 
 void CORBA_ORB::InvalidName::_tao_decode (TAO_InputCDR &cdr
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   if (cdr >> *this)
     return;
@@ -187,18 +187,18 @@ CORBA_ORB::~CORBA_ORB (void)
 
 void
 CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
-  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->orb_core ()->shutdown (wait_for_completion
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-CORBA_ORB::destroy (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_ORB::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->orb_core () == 0)
     {
@@ -221,7 +221,7 @@ CORBA_ORB::destroy (TAO_ENV_SINGLE_ARG_DECL)
                   this->orb_core ()->orbid ()));
     }
 
-  this->orb_core ()->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_core ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now invalidate the pointer to the ORB_Core that created this
@@ -230,55 +230,55 @@ CORBA_ORB::destroy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CORBA_ORB::run (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_ORB::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->run (0 TAO_ENV_ARG_PARAMETER);
+  this->run (0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
-CORBA_ORB::run (ACE_Time_Value &tv TAO_ENV_ARG_DECL)
+CORBA_ORB::run (ACE_Time_Value &tv ACE_ENV_ARG_DECL)
 {
-  this->run (&tv TAO_ENV_ARG_PARAMETER);
+  this->run (&tv ACE_ENV_ARG_PARAMETER);
 }
 
 void
 CORBA_ORB::run (ACE_Time_Value *tv
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
-  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_core ()->run (tv, 0 TAO_ENV_ARG_PARAMETER);
+  this->orb_core ()->run (tv, 0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
-CORBA_ORB::perform_work (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_ORB::perform_work (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->perform_work (0 TAO_ENV_ARG_PARAMETER);
+  this->perform_work (0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
-CORBA_ORB::perform_work (ACE_Time_Value &tv TAO_ENV_ARG_DECL)
+CORBA_ORB::perform_work (ACE_Time_Value &tv ACE_ENV_ARG_DECL)
 {
-  this->perform_work (&tv TAO_ENV_ARG_PARAMETER);
+  this->perform_work (&tv ACE_ENV_ARG_PARAMETER);
 }
 
 void
 CORBA_ORB::perform_work (ACE_Time_Value *tv
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_core ()->run (tv, 1 TAO_ENV_ARG_PARAMETER);
+  this->orb_core ()->run (tv, 1 ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-CORBA_ORB::work_pending (ACE_Time_Value &tv TAO_ENV_ARG_DECL)
+CORBA_ORB::work_pending (ACE_Time_Value &tv ACE_ENV_ARG_DECL)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   int result = this->orb_core_->reactor ()->work_pending (tv);
@@ -292,10 +292,10 @@ CORBA_ORB::work_pending (ACE_Time_Value &tv TAO_ENV_ARG_DECL)
 }
 
 CORBA::Boolean
-CORBA_ORB::work_pending (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_ORB::work_pending (ACE_ENV_SINGLE_ARG_DECL)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   int result = this->orb_core_->reactor ()->work_pending ();
@@ -313,7 +313,7 @@ CORBA_ORB::work_pending (TAO_ENV_SINGLE_ARG_DECL)
 void
 CORBA_ORB::create_list (CORBA::Long count,
                         CORBA::NVList_ptr &new_list
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   ACE_ASSERT (CORBA::ULong (count) <= UINT_MAX);
 
@@ -351,7 +351,7 @@ CORBA_ORB::create_list (CORBA::Long count,
 
 void
 CORBA_ORB::create_exception_list (CORBA::ExceptionList_ptr &list
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   TAO_Dynamic_Adapter *dynamic_adapter =
     ACE_Dynamic_Service<TAO_Dynamic_Adapter>::instance (
@@ -359,12 +359,12 @@ CORBA_ORB::create_exception_list (CORBA::ExceptionList_ptr &list
       );
 
   dynamic_adapter->create_exception_list (list
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
 }
 
 void
 CORBA_ORB::create_environment (CORBA::Environment_ptr &environment
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (environment,
                     CORBA::Environment (),
@@ -377,7 +377,7 @@ CORBA_ORB::create_environment (CORBA::Environment_ptr &environment
 
 void
 CORBA_ORB::create_named_value (CORBA::NamedValue_ptr &nv
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   ACE_NEW_THROW_EX (nv,
                     CORBA::NamedValue,
@@ -395,7 +395,7 @@ CORBA::Boolean
 CORBA_ORB::get_service_information (
   CORBA::ServiceType /* service_type */,
   CORBA::ServiceInformation_out /* service_information */
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
                       CORBA_SystemException::_tao_minor_code (
@@ -407,7 +407,7 @@ CORBA_ORB::get_service_information (
 
 void
 CORBA_ORB::create_context_list (CORBA::ContextList_ptr &
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA_SystemException::_tao_minor_code (
@@ -418,7 +418,7 @@ CORBA_ORB::create_context_list (CORBA::ContextList_ptr &
 
 void
 CORBA_ORB::get_default_context (CORBA::Context_ptr &
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA_SystemException::_tao_minor_code (
@@ -429,7 +429,7 @@ CORBA_ORB::get_default_context (CORBA::Context_ptr &
 
 void
 CORBA_ORB::send_multiple_requests_oneway (const CORBA_ORB_RequestSeq &
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA_SystemException::_tao_minor_code (
@@ -440,7 +440,7 @@ CORBA_ORB::send_multiple_requests_oneway (const CORBA_ORB_RequestSeq &
 
 void
 CORBA_ORB::send_multiple_requests_deferred (const CORBA_ORB_RequestSeq &
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA_SystemException::_tao_minor_code (
@@ -451,7 +451,7 @@ CORBA_ORB::send_multiple_requests_deferred (const CORBA_ORB_RequestSeq &
 
 void
 CORBA_ORB::get_next_response (CORBA_Request_ptr &
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::NO_IMPLEMENT (
                CORBA_SystemException::_tao_minor_code (
@@ -461,7 +461,7 @@ CORBA_ORB::get_next_response (CORBA_Request_ptr &
 }
 
 CORBA::Boolean
-CORBA_ORB::poll_next_response (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_ORB::poll_next_response (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
                       CORBA_SystemException::_tao_minor_code (
@@ -478,7 +478,7 @@ CORBA_ORB::create_struct_tc (
     const char *id,
     const char *name,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -496,7 +496,7 @@ CORBA_ORB::create_struct_tc (
   return adapter->create_struct_tc (id,
                                     name,
                                     members
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -505,7 +505,7 @@ CORBA_ORB::create_union_tc (
     const char *name,
     CORBA::TypeCode_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -524,7 +524,7 @@ CORBA_ORB::create_union_tc (
                                    name,
                                    discriminator_type,
                                    members
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -532,7 +532,7 @@ CORBA_ORB::create_enum_tc (
     const char *id,
     const char *name,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -550,7 +550,7 @@ CORBA_ORB::create_enum_tc (
   return adapter->create_enum_tc (id,
                                   name,
                                   members
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -558,7 +558,7 @@ CORBA_ORB::create_alias_tc (
     const char *id,
     const char *name,
     CORBA::TypeCode_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -576,7 +576,7 @@ CORBA_ORB::create_alias_tc (
   return adapter->create_alias_tc (id,
                                    name,
                                    original_type
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -584,7 +584,7 @@ CORBA_ORB::create_exception_tc (
     const char *id,
     const char *name,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -602,14 +602,14 @@ CORBA_ORB::create_exception_tc (
   return adapter->create_exception_tc (id,
                                        name,
                                        members
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_interface_tc (
     const char *id,
     const char *name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -626,13 +626,13 @@ CORBA_ORB::create_interface_tc (
 
   return adapter->create_interface_tc (id,
                                        name
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_string_tc (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -648,13 +648,13 @@ CORBA_ORB::create_string_tc (
     }
 
   return adapter->create_string_tc (bound
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_wstring_tc (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -670,14 +670,14 @@ CORBA_ORB::create_wstring_tc (
     }
 
   return adapter->create_wstring_tc (bound
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_fixed_tc (
     CORBA::UShort digits,
     CORBA::UShort scale
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -694,14 +694,14 @@ CORBA_ORB::create_fixed_tc (
 
   return adapter->create_fixed_tc (digits,
                                    scale
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_sequence_tc (
     CORBA::ULong bound,
     CORBA::TypeCode_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -718,14 +718,14 @@ CORBA_ORB::create_sequence_tc (
 
   return adapter->create_sequence_tc (bound,
                                       element_type
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_array_tc (
     CORBA::ULong length,
     CORBA::TypeCode_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -742,7 +742,7 @@ CORBA_ORB::create_array_tc (
 
   return adapter->create_array_tc (length,
                                    element_type
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -752,7 +752,7 @@ CORBA_ORB::create_value_tc (
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
     const CORBA_ValueMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -772,7 +772,7 @@ CORBA_ORB::create_value_tc (
                                    type_modifier,
                                    concrete_base,
                                    members
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -780,7 +780,7 @@ CORBA_ORB::create_value_box_tc (
     const char *id,
     const char *name,
     CORBA::TypeCode_ptr boxed_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -798,14 +798,14 @@ CORBA_ORB::create_value_box_tc (
   return adapter->create_value_box_tc (id,
                                        name,
                                        boxed_type
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_native_tc (
     const char *id,
     const char *name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -822,13 +822,13 @@ CORBA_ORB::create_native_tc (
 
   return adapter->create_native_tc (id,
                                     name
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_recursive_tc (
     const char *id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -844,14 +844,14 @@ CORBA_ORB::create_recursive_tc (
     }
 
   return adapter->create_recursive_tc (id
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_abstract_interface_tc (
     const char *id,
     const char *name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -868,14 +868,14 @@ CORBA_ORB::create_abstract_interface_tc (
 
   return adapter->create_abstract_interface_tc (id,
                                                 name
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_ORB::create_local_interface_tc (
     const char *id,
     const char *name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -892,7 +892,7 @@ CORBA_ORB::create_local_interface_tc (
 
   return adapter->create_local_interface_tc (id,
                                              name
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -900,19 +900,19 @@ CORBA_ORB::create_local_interface_tc (
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_root_poa (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_ORB::resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
-  return this->orb_core_->root_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->orb_core_->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_poa_current (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA_ORB::resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->orb_core_->poa_current ();
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_policy_manager (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA_ORB::resolve_policy_manager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
@@ -933,7 +933,7 @@ CORBA_ORB::resolve_policy_manager (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_policy_current (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA_ORB::resolve_policy_current (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
@@ -950,7 +950,7 @@ CORBA_ORB::resolve_policy_current (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Object_ptr
 CORBA_ORB::resolve_service (TAO_MCAST_SERVICEID mcast_service_id
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   const char *env_service_ior [] =
   {
@@ -988,7 +988,7 @@ CORBA_ORB::resolve_service (TAO_MCAST_SERVICEID mcast_service_id
  if (ACE_OS::strcmp (service_ior.c_str (), "") != 0)
    {
      return_value =
-       this->string_to_object (service_ior.c_str () TAO_ENV_ARG_PARAMETER);
+       this->string_to_object (service_ior.c_str () ACE_ENV_ARG_PARAMETER);
      ACE_CHECK_RETURN (CORBA_Object::_nil ());
 
      // Return ior.
@@ -1054,45 +1054,45 @@ CORBA_ORB::resolve_service (TAO_MCAST_SERVICEID mcast_service_id
 
 CORBA_Object_ptr
 CORBA_ORB::resolve_initial_references (const char *name
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   return this->resolve_initial_references (name,
                                            0
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_Object_ptr
 CORBA_ORB::resolve_initial_references (const char *name,
                                        ACE_Time_Value *timeout
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (ACE_OS::strcmp (name, TAO_OBJID_ROOTPOA) == 0)
-    return this->resolve_root_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->resolve_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_POACURRENT) == 0)
-    return this->resolve_poa_current (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->resolve_poa_current (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYMANAGER) == 0)
-    return this->resolve_policy_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->resolve_policy_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYCURRENT) == 0)
-    return this->resolve_policy_current (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->resolve_policy_current (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_IORMANIPULATION) == 0)
-    return this->orb_core ()->resolve_ior_manipulation (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->orb_core ()->resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_IORTABLE) == 0)
-    return this->orb_core ()->resolve_ior_table (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->orb_core ()->resolve_ior_table (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_DYNANYFACTORY) == 0)
-    return this->orb_core ()->resolve_dynanyfactory (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->orb_core ()->resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   else if (ACE_OS::strcmp (name, TAO_OBJID_TYPECODEFACTORY) == 0)
-    return this->orb_core ()->resolve_typecodefactory (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->orb_core ()->resolve_typecodefactory (ACE_ENV_SINGLE_ARG_PARAMETER);
 
 
   // -----------------------------------------------------------------
@@ -1102,7 +1102,7 @@ CORBA_ORB::resolve_initial_references (const char *name,
   CORBA::Object_var result =
     this->orb_core ()->object_ref_table ().resolve_initial_references (
       name
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (!CORBA::is_nil (result.in ()))
@@ -1117,7 +1117,7 @@ CORBA_ORB::resolve_initial_references (const char *name,
   /// Is the service name in the IOR Table.
   if (this->orb_core_->init_ref_map ()->find (object_id, ior) == 0)
     return this->string_to_object (ior.c_str ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 
   /// May be trying the explicitly specified services and the well
   /// known services should be tried first before falling on to default
@@ -1129,7 +1129,7 @@ CORBA_ORB::resolve_initial_references (const char *name,
   if (ACE_OS::strcmp (name, TAO_OBJID_NAMESERVICE) == 0)
     {
       result = this->resolve_service (NAMESERVICE
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       if (!CORBA::is_nil (result.in ()))
@@ -1138,7 +1138,7 @@ CORBA_ORB::resolve_initial_references (const char *name,
   else if (ACE_OS::strcmp (name, TAO_OBJID_TRADINGSERVICE) == 0)
     {
       result = this->resolve_service (TRADINGSERVICE
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       if (!CORBA::is_nil (result.in ()))
@@ -1147,7 +1147,7 @@ CORBA_ORB::resolve_initial_references (const char *name,
   else if (ACE_OS::strcmp (name, TAO_OBJID_IMPLREPOSERVICE) == 0)
     {
       result = this->resolve_service (IMPLREPOSERVICE
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       if (!CORBA::is_nil (result.in ()))
@@ -1156,7 +1156,7 @@ CORBA_ORB::resolve_initial_references (const char *name,
   else if (ACE_OS::strcmp (name, TAO_OBJID_INTERFACEREP) == 0)
     {
       result = this->resolve_service (INTERFACEREPOSERVICE
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       if (!CORBA::is_nil (result.in ()))
@@ -1166,7 +1166,7 @@ CORBA_ORB::resolve_initial_references (const char *name,
   // Is not one of the well known services, try to find it in the
   // InitRef table....check the defaultinitref values also.
 
-  result = this->orb_core ()->resolve_rir (name TAO_ENV_ARG_PARAMETER);
+  result = this->orb_core ()->resolve_rir (name ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (!CORBA::is_nil (result.in ()))
@@ -1179,7 +1179,7 @@ CORBA_ORB::resolve_initial_references (const char *name,
 void
 CORBA_ORB::register_initial_reference (const char * id,
                                        CORBA::Object_ptr obj
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   if (id == 0)
     ACE_THROW (CORBA::ORB::InvalidName ());
@@ -1188,27 +1188,27 @@ CORBA_ORB::register_initial_reference (const char * id,
 
   TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table ();
 
-  table.register_initial_reference (id, obj TAO_ENV_ARG_PARAMETER);
+  table.register_initial_reference (id, obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 
 CORBA_ORB_ObjectIdList_ptr
-CORBA_ORB::list_initial_services (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_ORB::list_initial_services (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return
-    this->orb_core ()->list_initial_references (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->orb_core ()->list_initial_references (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-CORBA_ORB::check_shutdown (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_ORB::check_shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->orb_core () != 0)
     {
-      this->orb_core ()->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_core ()->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -1228,7 +1228,7 @@ CORBA_ORB::check_shutdown (TAO_ENV_SINGLE_ARG_DECL)
 // ****************************************************************
 
 void
-CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL)
 {
   // This method should be invoked atomically.  It is the caller's
   // responsibility to ensure that this condition is satisfied.
@@ -1247,7 +1247,7 @@ CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_DECL)
   TAO_TypeCodes::init ();
 
   // initialize the system exceptions
-  TAO_Exceptions::init (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Verify some of the basic implementation requirements.  This test
@@ -1296,7 +1296,7 @@ CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_DECL)
     tmp_cf_initializer;
 
   PortableInterceptor::register_orb_initializer (cf_initializer.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // -------------------------------------------------------------
@@ -1322,7 +1322,7 @@ CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_DECL)
   orb_initializer = temp_orb_initializer;
 
   PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 #endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -1344,7 +1344,7 @@ CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_DECL)
   pi_initializer = temp_pi_initializer;
 
   PortableInterceptor::register_orb_initializer (pi_initializer.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
@@ -1412,7 +1412,7 @@ CORBA::ORB_init (int &argc,
   if (TAO_Singleton_Manager::instance ()->init () == -1)
     return CORBA::ORB::_nil ();
 
-  CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
   // Make sure the following is done after the global ORB
@@ -1551,11 +1551,11 @@ CORBA::ORB_init (int &argc,
   // Call the ORBInitializer::pre_init() on each registered ORB
   // initializer.
   TAO_ORBInitializer_Registry::instance ()->pre_init (orb_init_info.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
   // Initialize the ORB Core instance.
-  result = safe_oc->init (argc, argv TAO_ENV_ARG_PARAMETER);
+  result = safe_oc->init (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
   // Check for errors and return nil pseudo-reference on error.
@@ -1570,7 +1570,7 @@ CORBA::ORB_init (int &argc,
   // Call the ORBInitializer::post_init() on each registered ORB
   // initializer.
   TAO_ORBInitializer_Registry::instance ()->post_init (orb_init_info.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
   // Invalidate the ORBInitInfo instance to prevent future
@@ -1599,10 +1599,10 @@ CORBA::ORB_init (int &argc,
 // Object reference stringification.
 char *
 CORBA_ORB::object_to_string (CORBA::Object_ptr obj
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!CORBA::is_nil (obj) && obj->_is_local ())
@@ -1730,7 +1730,7 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj
       // For now we just use the first profile.
       TAO_Profile *profile = mp.get_profile (0);
 
-      return profile->to_string (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return profile->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
 }
 
@@ -1739,10 +1739,10 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj
 
 CORBA::Object_ptr
 CORBA_ORB::string_to_object (const char *str
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   // This method should not be called if the ORB has been shutdown.
-  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Check for NULL pointer
@@ -1761,7 +1761,7 @@ CORBA_ORB::string_to_object (const char *str
     {
       return ior_parser->parse_string (str,
                                        this
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
     }
 
 
@@ -1769,15 +1769,15 @@ CORBA_ORB::string_to_object (const char *str
                        ior_prefix,
                        sizeof ior_prefix - 1) == 0)
     return this->ior_string_to_object (str + sizeof ior_prefix - 1
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   else
-    return this->url_ior_string_to_object (str TAO_ENV_ARG_PARAMETER);
+    return this->url_ior_string_to_object (str ACE_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
 
 char *
-CORBA_ORB::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA_ORB::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return CORBA::string_dup (this->orb_core_->orbid ());
 }
@@ -1787,9 +1787,9 @@ CORBA_ORB::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 CORBA::Policy_ptr
 CORBA_ORB::create_policy (CORBA::PolicyType type,
                           const CORBA::Any& val
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
-  this->check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   /// Attempt to obtain the policy from the policy factory registry.
@@ -1797,7 +1797,7 @@ CORBA_ORB::create_policy (CORBA::PolicyType type,
     this->orb_core_->policy_factory_registry ()->create_policy (
       type,
       val
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
 }
 
 // Destringify OMG-specified "IOR" string.
@@ -1807,7 +1807,7 @@ CORBA_ORB::create_policy (CORBA::PolicyType type,
 
 CORBA::Object_ptr
 CORBA_ORB::ior_string_to_object (const char *str
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   // Unhex the bytes, and make a CDR deencapsulation stream from the
   // resulting data.
@@ -1866,7 +1866,7 @@ CORBA_ORB::ior_string_to_object (const char *str
 
 CORBA::Object_ptr
 CORBA_ORB::url_ior_string_to_object (const char* str
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   TAO_MProfile mprofile;
   // It is safe to declare this on the stack since the contents of
@@ -1879,7 +1879,7 @@ CORBA_ORB::url_ior_string_to_object (const char* str
     this->orb_core_->connector_registry ()->make_mprofile (
       str,
       mprofile
-      TAO_ENV_ARG_PARAMETER);
+      ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (CORBA::Object::_nil ());   // Return nil.
 
@@ -1896,7 +1896,7 @@ CORBA_ORB::url_ior_string_to_object (const char* str
   // Now make the TAO_Stub.
   TAO_Stub *data = this->orb_core_->create_stub ((char *) 0,
                                                  mprofile
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   TAO_Stub_Auto_Ptr safe_objdata (data);
@@ -1991,7 +1991,7 @@ CORBA::ValueFactory_ptr
 CORBA_ORB::register_value_factory (
   const char *repository_id,
   CORBA::ValueFactory_ptr factory
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
 // %! guard, and ACE_Null_Mutex in the map
 // do _add_ref here not in map->rebind
@@ -2020,7 +2020,7 @@ CORBA_ORB::register_value_factory (
 
 void
 CORBA_ORB::unregister_value_factory (const char * /* repository_id */
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_ERROR((LM_ERROR, ACE_TEXT ("(%N:%l) function not implemented\n")));
   // %! TODO
@@ -2028,7 +2028,7 @@ CORBA_ORB::unregister_value_factory (const char * /* repository_id */
 
 CORBA::ValueFactory_ptr
 CORBA_ORB::lookup_value_factory (const char *repository_id
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
 // %! guard
 // do _add_ref here not in map->find
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 9c28220c8cc..3e0e8f120d6 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -88,9 +88,9 @@ public:
     virtual void _raise (void);
 
     virtual void _tao_encode (TAO_OutputCDR &cdr
-                              TAO_ENV_ARG_DECL_NOT_USED) const;
+                              ACE_ENV_ARG_DECL_NOT_USED) const;
     virtual void _tao_decode (TAO_InputCDR &cdr
-                              TAO_ENV_ARG_DECL_NOT_USED);
+                              ACE_ENV_ARG_DECL_NOT_USED);
 
     /// = TAO extension
     static InvalidName* _downcast (CORBA_Exception *ex);
@@ -118,7 +118,7 @@ public:
   static CORBA::ORB_ptr _nil (void);
 
   /// Return this ORB's ORBid.
-  char * id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  char * id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Turn a string-ified object reference back into an object pointer.
@@ -126,7 +126,7 @@ public:
    * but not necessarily locally.
    */
   CORBA::Object_ptr string_to_object (const char *str
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Turn an object reference into a string.  Each type of ORB,
@@ -136,7 +136,7 @@ public:
    * argument.
    */
   char * object_to_string (CORBA::Object_ptr obj
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 #ifdef TAO_HAS_VALUETYPE
@@ -144,12 +144,12 @@ public:
   CORBA::ValueFactory_ptr register_value_factory (
          const char *repository_id,
          CORBA::ValueFactory_ptr factory
-         TAO_ENV_ARG_DECL_WITH_DEFAULTS );
+         ACE_ENV_ARG_DECL_WITH_DEFAULTS );
   void unregister_value_factory (const char * repository_id
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS );
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS );
   CORBA::ValueFactory_ptr lookup_value_factory (
          const char *repository_id
-         TAO_ENV_ARG_DECL_WITH_DEFAULTS );
+         ACE_ENV_ARG_DECL_WITH_DEFAULTS );
 #endif /* TAO_HAS_VALUETYPE */
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
@@ -163,40 +163,40 @@ public:
 
   void create_list (CORBA::Long count,
                     CORBA::NVList_ptr &new_list
-                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void create_named_value (CORBA::NamedValue_ptr &nmval
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void create_exception_list (CORBA::ExceptionList_ptr &exclist
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void create_environment (CORBA::Environment_ptr &new_env
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // The following are not implemented and just throw
   // CORBA::NO_IMPLEMENT.
 
   void create_context_list (CORBA::ContextList_ptr &ctxtlist
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void get_default_context (CORBA::Context_ptr &ctx
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::Boolean get_service_information (CORBA::ServiceType service_type,
                                           CORBA::ServiceInformation_out service_information
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void send_multiple_requests_oneway (const CORBA_ORB_RequestSeq &req
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void send_multiple_requests_deferred (const CORBA_ORB_RequestSeq &req
-                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void get_next_response (CORBA_Request_ptr &req
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  CORBA::Boolean poll_next_response (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  CORBA::Boolean poll_next_response (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// The ORB TypeCode creation functions.
 
@@ -204,7 +204,7 @@ public:
       const char *id,
       const char *name,
       const CORBA::StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -213,7 +213,7 @@ public:
       const char *name,
       CORBA::TypeCode_ptr discriminator_type,
       const CORBA::UnionMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -221,7 +221,7 @@ public:
       const char *id,
       const char *name,
       const CORBA::EnumMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -229,7 +229,7 @@ public:
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -237,47 +237,47 @@ public:
       const char *id,
       const char *name,
       const CORBA::StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_interface_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_string_tc (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_wstring_tc (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_fixed_tc (
       CORBA::UShort digits,
       CORBA::UShort scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
       CORBA::TypeCode_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
       CORBA::TypeCode_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -287,7 +287,7 @@ public:
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
       const CORBA::ValueMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -295,27 +295,27 @@ public:
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr boxed_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_native_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_recursive_tc (
       const char *id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr create_abstract_interface_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -323,7 +323,7 @@ public:
   CORBA::TypeCode_ptr create_local_interface_tc (
       const char *id,
       const char *ame
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -337,7 +337,7 @@ public:
    * If an error occurs during initialization or at run-time, a CORBA
    * system exception will be thrown.
    */
-  void run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Instructs the ORB to initialize itself and run its event loop in
@@ -348,7 +348,7 @@ public:
    * spent in this call.
    **/
   void run (ACE_Time_Value &tv
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Instructs the ORB to initialize itself and run its event loop in
@@ -361,17 +361,17 @@ public:
    * and does not block.
    **/
   void run (ACE_Time_Value *tv
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Returns an indication of whether the ORB needs to perform some
   /// work.
-  CORBA::Boolean work_pending (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  CORBA::Boolean work_pending (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Returns an indication of whether the ORB needs to perform some work
   /// but will look for work pending for no more than the specified time.
   /// This is useful for implementing an event loop with an idle timeout.
   CORBA::Boolean work_pending (ACE_Time_Value &tv
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * This operation performs an implementation-defined unit of work.
@@ -379,11 +379,11 @@ public:
    * not present; this behavior can be modified by passing an
    * appropriate <ACE_Time_Value> as described in run().
    **/
-  void perform_work (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void perform_work (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   void perform_work (ACE_Time_Value &
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   void perform_work (ACE_Time_Value *
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * This operation instructs the ORB to shut down. Shutting down the
@@ -394,7 +394,7 @@ public:
    * has completed.
    */
   void shutdown (CORBA::Boolean wait_for_completion = 0
-                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Explicitly destroy the ORB, releasing any resources.  Note that
@@ -407,10 +407,10 @@ public:
    * The results of multi-threaded applications, trying to destroy ()
    * the ORB in one thread and trying to service a request in another
    * thread are not well defined. TAO does not support such cases.  */
-  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA_Object_ptr resolve_initial_references (const char *name
-                                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * This method acts as a mini-bootstrapping Naming Service, which is
@@ -428,34 +428,34 @@ public:
    */
   CORBA_Object_ptr resolve_initial_references (const char *name,
                                                ACE_Time_Value *timeout
-                                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Register an object reference with the ORB.
   void register_initial_reference (
       const char * id,
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   /// Returns a sequence of ObjectIds that lists which objects have
   /// references available via the initial references mechanism.
   CORBA_ORB_ObjectIdList_ptr list_initial_services (
-              TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                    const CORBA::Any& val
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // ----------------------------------------------------------------
   // = TAO-specific extensions to the CORBA specification.
   // ----------------------------------------------------------------
 
   /// Resolve the POA.
-  CORBA_Object_ptr resolve_root_poa (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA_Object_ptr resolve_root_poa (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Initialize the ORB globals correctly, i.e., only when they
   /// haven't been initialized yet.
-  static void init_orb_globals (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  static void init_orb_globals (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   // The function used by tao to handle the "unexpected" exceptions,
   // It raises CORBA::UNKNOWN.
@@ -502,30 +502,30 @@ protected:
   ~CORBA_ORB (void);
 
   /// Resolve the POA current.
-  CORBA_Object_ptr resolve_poa_current (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA_Object_ptr resolve_poa_current (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Resolve the Policy Manager for this ORB.
-  CORBA_Object_ptr resolve_policy_manager (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  CORBA_Object_ptr resolve_policy_manager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// Resolve the Policy Current for this thread.
-  CORBA_Object_ptr resolve_policy_current (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  CORBA_Object_ptr resolve_policy_current (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
 
   /// Resolve the given service based on the service ID.
   CORBA::Object_ptr resolve_service (TAO_MCAST_SERVICEID service_id
-                                    TAO_ENV_ARG_DECL);
+                                    ACE_ENV_ARG_DECL);
 
   /// Convert an OMG IOR into an object reference.
   CORBA::Object_ptr ior_string_to_object (const char* ior
-                                          TAO_ENV_ARG_DECL);
+                                          ACE_ENV_ARG_DECL);
 
   /// Convert an URL style IOR into an object reference.
   CORBA::Object_ptr url_ior_string_to_object (const char* ior
-                                              TAO_ENV_ARG_DECL);
+                                              ACE_ENV_ARG_DECL);
 
   /// Check if ORB has shutdown.  If it has, throw an exception.
-  void check_shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void check_shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Set the timeout value
   void set_timeout (ACE_Time_Value *timeout);
@@ -556,7 +556,7 @@ private:
   // = NON-PROVIDED METHODS
   CORBA_ORB (const CORBA_ORB &);
   CORBA_ORB &operator= (const CORBA_ORB &);
-  
+
   /// Timeout value
   ACE_Time_Value *timeout_;
 
diff --git a/TAO/tao/ORBInitInfo.cpp b/TAO/tao/ORBInitInfo.cpp
index ef8173d34cc..b856adf641f 100644
--- a/TAO/tao/ORBInitInfo.cpp
+++ b/TAO/tao/ORBInitInfo.cpp
@@ -34,10 +34,10 @@ TAO_ORBInitInfo::~TAO_ORBInitInfo (void)
 }
 
 CORBA::StringSeq *
-TAO_ORBInitInfo::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // In accordance with the C++ mapping for sequences, it is up to the
@@ -65,10 +65,10 @@ TAO_ORBInitInfo::arguments (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO_ORBInitInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // In accordance with the C++ mapping for strings, return a copy.
@@ -77,7 +77,7 @@ TAO_ORBInitInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 IOP::CodecFactory_ptr
-TAO_ORBInitInfo::codec_factory (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The CodecFactory is stateless and reentrant, so share a single
@@ -109,11 +109,11 @@ void
 TAO_ORBInitInfo::register_initial_reference (
     const char * id,
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::InvalidName))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (id == 0)
@@ -124,18 +124,18 @@ TAO_ORBInitInfo::register_initial_reference (
 
   TAO_Object_Ref_Table &table = this->orb_core_->object_ref_table ();
 
-  table.register_initial_reference (id, obj TAO_ENV_ARG_PARAMETER);
+  table.register_initial_reference (id, obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::Object_ptr
 TAO_ORBInitInfo::resolve_initial_references (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::InvalidName))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   if (id == 0)
@@ -150,22 +150,22 @@ TAO_ORBInitInfo::resolve_initial_references (
   // mechanism.
   return
     this->orb_core_->orb ()->resolve_initial_references (id
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_ORBInitInfo::add_client_request_interceptor (
     PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
 # if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->orb_core_->add_interceptor (interceptor
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 #else
   ACE_UNUSED_ARG (interceptor);
   ACE_THROW (CORBA::NO_IMPLEMENT (
@@ -179,16 +179,16 @@ TAO_ORBInitInfo::add_client_request_interceptor (
 void
 TAO_ORBInitInfo::add_server_request_interceptor (
     PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
 # if TAO_HAS_INTERCEPTORS == 1
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->orb_core_->add_interceptor (interceptor
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 
 #else
   ACE_UNUSED_ARG (interceptor);
@@ -203,22 +203,22 @@ TAO_ORBInitInfo::add_server_request_interceptor (
 void
 TAO_ORBInitInfo::add_ior_interceptor (
     PortableInterceptor::IORInterceptor_ptr interceptor
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ORBInitInfo::DuplicateName))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->orb_core_->add_interceptor (interceptor
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 PortableInterceptor::SlotId
-TAO_ORBInitInfo::allocate_slot_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::allocate_slot_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
 #if TAO_HAS_INTERCEPTORS == 1
@@ -237,10 +237,10 @@ void
 TAO_ORBInitInfo::register_policy_factory (
     CORBA::PolicyType type,
     PortableInterceptor::PolicyFactory_ptr policy_factory
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_PolicyFactory_Registry *registry =
@@ -248,15 +248,15 @@ TAO_ORBInitInfo::register_policy_factory (
 
   registry->register_policy_factory (type,
                                      policy_factory
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 }
 
 size_t
 TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->check_validity (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   size_t slot_id = 0;
@@ -276,7 +276,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup
 }
 
 void
-TAO_ORBInitInfo::check_validity (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORBInitInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->orb_core_ == 0)
     {
@@ -293,15 +293,15 @@ TAO_ORBInitInfo::check_validity (TAO_ENV_SINGLE_ARG_DECL)
 
 TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return TAO_ORBInitInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return TAO_ORBInitInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_ORBInitInfo_ptr TAO_ORBInitInfo::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -390,10 +390,10 @@ tao_TAO_ORBInitInfo_nil (
 TAO_ORBInitInfo_ptr
 tao_TAO_ORBInitInfo_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return TAO_ORBInitInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return TAO_ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -517,10 +517,10 @@ TAO_ORBInitInfo_var::nil (void)
 TAO_ORBInitInfo_ptr
 TAO_ORBInitInfo_var::narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::TAO_ORBInitInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::TAO_ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
diff --git a/TAO/tao/ORBInitInfo.h b/TAO/tao/ORBInitInfo.h
index 5081a25a667..31cddd57891 100644
--- a/TAO/tao/ORBInitInfo.h
+++ b/TAO/tao/ORBInitInfo.h
@@ -79,18 +79,18 @@ public:
   /// Return the argument vector for the ORB currently being
   /// initialized as a string sequence.
   virtual CORBA::StringSeq * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the ORBid for the ORB currently being initialized.
   virtual char * orb_id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the CodecFactory for the ORB currently being
   /// initialized.
   virtual IOP::CodecFactory_ptr codec_factory (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register a mapping between a string and a corresponding object
@@ -106,7 +106,7 @@ public:
   virtual void register_initial_reference (
       const char * id,
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::InvalidName));
 
@@ -115,7 +115,7 @@ public:
   /// since the ORB may not be fully initialized yet.
   virtual CORBA::Object_ptr resolve_initial_references (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::InvalidName));
 
@@ -123,7 +123,7 @@ public:
   /// being initialized.
   virtual void add_client_request_interceptor (
       PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
@@ -131,7 +131,7 @@ public:
   /// being initialized.
   virtual void add_server_request_interceptor (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
@@ -139,14 +139,14 @@ public:
   /// initialized.
   virtual void add_ior_interceptor (
       PortableInterceptor::IORInterceptor_ptr interceptor
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ORBInitInfo::DuplicateName));
 
   /// Reserve a slot in table found within the
   /// PortableInterceptor::Current object.
   virtual PortableInterceptor::SlotId allocate_slot_id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Register a policy factory of the given policy type with the ORB
@@ -154,7 +154,7 @@ public:
   virtual void register_policy_factory (
       CORBA::PolicyType type,
       PortableInterceptor::PolicyFactory_ptr policy_factory
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
@@ -178,7 +178,7 @@ public:
    */
   size_t allocate_tss_slot_id (
       ACE_CLEANUP_FUNC cleanup
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return a pointer to the ORB Core associated with the ORB being
@@ -206,12 +206,12 @@ public:
 
   static TAO_ORBInitInfo_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static TAO_ORBInitInfo_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   static TAO_ORBInitInfo_ptr _nil (void)
@@ -233,7 +233,7 @@ protected:
   /// Check if this ORBInitInfo instance is valid.  Once post_init()
   /// has been called on each of the ORBInitializers, this ORBInitInfo
   /// is no longer valid.  Throw an exception in that case.
-  void check_validity (TAO_ENV_SINGLE_ARG_DECL);
+  void check_validity (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
 
@@ -293,7 +293,7 @@ public:
   static TAO_ORBInitInfo_ptr nil (void);
   static TAO_ORBInitInfo_ptr narrow (
       CORBA::Object *
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     );
   static CORBA::Object * upcast (void *);
 
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index 8ffb366b552..bcaa3b1bfc2 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -17,7 +17,7 @@ ACE_RCSID(tao, ORBInitializer_Registry, "$Id$")
 void
 PortableInterceptor::register_orb_initializer (
   PortableInterceptor::ORBInitializer_ptr init
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   // Using ACE_Static_Object_Lock::instance() precludes
   // <register_orb_initializer> from being called within a static
@@ -33,7 +33,7 @@ PortableInterceptor::register_orb_initializer (
                   ACE_TEXT ("Unable to pre-initialize TAO\n")));
     }
 
-  CORBA_ORB::init_orb_globals (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA_ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Make sure the following is done after the global ORB
@@ -41,7 +41,7 @@ PortableInterceptor::register_orb_initializer (
 
   TAO_ORBInitializer_Registry::instance ()->register_orb_initializer (
     init
-     TAO_ENV_ARG_PARAMETER);
+     ACE_ENV_ARG_PARAMETER);
 }
 
 // ------------------------------------------------------------------
@@ -61,7 +61,7 @@ TAO_ORBInitializer_Registry::~TAO_ORBInitializer_Registry (void)
 void
 TAO_ORBInitializer_Registry::register_orb_initializer (
   PortableInterceptor::ORBInitializer_ptr init
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   if (!CORBA::is_nil (init))
     {
@@ -89,13 +89,13 @@ TAO_ORBInitializer_Registry::register_orb_initializer (
 void
 TAO_ORBInitializer_Registry::pre_init (
   PortableInterceptor::ORBInitInfo_ptr info
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   size_t initializer_count = this->initializers_.size ();
   for (size_t i = 0; i < initializer_count; ++i)
     {
       this->initializers_[i]->pre_init (info
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -103,13 +103,13 @@ TAO_ORBInitializer_Registry::pre_init (
 void
 TAO_ORBInitializer_Registry::post_init (
   PortableInterceptor::ORBInitInfo_ptr info
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   size_t initializer_count = this->initializers_.size ();
   for (size_t i = 0; i < initializer_count; ++i)
     {
       this->initializers_[i]->post_init (info
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h
index fe424016056..8badb87e55e 100644
--- a/TAO/tao/ORBInitializer_Registry.h
+++ b/TAO/tao/ORBInitializer_Registry.h
@@ -36,7 +36,7 @@ class TAO_Export TAO_ORBInitializer_Registry
   friend class TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>;
   friend void PortableInterceptor::register_orb_initializer (
                   PortableInterceptor::ORBInitializer_ptr init
-                                  TAO_ENV_ARG_DECL_NOT_USED);
+                                  ACE_ENV_ARG_DECL_NOT_USED);
   friend CORBA::ORB_ptr CORBA::ORB_init (int &,
                                          char *argv[],
                                          const char *,
@@ -55,17 +55,17 @@ protected:
   ///< array.
   void register_orb_initializer (
     PortableInterceptor::ORBInitializer_ptr init
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
 
   /// Begin initialization of all registered ORBInitializers before
   /// the ORB itself is initialized.
   void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
 
   /// Complete initialization of all registered ORBInitializers after
   /// the ORB has been initialized.
   void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                  TAO_ENV_ARG_DECL);
+                  ACE_ENV_ARG_DECL);
 
   /// Return a unique singleton instance.
   static TAO_ORBInitializer_Registry *instance (void);
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index d4e9cb04490..5370f0b2929 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -255,7 +255,7 @@ TAO_ORB_Core::default_buffering_constraint (void) const
 
 
 int
-TAO_ORB_Core::init (int &argc, char *argv[] TAO_ENV_ARG_DECL)
+TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 {
   // Right now, this code expects to begin parsing in argv[1] rather
   // than argv[0].  I don't think that's wise.  I think we need to
@@ -391,7 +391,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] TAO_ENV_ARG_DECL)
           // All preconnect or endpoint strings should be of the above form(s).
 
           set_endpoint_helper (current_arg
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           arg_shifter.consume_arg ();
         }
       else if ((current_arg = arg_shifter.get_the_parameter
@@ -781,7 +781,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] TAO_ENV_ARG_DECL)
           // used.
 
           set_endpoint_helper (current_arg
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           arg_shifter.consume_arg ();
         }
       else if ((current_arg = arg_shifter.get_the_parameter
@@ -1018,10 +1018,10 @@ TAO_ORB_Core::init (int &argc, char *argv[] TAO_ENV_ARG_DECL)
 
   // Set ORB-level policy defaults.
   TAO_Protocols_Hooks *tph =
-    this->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  int status = tph->set_default_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int status = tph->set_default_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (status != 0)
@@ -1050,7 +1050,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] TAO_ENV_ARG_DECL)
 
   // Look for BiDirectional library here. If the user has svc.conf
   // file, load the library at this point.
-  int ret = this->bidirectional_giop_init (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int ret = this->bidirectional_giop_init (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (ret == -1)
@@ -1074,7 +1074,7 @@ TAO_ORB_Core::fini (void)
     {
       // Shutdown the ORB and block until the shutdown is complete.
       this->shutdown (1
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1301,7 +1301,7 @@ TAO_ORB_Core::set_protocols_hooks (const char *protocols_hooks)
 }
 
 TAO_Protocols_Hooks *
-TAO_ORB_Core::get_protocols_hooks (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::get_protocols_hooks (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Check if there is a cached reference.
   if (this->protocols_hooks_ != 0)
@@ -1314,13 +1314,13 @@ TAO_ORB_Core::get_protocols_hooks (TAO_ENV_SINGLE_ARG_DECL)
 
   // Initialize the protocols hooks instance.
   this->protocols_hooks_->init_hooks (this
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 
   return this->protocols_hooks_;
 }
 
 int
-TAO_ORB_Core::bidirectional_giop_init (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::bidirectional_giop_init (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->bidir_adapter_ == 0)
     {
@@ -1332,7 +1332,7 @@ TAO_ORB_Core::bidirectional_giop_init (TAO_ENV_SINGLE_ARG_DECL)
     return this->bidir_adapter_->activate (this->orb_.in (),
                                            0,
                                            0
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   else
     return 0;
 }
@@ -1351,14 +1351,14 @@ TAO_ORB_Core::services_callbacks_init (void)
 int
 TAO_ORB_Core::service_raise_comm_failure (TAO_GIOP_Invocation *invoke,
                                           TAO_Profile *profile
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   if (this->ft_service_.service_callback ())
     {
       return this->ft_service_.service_callback ()->
                  raise_comm_failure (invoke,
                                      profile
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
     }
 
   invoke->close_connection ();
@@ -1374,14 +1374,14 @@ TAO_ORB_Core::service_raise_comm_failure (TAO_GIOP_Invocation *invoke,
 int
 TAO_ORB_Core::service_raise_transient_failure (TAO_GIOP_Invocation *invoke,
                                                TAO_Profile *profile
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
 {
   if (this->ft_service_.service_callback ())
     {
       return this->ft_service_.service_callback ()->
                  raise_transient_failure (invoke,
                                           profile
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
     }
 
   ACE_THROW_RETURN (CORBA::TRANSIENT (
@@ -1398,7 +1398,7 @@ TAO_ORB_Core::service_context_list (
     TAO_Stub *stub,
     TAO_Service_Context &service_context,
     CORBA::Boolean restart
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   // @@ We look at the services if they are loaded. But if more
   // services offer this feature we may want to keep expanding the
@@ -1409,14 +1409,14 @@ TAO_ORB_Core::service_context_list (
       this->ft_service_.service_callback ()->service_context_list (stub,
                                                                    service_context.service_info (),
                                                                    restart
-                                                                   TAO_ENV_ARG_PARAMETER);
+                                                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->protocols_hooks_->rt_service_context (stub,
                                               service_context,
                                               restart
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -1466,7 +1466,7 @@ TAO_ORB_Core::inherit_from_parent_thread (
 }
 
 CORBA::Object_ptr
-TAO_ORB_Core::root_poa (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::root_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->root_poa_.in ()))
     return CORBA::Object::_duplicate (this->root_poa_.in ());
@@ -1489,12 +1489,12 @@ TAO_ORB_Core::root_poa (TAO_ENV_SINGLE_ARG_DECL)
 
   // @@ Not exception safe
   TAO_Adapter *poa_adapter = factory->create (this);
-  poa_adapter->open (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_adapter->open (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   this->root_poa_ = poa_adapter->root ();
 
-  this->adapter_registry_.insert (poa_adapter TAO_ENV_ARG_PARAMETER);
+  this->adapter_registry_.insert (poa_adapter ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return CORBA::Object::_duplicate (this->root_poa_.in ());
@@ -1518,13 +1518,13 @@ TAO_ORB_Core::poa_adapter (void)
 TAO_Stub *
 TAO_ORB_Core::create_stub (const char *repository_id,
                            const TAO_MProfile &profiles
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   TAO_Stub *retval =
     this->stub_factory ()->create_stub (repository_id,
                                         profiles,
                                         this
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN(0);
   return retval;
 }
@@ -1542,11 +1542,11 @@ TAO_Stub *
 TAO_ORB_Core::create_stub_object (TAO_MProfile &mprofile,
                                   const char *type_id,
                                   CORBA::PolicyList *policy_list
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   /// Initialize a TAO_Stub object with the mprofile thats passed.
   TAO_Stub *stub =
-    this->create_stub (type_id, mprofile TAO_ENV_ARG_PARAMETER);
+    this->create_stub (type_id, mprofile ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (stub);
 
   stub->base_profiles ().policy_list (policy_list);
@@ -1660,7 +1660,7 @@ TAO_ORB_Core::lf_strategy (void)
 int
 TAO_ORB_Core::run (ACE_Time_Value *tv,
                    int perform_work
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   if (TAO_debug_level >= 3)
     ACE_DEBUG ((LM_DEBUG,
@@ -1668,7 +1668,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv,
 
   // This method should only be called by servers, so now we set up
   // for listening!
-  int ret = this->open (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int ret = this->open (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (ret == -1)
@@ -1765,16 +1765,16 @@ TAO_ORB_Core::run (ACE_Time_Value *tv,
 
 void
 TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   if (this->has_shutdown () == 0)
     {
       this->adapter_registry_.check_close (wait_for_completion
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       this->adapter_registry_.close (wait_for_completion
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // Set the shutdown flag
@@ -1794,7 +1794,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
         tm->wait ();
 
       // Invoke Interceptor::destroy() on all registered interceptors.
-      this->destroy_interceptors (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Explicitly destroy the object reference table since it
@@ -1805,7 +1805,7 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
 }
 
 void
-TAO_ORB_Core::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   //
   // All destroy() should do is (a) call shutdown() and (b) unbind()
@@ -1822,7 +1822,7 @@ TAO_ORB_Core::destroy (TAO_ENV_SINGLE_ARG_DECL)
   //
 
   // Shutdown the ORB and block until the shutdown is complete.
-  this->shutdown (1 TAO_ENV_ARG_PARAMETER);
+  this->shutdown (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Now remove it from the ORB table so that it's ORBid may be
@@ -1835,7 +1835,7 @@ TAO_ORB_Core::destroy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_ORB_Core::destroy_interceptors (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL)
 {
   size_t len = 0;
 
@@ -1846,7 +1846,7 @@ TAO_ORB_Core::destroy_interceptors (TAO_ENV_SINGLE_ARG_DECL)
   len = client_interceptors.size ();
   for (size_t i = 0; i < len; ++i)
     {
-      client_interceptors[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      client_interceptors[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -1856,7 +1856,7 @@ TAO_ORB_Core::destroy_interceptors (TAO_ENV_SINGLE_ARG_DECL)
   len = server_interceptors.size ();
   for (size_t j = 0; j < len; ++j)
     {
-      server_interceptors[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server_interceptors[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -1867,14 +1867,14 @@ TAO_ORB_Core::destroy_interceptors (TAO_ENV_SINGLE_ARG_DECL)
   len = ior_interceptors.size ();
   for (size_t k = 0; k < len; ++k)
     {
-      ior_interceptors[k]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ior_interceptors[k]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 // Set up listening endpoints.
 int
-TAO_ORB_Core::open (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::open (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Double check pattern
   if (this->open_called_ == 1)
@@ -1888,7 +1888,7 @@ TAO_ORB_Core::open (TAO_ENV_SINGLE_ARG_DECL)
   /// Open the Acceptor Registry.
   int ret=
     this->lane_resources ().open_acceptor_registry (0
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (ret == -1)
@@ -1906,7 +1906,7 @@ TAO_ORB_Core::lane_resources (void)
 }
 
 void
-TAO_ORB_Core::resolve_typecodefactory_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance ("TypeCodeFactory_Loader");
@@ -1920,11 +1920,11 @@ TAO_ORB_Core::resolve_typecodefactory_i (TAO_ENV_SINGLE_ARG_DECL)
         ACE_THROW (CORBA::ORB::InvalidName ());
     }
   this->typecode_factory_ =
-    loader->create_object (this->orb_.in (), 0, 0 TAO_ENV_ARG_PARAMETER);
+    loader->create_object (this->orb_.in (), 0, 0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_ORB_Core::resolve_dynanyfactory_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance ("DynamicAny_Loader");
@@ -1938,11 +1938,11 @@ TAO_ORB_Core::resolve_dynanyfactory_i (TAO_ENV_SINGLE_ARG_DECL)
         ACE_THROW (CORBA::ORB::InvalidName ());
     }
   this->dynany_factory_ =
-    loader->create_object (this->orb_.in (), 0, 0 TAO_ENV_ARG_PARAMETER);
+    loader->create_object (this->orb_.in (), 0, 0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_ORB_Core::resolve_iormanipulation_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Object_Loader *loader =
     ACE_Dynamic_Service<TAO_Object_Loader>::instance ("IORManip_Loader");
@@ -1957,11 +1957,11 @@ TAO_ORB_Core::resolve_iormanipulation_i (TAO_ENV_SINGLE_ARG_DECL)
         ACE_THROW (CORBA::ORB::InvalidName ());
     }
   this->ior_manip_factory_ =
-    loader->create_object (this->orb_.in (), 0, 0 TAO_ENV_ARG_PARAMETER);
+    loader->create_object (this->orb_.in (), 0, 0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_ORB_Core::resolve_ior_table_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Adapter_Factory *factory =
     ACE_Dynamic_Service<TAO_Adapter_Factory>::instance ("TAO_IORTable");
@@ -1977,10 +1977,10 @@ TAO_ORB_Core::resolve_ior_table_i (TAO_ENV_SINGLE_ARG_DECL)
 
   // @@ Not exception safe
   TAO_Adapter *iortable_adapter = factory->create (this);
-  this->adapter_registry_.insert (iortable_adapter TAO_ENV_ARG_PARAMETER);
+  this->adapter_registry_.insert (iortable_adapter ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  iortable_adapter->open (TAO_ENV_SINGLE_ARG_PARAMETER);
+  iortable_adapter->open (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   this->ior_table_ = iortable_adapter->root ();
@@ -1988,7 +1988,7 @@ TAO_ORB_Core::resolve_ior_table_i (TAO_ENV_SINGLE_ARG_DECL)
 
 int
 TAO_ORB_Core::set_endpoint_helper (const char *current_arg
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   ACE_CString endpts (current_arg);
 
@@ -2011,7 +2011,7 @@ TAO_ORB_Core::set_endpoint_helper (const char *current_arg
 
 CORBA::Object_ptr
 TAO_ORB_Core::resolve_rir (const char *name
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   // Get the table of initial references specified through
   // -ORBInitRef.
@@ -2061,14 +2061,14 @@ TAO_ORB_Core::resolve_rir (const char *name
       list_of_profiles += object_id;
 
       return this->orb ()->string_to_object (list_of_profiles.c_str ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
     }
 
   return CORBA::Object::_nil ();
 }
 
 CORBA::ORB::ObjectIdList_ptr
-TAO_ORB_Core::list_initial_references (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::list_initial_references (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Unsupported initial services should NOT be included in the below list!
   const char *initial_services[] = { TAO_LIST_OF_INITIAL_SERVICES };
@@ -2495,7 +2495,7 @@ TAO_ORB_Core::implrepo_service (void)
 
       ACE_TRY_NEW_ENV
         {
-          CORBA::Object_var temp = this->orb_->resolve_initial_references ("ImplRepoService" TAO_ENV_ARG_PARAMETER);
+          CORBA::Object_var temp = this->orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::Object::_nil ());
@@ -2774,10 +2774,10 @@ TAO_ORB_Core_instance (void)
           CORBA::ORB_var orb;
 
           int argc = 0;
-          TAO_ENV_DECLARE_NEW_ENV;
+          ACE_DECLARE_NEW_CORBA_ENV;
           ACE_TRY
             {
-              orb = CORBA::ORB_init (argc, 0, 0 TAO_ENV_ARG_PARAMETER);
+              orb = CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY
@@ -2794,7 +2794,7 @@ TAO_ORB_Core_instance (void)
 
 int
 TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
 
   TAO_Stub *stub = object->_stubobj ();
@@ -2806,7 +2806,7 @@ TAO_ORB_Core::collocation_strategy (CORBA::Object_ptr object
 
       int collocated =
         orb_core->collocation_resolver ().is_collocated (object
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (collocated)
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 1021afbeb50..e346e997e99 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -250,7 +250,7 @@ public:
   ACE_Thread_Manager *thr_mgr (void);
 
   /// Return the RootPOA, or try to load it if not initialized already.
-  CORBA::Object_ptr root_poa (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr root_poa (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Get the adapter registry
   TAO_Adapter_Registry *adapter_registry (void);
@@ -278,7 +278,7 @@ public:
    * No-Collocation is a special case of collocation.
    */
   static int collocation_strategy (CORBA::Object_ptr object
-                                   TAO_ENV_ARG_DECL);
+                                   ACE_ENV_ARG_DECL);
   //@}
 
   /**
@@ -408,7 +408,7 @@ public:
                     const char *poa_factory_directive);
 
   /// Gets the value of TAO_ORB_Core::protocols_hooks__
-  TAO_Protocols_Hooks * get_protocols_hooks (TAO_ENV_SINGLE_ARG_DECL);
+  TAO_Protocols_Hooks * get_protocols_hooks (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Sets the value of TAO_ORB_Core::dynamic_adapter_name_.
   static void dynamic_adapter_name (const char *name);
@@ -630,20 +630,20 @@ public:
   /// Run the event loop.
   int run (ACE_Time_Value *tv,
            int perform_work
-           TAO_ENV_ARG_DECL);
+           ACE_ENV_ARG_DECL);
 
   /// End the event loop
   void shutdown (CORBA::Boolean wait_for_completion
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
 
   /// Get the shutdown flag value
   int has_shutdown (void);
 
   /// Shutdown the ORB and free resources
-  void destroy (TAO_ENV_SINGLE_ARG_DECL);
+  void destroy (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Check if ORB has shutdown.  If it has, throw an exception.
-  void check_shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void check_shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Returns the <timeout> value used by the server threads to poll
   /// the shutdown flag. If the return value is zero then the server
@@ -655,7 +655,7 @@ public:
   TAO_Stub *create_stub_object (TAO_MProfile &mprofile,
                                 const char *type_id,
                                 CORBA::PolicyList *policy_list
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
   /// Factory method that create the "right" Stub depending on
   /// wheather RTCORBA is loaded or not. The factory used to create
@@ -663,7 +663,7 @@ public:
   /// on the fact that RTCORBA is being used or not.
   TAO_Stub *create_stub (const char *repository_id,
                          const TAO_MProfile &profiles
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
 
   /// Create a new object, use the adapter registry to create a
   /// collocated object, if not possible then create a regular
@@ -680,37 +680,37 @@ public:
   //@}
 
   /// Resolve the TypeCodeFactory DLL.
-  CORBA::Object_ptr resolve_typecodefactory (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr resolve_typecodefactory (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Resolve the Dynamic Any Factory
-  CORBA::Object_ptr resolve_dynanyfactory (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Resolve the IOR Manipulation reference for this ORB.
-  CORBA::Object_ptr resolve_ior_manipulation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  CORBA::Object_ptr resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// Resolve the IOR Table reference for this ORB.
-  CORBA::Object_ptr resolve_ior_table (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  CORBA::Object_ptr resolve_ior_table (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// Resolve an initial reference via the -ORBInitRef and
   // -ORBDefaultInitRef options.
   CORBA::Object_ptr resolve_rir (const char *name
-                                 TAO_ENV_ARG_DECL_NOT_USED);
+                                 ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Resolve the RT ORB reference for this ORB.
-  CORBA::Object_ptr resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr resolve_rt_orb (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Resolve the RT Current flyweight for this ORB.
   /// Return server_id string.
   const char *server_id (void) const;
 
-  CORBA::Object_ptr resolve_rt_current (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Object_ptr resolve_rt_current (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Set/Get the current PortableGroup POA hooks.
   TAO_POA_PortableGroup_Hooks *portable_group_poa_hooks (void) const;
   void portable_group_poa_hooks(TAO_POA_PortableGroup_Hooks *poa_hooks);
 
   /// List all the service known by the ORB
-  CORBA_ORB_ObjectIdList_ptr list_initial_references (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  CORBA_ORB_ObjectIdList_ptr list_initial_references (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// Reference counting...
   CORBA::ULong _incr_refcnt (void);
@@ -769,7 +769,7 @@ public:
   void service_context_list (TAO_Stub *stub,
                              TAO_Service_Context &service_context,
                              CORBA::Boolean retstart
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /// Return a reference to the Fault Tolerant service object.
   TAO_Fault_Tolerance_Service &fault_tolerance_service (void);
@@ -779,14 +779,14 @@ public:
   /// this case.
   int service_raise_comm_failure (TAO_GIOP_Invocation *invoke,
                                   TAO_Profile *profile
-                                  TAO_ENV_ARG_DECL);
+                                  ACE_ENV_ARG_DECL);
 
   /// Raise a transient failure exception if a service is not loaded,
   /// else delegate to the service to see what the service has to do
   /// for this case.
   int service_raise_transient_failure (TAO_GIOP_Invocation *invoke,
                                        TAO_Profile *profile
-                                       TAO_ENV_ARG_DECL);
+                                       ACE_ENV_ARG_DECL);
 
   /// Hook for logging of messages by the Logging & Recovery service
   /// of an FT service.
@@ -821,12 +821,12 @@ public:
   /// Register a client request interceptor.
   void add_interceptor (
     PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
 
   /// Register a server request interceptor.
   void add_interceptor (
     PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
 
   /// Return the array of client-side interceptors specific to this
   /// ORB.
@@ -843,7 +843,7 @@ public:
   /// Register an IOR interceptor.
   void add_interceptor (
     PortableInterceptor::IORInterceptor_ptr interceptor
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
 
   /// Return the array of IOR interceptors specific to this ORB.
   TAO_IORInterceptor_List::TYPE & ior_interceptors (void);
@@ -852,7 +852,7 @@ public:
   /// Set up the ORB Core's acceptor to listen on the
   /// previously-specified port for requests.  Returns -1 on failure,
   /// otherwise 0.
-  int open (TAO_ENV_SINGLE_ARG_DECL);
+  int open (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Return the underlying transport cache
   TAO_Transport_Cache_Manager *transport_cache (void);
@@ -902,7 +902,7 @@ protected:
 
   /// Initialize the guts of the ORB Core.  It is intended that this be
   /// called by <CORBA::ORB_init>.
-  int init (int &argc, char **argv TAO_ENV_ARG_DECL);
+  int init (int &argc, char **argv ACE_ENV_ARG_DECL);
 
   /// Final termination hook, typically called by CORBA::ORB's
   /// destructor.
@@ -923,17 +923,17 @@ protected:
                                        ACE_Lock *lock);
 
   /// Obtain and cache the dynamic any factory object reference.
-  void resolve_typecodefactory_i (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Obtain and cache the dynamic any factory object reference.
-  void resolve_dynanyfactory_i (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Obtain and cache the IORManipulation factory object reference.
-  void resolve_iormanipulation_i (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Search the Dynamic service list for BiDirectional options that
   /// can be dynamically loaded.
-  int bidirectional_giop_init (TAO_ENV_SINGLE_ARG_DECL);
+  int bidirectional_giop_init (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Search the Dynamic service list for well known services that has
   /// callbacks  which can be dynamically loaded.
@@ -941,13 +941,13 @@ protected:
 
   /// Helper method that invokes Interceptor::destroy() on all
   /// registered interceptors when ORB::destroy() is called.
-  void destroy_interceptors (TAO_ENV_SINGLE_ARG_DECL);
+  void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Pointer to the list of protocol loaded into this ORB instance.
   /// Helper method to hold the common code part for -ORBEndpoint and
   /// -ORBListenEndpoint options.
   int set_endpoint_helper (const char *current_arg
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
 
 private:
 
@@ -958,7 +958,7 @@ private:
   //@}
 
   /// Obtain and cache the dynamic any factory object reference.
-  void resolve_ior_table_i (TAO_ENV_SINGLE_ARG_DECL);
+  void resolve_ior_table_i (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Try to create a new collocated object, using <other_orb> as the
   /// target ORB.  If not possible return 0.
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 3bc0cb09cd5..0dde8aad846 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -357,7 +357,7 @@ TAO_ORB_Core::has_shutdown (void)
 }
 
 ACE_INLINE void
-TAO_ORB_Core::check_shutdown (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::check_shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->has_shutdown ())
     {
@@ -391,13 +391,13 @@ TAO_ORB_Core::implrepo_service (const CORBA::Object_ptr ir)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_typecodefactory (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_typecodefactory (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->typecode_factory_))
     {
-      this->resolve_typecodefactory_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->resolve_typecodefactory_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return CORBA::Object::_duplicate (this->typecode_factory_);
@@ -422,39 +422,39 @@ TAO_ORB_Core::portable_group_poa_hooks(TAO_POA_PortableGroup_Hooks *poa_hooks)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_dynanyfactory (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->dynany_factory_))
     {
-      this->resolve_dynanyfactory_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->resolve_dynanyfactory_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return CORBA::Object::_duplicate (this->dynany_factory_);
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_ior_manipulation (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_ior_manipulation (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->ior_manip_factory_))
     {
-      this->resolve_iormanipulation_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->resolve_iormanipulation_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return CORBA::Object::_duplicate (this->ior_manip_factory_);
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_ior_table (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_ior_table (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_,
                     CORBA::Object::_nil ());
   if (CORBA::is_nil (this->ior_table_))
     {
-      this->resolve_ior_table_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->resolve_ior_table_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
   return CORBA::Object::_duplicate (this->ior_table_);
@@ -505,7 +505,7 @@ TAO_ORB_Core::poa_current (void)
         {
           // @@ This is a hack.  FIXME!
           // This forces the POACurrent to be initialized.
-          CORBA::Object_var root = this->root_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::Object_var root = this->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -549,7 +549,7 @@ TAO_ORB_Core::default_environment (CORBA_Environment *env)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_rt_orb (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->rt_orb_.in ()))
     {
@@ -561,7 +561,7 @@ TAO_ORB_Core::resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL)
           this->rt_orb_ =
               this->object_ref_table ().resolve_initial_references (
               TAO_OBJID_RTORB
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::Object::_nil ());
         }
     }
@@ -570,7 +570,7 @@ TAO_ORB_Core::resolve_rt_orb (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 ACE_INLINE CORBA::Object_ptr
-TAO_ORB_Core::resolve_rt_current (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Core::resolve_rt_current (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (CORBA::is_nil (this->rt_current_.in ()))
     {
@@ -582,7 +582,7 @@ TAO_ORB_Core::resolve_rt_current (TAO_ENV_SINGLE_ARG_DECL)
           this->rt_current_ =
               this->object_ref_table ().resolve_initial_references (
               TAO_OBJID_RTCURRENT
-               TAO_ENV_ARG_PARAMETER);
+               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::Object::_nil ());
         }
     }
@@ -611,19 +611,19 @@ TAO_ORB_Core::pi_current (TAO_PICurrent *current)
 ACE_INLINE void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::ClientRequestInterceptor_ptr interceptor
-   TAO_ENV_ARG_DECL)
+   ACE_ENV_ARG_DECL)
 {
   this->client_request_interceptors_.add_interceptor (interceptor
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-   TAO_ENV_ARG_DECL)
+   ACE_ENV_ARG_DECL)
 {
   this->server_request_interceptors_.add_interceptor (interceptor
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
 }
 
 // ------
@@ -650,10 +650,10 @@ TAO_ORB_Core::server_request_interceptors (void)
 ACE_INLINE void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::IORInterceptor_ptr interceptor
-   TAO_ENV_ARG_DECL)
+   ACE_ENV_ARG_DECL)
 {
   this->ior_interceptors_.add_interceptor (interceptor
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_IORInterceptor_List::TYPE &
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 0c0db0bd8da..611f44e72d6 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -85,7 +85,7 @@ CORBA_Object::_servant (void) const
 
 CORBA::Boolean
 CORBA_Object::_is_a (const char *type_id
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   // NOTE: if istub->type_id is nonzero and we have local knowledge of
   // it, we can answer this question without a costly remote call.
@@ -115,11 +115,11 @@ CORBA_Object::_is_a (const char *type_id
 
   // Get the right Proxy Implementation.
   TAO_Object_Proxy_Impl &the_proxy =
-    this->proxy_broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->proxy_broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Preform the Call.
-  _tao_retval = the_proxy._is_a (this, type_id TAO_ENV_ARG_PARAMETER);
+  _tao_retval = the_proxy._is_a (this, type_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return _tao_retval;
@@ -148,10 +148,10 @@ CORBA_Object::_is_local (void) const
 
 CORBA::ULong
 CORBA_Object::_hash (CORBA::ULong maximum
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   if (this->protocol_proxy_ != 0)
-    return this->protocol_proxy_->hash (maximum TAO_ENV_ARG_PARAMETER);
+    return this->protocol_proxy_->hash (maximum ACE_ENV_ARG_PARAMETER);
   else
     // @@ I really don't know how to support this for
     //    a locality constrained object.  -- nw.
@@ -166,7 +166,7 @@ CORBA_Object::_hash (CORBA::ULong maximum
 
 CORBA::Boolean
 CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC (())
 {
   if (other_obj == this)
@@ -183,7 +183,7 @@ CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj
 // TAO's extensions
 
 TAO_ObjectKey *
-CORBA::Object::_key (TAO_ENV_SINGLE_ARG_DECL)
+CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->_stubobj () && this->_stubobj ()->profile_in_use ())
     return this->_stubobj ()->profile_in_use ()->_key ();
@@ -255,7 +255,7 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx,
                                CORBA::NamedValue_ptr result,
                                CORBA::Request_ptr &request,
                                CORBA::Flags req_flags
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   // Since we don't really support Context, anything but a null pointer
   // is a no-no.
@@ -280,7 +280,7 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx,
                        0,
                        request,
                        req_flags
-                        TAO_ENV_ARG_PARAMETER
+                        ACE_ENV_ARG_PARAMETER
                      );
 }
 
@@ -293,7 +293,7 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx,
                                CORBA::ContextList_ptr,
                                CORBA::Request_ptr &request,
                                CORBA::Flags req_flags
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   // Since we don't really support Context, anything but a null pointer
   // is a no-no.
@@ -318,13 +318,13 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx,
                        exceptions,
                        request,
                        req_flags
-                        TAO_ENV_ARG_PARAMETER
+                        ACE_ENV_ARG_PARAMETER
                      );
 }
 
 CORBA::Request_ptr
 CORBA_Object::_request (const char *operation
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   if (this->protocol_proxy_)
     {
@@ -337,7 +337,7 @@ CORBA_Object::_request (const char *operation
                                   this,
                                   this->protocol_proxy_->orb_core ()->orb (),
                                   operation
-                                   TAO_ENV_ARG_PARAMETER
+                                   ACE_ENV_ARG_PARAMETER
                                 );
     }
   else
@@ -352,17 +352,17 @@ CORBA_Object::_request (const char *operation
 // the latter case, return FALSE.
 
 CORBA::Boolean
-CORBA_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_Object::_non_existent (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Boolean _tao_retval = 0;
 
   // Get the right Proxy.
   TAO_Object_Proxy_Impl &the_proxy =
-    this->proxy_broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->proxy_broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Perform the Call.
-  _tao_retval = the_proxy._non_existent (this TAO_ENV_ARG_PARAMETER);
+  _tao_retval = the_proxy._non_existent (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return _tao_retval;
@@ -370,19 +370,19 @@ CORBA_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL)
 
 
 CORBA_InterfaceDef_ptr
-CORBA_Object::_get_interface (TAO_ENV_SINGLE_ARG_DECL)
+CORBA_Object::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get the right Proxy.
   TAO_Object_Proxy_Impl &the_proxy =
-    this->proxy_broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->proxy_broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Perform the Call.
-  return the_proxy._get_interface (this TAO_ENV_ARG_PARAMETER);
+  return the_proxy._get_interface (this ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::ImplementationDef_ptr
-CORBA_Object::_get_implementation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA_Object::_get_implementation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return 0;
 }
@@ -400,10 +400,10 @@ CORBA_Object::_get_implementation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 CORBA::Policy_ptr
 CORBA_Object::_get_policy (
     CORBA::PolicyType type
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   if (this->protocol_proxy_)
-    return this->protocol_proxy_->get_policy (type TAO_ENV_ARG_PARAMETER);
+    return this->protocol_proxy_->get_policy (type ACE_ENV_ARG_PARAMETER);
   else
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
 }
@@ -411,10 +411,10 @@ CORBA_Object::_get_policy (
 CORBA::Policy_ptr
 CORBA_Object::_get_client_policy (
     CORBA::PolicyType type
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   if (this->protocol_proxy_)
-    return this->_stubobj ()->get_client_policy (type TAO_ENV_ARG_PARAMETER);
+    return this->_stubobj ()->get_client_policy (type ACE_ENV_ARG_PARAMETER);
   else
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
 }
@@ -423,7 +423,7 @@ CORBA::Object_ptr
 CORBA_Object::_set_policy_overrides (
     const CORBA::PolicyList & policies,
     CORBA::SetOverrideType set_add
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   if (!this->protocol_proxy_)
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::Policy::_nil ());
@@ -431,7 +431,7 @@ CORBA_Object::_set_policy_overrides (
   TAO_Stub* stub =
     this->protocol_proxy_->set_policy_overrides (policies,
                                                  set_add
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -455,34 +455,34 @@ CORBA_Object::_set_policy_overrides (
 
 CORBA::PolicyList *
 CORBA_Object::_get_policy_overrides (const CORBA::PolicyTypeSeq & types
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   if (this->protocol_proxy_)
-    return this->protocol_proxy_->get_policy_overrides (types TAO_ENV_ARG_PARAMETER);
+    return this->protocol_proxy_->get_policy_overrides (types ACE_ENV_ARG_PARAMETER);
   else
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
 CORBA_Object::_validate_connection (CORBA::PolicyList_out inconsistent_policies
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   inconsistent_policies = 0;
 
 #if (TAO_HAS_MINIMUM_CORBA == 1)
 
-  TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
+  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 
 #else
 
   // If the object is collocated then use non_existent to see whether
   // it's there.
   if (this->is_collocated_)
-      return !(this->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER));
+      return !(this->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER));
 
   if (this->protocol_proxy_)
     return this->protocol_proxy_->validate_connection (inconsistent_policies
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
@@ -592,12 +592,12 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
 
   TAO_Stub *objdata = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       objdata = orb_core->create_stub (type_hint.in (),
                                        mp
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index c1c99e1d7b1..e17ee867a90 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -52,9 +52,9 @@ public:
   /// No-op it is just here to simplify some templates.
   ACE_INLINE_FOR_GNUC
   static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   static CORBA_Object_ptr _unchecked_narrow (CORBA_Object_ptr obj
-                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Used in the implementation of CORBA::Any
   static void _tao_any_destructor (void*);
@@ -70,7 +70,7 @@ public:
 
   /// determine if we are of the type specified by the "logical_type_id"
   virtual CORBA::Boolean _is_a (const char *logical_type_id
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// The repository ID for the most derived class, this is an
   /// implementation method and does no remote invocations!
@@ -86,17 +86,17 @@ public:
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-  virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// This method is deprecated in the CORBA 2.2 spec, we just return 0
   /// every time.
   virtual CORBA::ImplementationDef_ptr _get_implementation (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   /// Get info about the object from the Interface Repository.
   virtual CORBA_InterfaceDef_ptr _get_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   // DII operations to create a request.
@@ -111,7 +111,7 @@ public:
                                 CORBA::NamedValue_ptr result,
                                 CORBA::Request_ptr &request,
                                 CORBA::Flags req_flags
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual void _create_request (CORBA::Context_ptr ctx,
                                 const char *operation,
@@ -121,7 +121,7 @@ public:
                                 CORBA::ContextList_ptr ctxtlist,
                                 CORBA::Request_ptr &request,
                                 CORBA::Flags req_flags
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // The default implementation of this method uses the same simple,
   // multi-protocol remote invocation interface as is assumed by the
@@ -129,7 +129,7 @@ public:
 
   /// DII operation to create a request.
   virtual CORBA::Request_ptr _request (const char *operation
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
@@ -137,24 +137,24 @@ public:
 
   CORBA::Policy_ptr _get_policy (
       CORBA::PolicyType type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::Policy_ptr _get_client_policy (
       CORBA::PolicyType type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::Object_ptr _set_policy_overrides (
       const CORBA::PolicyList & policies,
       CORBA::SetOverrideType set_add
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::PolicyList * _get_policy_overrides (
       const CORBA::PolicyTypeSeq & types
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::Boolean _validate_connection (
       CORBA::PolicyList_out inconsistent_policies
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
@@ -167,7 +167,7 @@ public:
    * implementation.
    */
   virtual CORBA::ULong _hash (CORBA::ULong maximum
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Try to determine if this object is the same as <other_obj>.  This
@@ -176,12 +176,12 @@ public:
    * protocols are in use) there is no default implementation.
    */
   virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC (());
 
   /// Return the object key as an out parameter.  Caller should release
   /// return value when finished with it.
-  virtual TAO_ObjectKey *_key (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL);
 
   /**
    * Return a reference to the object key of profile in-use.
@@ -296,7 +296,7 @@ public:
   static CORBA::Object_ptr tao_duplicate (CORBA::Object_ptr);
   static void tao_release (CORBA::Object_ptr);
   static CORBA::Object_ptr tao_nil (void);
-  static CORBA::Object_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+  static CORBA::Object_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index 3e5d8b7b77b..16661b8d8c8 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -75,7 +75,7 @@ CORBA_Object::_nil (void)
 }
 
 ACE_INLINE CORBA_Object_ptr
-CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj TAO_ENV_ARG_DECL_NOT_USED)
+CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     return CORBA::Object::_nil ();
@@ -91,9 +91,9 @@ CORBA_Object::_unchecked_narrow (CORBA_Object_ptr obj TAO_ENV_ARG_DECL_NOT_USED)
 }
 
 ACE_INLINE CORBA_Object_ptr
-CORBA_Object::_narrow (CORBA_Object_ptr obj TAO_ENV_ARG_DECL)
+CORBA_Object::_narrow (CORBA_Object_ptr obj ACE_ENV_ARG_DECL)
 {
-  return CORBA_Object::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_Object::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_Stub *
@@ -221,7 +221,7 @@ CORBA_Object_var::tao_nil (void)
 ACE_INLINE CORBA_Object_ptr
 CORBA_Object_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   return CORBA_Object::_duplicate (p);
diff --git a/TAO/tao/ObjectIDList.cpp b/TAO/tao/ObjectIDList.cpp
index c1eb1715d19..83732dce984 100644
--- a/TAO/tao/ObjectIDList.cpp
+++ b/TAO/tao/ObjectIDList.cpp
@@ -152,7 +152,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::ORB::_tc_ObjectIdList TAO_ENV_ARG_PARAMETER)) return 0; // not equal
+    if (!type->equal (CORBA::ORB::_tc_ObjectIdList ACE_ENV_ARG_PARAMETER)) return 0; // not equal
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
diff --git a/TAO/tao/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjectReferenceTemplateC.cpp
index a9bbdd9e4d0..ff7ab25da80 100644
--- a/TAO/tao/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjectReferenceTemplateC.cpp
@@ -981,7 +981,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceTemplateSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ObjectReferenceTemplateSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/ObjectReferenceTemplateC.h b/TAO/tao/ObjectReferenceTemplateC.h
index 9b8c3ad6e60..6400de87624 100644
--- a/TAO/tao/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjectReferenceTemplateC.h
@@ -173,7 +173,7 @@ TAO_NAMESPACE  PortableInterceptor
     static const char* _tao_obv_static_repository_id ();
 
     virtual CORBA::Object_ptr make_object (
-        const char *, const PortableInterceptor::ObjectId & TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const char *, const PortableInterceptor::ObjectId & ACE_ENV_ARG_DECL_WITH_DEFAULTS
 
       ) = 0;
 
@@ -287,13 +287,13 @@ TAO_NAMESPACE  PortableInterceptor
       virtual const char* _tao_obv_repository_id () const;
       static const char* _tao_obv_static_repository_id ();
 
-      virtual char * server_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
 
     ) = 0;
-    virtual char * orb_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
 
   ) = 0;
-  virtual ::PortableInterceptor::AdapterName * adapter_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+  virtual ::PortableInterceptor::AdapterName * adapter_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
 
 ) = 0;
 
diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h
index 5f2625b854f..3b26175c4be 100644
--- a/TAO/tao/Object_Loader.h
+++ b/TAO/tao/Object_Loader.h
@@ -47,7 +47,7 @@ public:
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            char *argv []
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h
index f6e116cffbd..27c0420a9d9 100644
--- a/TAO/tao/Object_Proxy_Broker.h
+++ b/TAO/tao/Object_Proxy_Broker.h
@@ -35,7 +35,7 @@ public:
   virtual ~TAO_Object_Proxy_Broker (void);
 
   virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object
-                                               TAO_ENV_ARG_DECL) = 0;
+                                               ACE_ENV_ARG_DECL) = 0;
 
 protected:
   TAO_Object_Proxy_Broker (void);
diff --git a/TAO/tao/Object_Proxy_Impl.h b/TAO/tao/Object_Proxy_Impl.h
index 2770d12355d..e68da1f582e 100644
--- a/TAO/tao/Object_Proxy_Impl.h
+++ b/TAO/tao/Object_Proxy_Impl.h
@@ -37,16 +37,16 @@ public:
 
   virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,
                                 const CORBA::Char *logical_type_id
-                                TAO_ENV_ARG_DECL) = 0;
+                                ACE_ENV_ARG_DECL) = 0;
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
   virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target
-                                        TAO_ENV_ARG_DECL) = 0;
+                                        ACE_ENV_ARG_DECL) = 0;
 
   virtual CORBA_InterfaceDef_ptr _get_interface (
       const CORBA::Object_ptr target
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     ) = 0;
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp
index 1eba31d8864..00a130ed689 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -33,7 +33,7 @@ void
 TAO_Object_Ref_Table::register_initial_reference (
   const char *id,
   CORBA::Object_ptr obj
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   if (id == 0)
     ACE_THROW (CORBA::BAD_PARAM (TAO_OMG_VMCID | 27,
@@ -76,7 +76,7 @@ TAO_Object_Ref_Table::register_initial_reference (
 CORBA::Object_ptr
 TAO_Object_Ref_Table::resolve_initial_references (
   const char *id
-  TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
   return this->find (id);  // Returns a duplicate.
 }
diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h
index 4dbcc29560b..475a78b8ba3 100644
--- a/TAO/tao/Object_Ref_Table.h
+++ b/TAO/tao/Object_Ref_Table.h
@@ -62,13 +62,13 @@ public:
   /// ID to it.
   void register_initial_reference (const char * id,
                                    CORBA::Object_ptr obj
-                                   TAO_ENV_ARG_DECL);
+                                   ACE_ENV_ARG_DECL);
 
   /// Return the object reference associated with the given ID.
   /// A duplicate is returned.
   CORBA::Object_ptr resolve_initial_references (
     const char * id
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
 
   /// Explicitly destroy the contents of the object reference table.
   void destroy (void);
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index cc2c749821f..1e4ff14dd8b 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -145,7 +145,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OctetSeq *&_
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CORBA::_tc_OctetSeq TAO_ENV_ARG_PARAMETER);
+      type->equivalent (CORBA::_tc_OctetSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/PICurrent.cpp b/TAO/tao/PICurrent.cpp
index a431ce73a75..4c2e6056e73 100644
--- a/TAO/tao/PICurrent.cpp
+++ b/TAO/tao/PICurrent.cpp
@@ -32,11 +32,11 @@ TAO_PICurrent::~TAO_PICurrent (void)
 
 CORBA::Any *
 TAO_PICurrent::get_slot (PortableInterceptor::SlotId id
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
-  this->check_validity (id TAO_ENV_ARG_PARAMETER);
+  this->check_validity (id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_PICurrent_Impl *impl = this->tsc ();
@@ -48,17 +48,17 @@ TAO_PICurrent::get_slot (PortableInterceptor::SlotId id
                         0);
     }
 
-  return impl->get_slot (id TAO_ENV_ARG_PARAMETER);
+  return impl->get_slot (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_PICurrent::set_slot (PortableInterceptor::SlotId id,
                          const CORBA::Any & data
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
-  this->check_validity (id TAO_ENV_ARG_PARAMETER);
+  this->check_validity (id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_PICurrent_Impl *impl = this->tsc ();
@@ -69,7 +69,7 @@ TAO_PICurrent::set_slot (PortableInterceptor::SlotId id,
                                        CORBA::COMPLETED_NO));
     }
 
-  impl->set_slot (id, data TAO_ENV_ARG_PARAMETER);
+  impl->set_slot (id, data ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -109,7 +109,7 @@ TAO_PICurrent_Impl::~TAO_PICurrent_Impl (void)
 
 CORBA::Any *
 TAO_PICurrent_Impl::get_slot (PortableInterceptor::SlotId id
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -155,7 +155,7 @@ TAO_PICurrent_Impl::get_slot (PortableInterceptor::SlotId id
 void
 TAO_PICurrent_Impl::set_slot (PortableInterceptor::SlotId id,
                               const CORBA::Any & data
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -241,13 +241,13 @@ TAO_PICurrent_Impl::copy (TAO_PICurrent_Impl &rhs, CORBA::Boolean deep_copy)
 
       this->slot_table_.size (new_size);
 
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
           for (size_t i = 0; i < new_size; ++i)
             {
               this->slot_table_[i] =
-                rhs.get_slot (i TAO_ENV_ARG_PARAMETER);  // Deep copy
+                rhs.get_slot (i ACE_ENV_ARG_PARAMETER);  // Deep copy
               ACE_TRY_CHECK;
             }
         }
diff --git a/TAO/tao/PICurrent.h b/TAO/tao/PICurrent.h
index 0965b8cd2b9..df2e38aa217 100644
--- a/TAO/tao/PICurrent.h
+++ b/TAO/tao/PICurrent.h
@@ -70,14 +70,14 @@ public:
   /// Retrieve information stored in the slot table at the given
   /// SlotId.
   virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
   /// Set information in the slot table at the given SlotId.
   virtual void set_slot (PortableInterceptor::SlotId id,
                          const CORBA::Any & data
-                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
   //@}
@@ -98,7 +98,7 @@ public:
 
   /// Verify the validity of the given SlotId.
   void check_validity (const PortableInterceptor::SlotId &id
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
 
 protected:
 
@@ -165,14 +165,14 @@ public:
   /// Retrieve information stored in the slot table at the given
   /// SlotId.
   CORBA::Any * get_slot (PortableInterceptor::SlotId id
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
   /// Set information in the slot table at the given SlotId.
   void set_slot (PortableInterceptor::SlotId id,
                  const CORBA::Any & data
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
diff --git a/TAO/tao/PICurrent.inl b/TAO/tao/PICurrent.inl
index 2c03f3722b0..7e25c8d110e 100644
--- a/TAO/tao/PICurrent.inl
+++ b/TAO/tao/PICurrent.inl
@@ -10,7 +10,7 @@ TAO_PICurrent::slot_count (void) const
 
 ACE_INLINE void
 TAO_PICurrent::check_validity (const PortableInterceptor::SlotId &id
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   // No need to acquire a lock for this check.  At this point, these
   // attributes are read only.
diff --git a/TAO/tao/PICurrent_ORBInitializer.cpp b/TAO/tao/PICurrent_ORBInitializer.cpp
index 51cd34636d2..af5285453ba 100644
--- a/TAO/tao/PICurrent_ORBInitializer.cpp
+++ b/TAO/tao/PICurrent_ORBInitializer.cpp
@@ -17,11 +17,11 @@ ACE_RCSID (TAO,
 void
 TAO_PICurrent_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info TAO_ENV_ARG_PARAMETER);
+    TAO_ORBInitInfo::_narrow (info ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_ORB_Core *orb_core = tao_info->orb_core ();
@@ -42,7 +42,7 @@ TAO_PICurrent_ORBInitializer::pre_init (
   // instance between all ORBs.
   info->register_initial_reference ("PICurrent",
                                     current.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Cache the downcasted pointer in the ORB Core.
@@ -52,7 +52,7 @@ TAO_PICurrent_ORBInitializer::pre_init (
 void
 TAO_PICurrent_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tao/PICurrent_ORBInitializer.h b/TAO/tao/PICurrent_ORBInitializer.h
index e64715c7840..3d93a3d2eb6 100644
--- a/TAO/tao/PICurrent_ORBInitializer.h
+++ b/TAO/tao/PICurrent_ORBInitializer.h
@@ -61,11 +61,11 @@ public:
    */
   //@{
   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/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp
index 4eacefda599..66f0d3b99f2 100644
--- a/TAO/tao/Pluggable.cpp
+++ b/TAO/tao/Pluggable.cpp
@@ -38,7 +38,7 @@ TAO_Connector::~TAO_Connector (void)
 int
 TAO_Connector::make_mprofile (const char *string,
                               TAO_MProfile &mprofile
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   // This method utilizes the "Template Method" design pattern to
   // parse the given URL style IOR for the protocol being used
@@ -170,14 +170,14 @@ TAO_Connector::make_mprofile (const char *string,
           // or
           //    `endpoint/object_key'
 
-          TAO_Profile *profile = this->make_profile (TAO_ENV_SINGLE_ARG_PARAMETER);
+          TAO_Profile *profile = this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           // Failure:  Problem during profile creation
 
           // Initialize a Profile using the individual endpoint
           // string.
           // @@ Not exception safe!  We need a TAO_Profile_var!
-          profile->parse_string (endpoint.c_str () TAO_ENV_ARG_PARAMETER);
+          profile->parse_string (endpoint.c_str () ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           // Give up ownership of the profile.
diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h
index d57c7ac83b4..b4e66e6f86a 100644
--- a/TAO/tao/Pluggable.h
+++ b/TAO/tao/Pluggable.h
@@ -161,7 +161,7 @@ public:
   /// MProfile.
   int make_mprofile (const char *ior,
                      TAO_MProfile &mprofile
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
   ///  Initialize object and register with reactor.
   virtual int open (TAO_ORB_Core *orb_core) = 0;
@@ -176,7 +176,7 @@ public:
    */
   virtual int connect (TAO_GIOP_Invocation *invocation,
                        TAO_Transport_Descriptor_Interface *desc
-                       TAO_ENV_ARG_DECL) = 0;
+                       ACE_ENV_ARG_DECL) = 0;
 
   /// Initial set of connections to be established.
   virtual int preconnect (const char *preconnections) = 0;
@@ -195,7 +195,7 @@ public:
 protected:
 
   /// Create a profile with a given endpoint.
-  virtual TAO_Profile *make_profile (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
   /// Set the ORB Core pointer
   void orb_core (TAO_ORB_Core *orb_core);
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index bb044d3e0e1..adff3529778 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -119,7 +119,7 @@ void CORBA::PolicyError::_raise ()
 
 void CORBA::PolicyError::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -132,7 +132,7 @@ void CORBA::PolicyError::_tao_encode (
 
 void CORBA::PolicyError::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -315,7 +315,7 @@ void CORBA_InvalidPolicies::_raise ()
 
 void CORBA_InvalidPolicies::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -328,7 +328,7 @@ void CORBA_InvalidPolicies::_tao_encode (
 
 void CORBA_InvalidPolicies::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -388,10 +388,10 @@ tao_CORBA_Policy_nil (
 CORBA::Policy_ptr
 tao_CORBA_Policy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA::Policy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA::Policy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -515,10 +515,10 @@ CORBA_Policy_var::tao_nil (void)
 ::CORBA::Policy_ptr
 CORBA_Policy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA::Policy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA::Policy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -596,21 +596,21 @@ public:
   TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -626,30 +626,30 @@ private:
 TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::TAO_ClientRequestInfo_CORBA_Policy_policy_type_get (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -657,13 +657,13 @@ TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::exceptions (TAO_ENV_SINGLE_A
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -685,21 +685,21 @@ public:
   TAO_ClientRequestInfo_CORBA_Policy_copy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -715,30 +715,30 @@ private:
 TAO_ClientRequestInfo_CORBA_Policy_copy::TAO_ClientRequestInfo_CORBA_Policy_copy (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Policy_copy::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Policy_copy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Policy_copy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Policy_copy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -746,13 +746,13 @@ TAO_ClientRequestInfo_CORBA_Policy_copy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Policy_copy::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -774,21 +774,21 @@ public:
   TAO_ClientRequestInfo_CORBA_Policy_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -802,30 +802,30 @@ private:
 TAO_ClientRequestInfo_CORBA_Policy_destroy::TAO_ClientRequestInfo_CORBA_Policy_destroy (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Policy_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Policy_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_CORBA_Policy_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Policy_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -833,13 +833,13 @@ TAO_ClientRequestInfo_CORBA_Policy_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_CORBA_Policy_destroy::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -861,7 +861,7 @@ CORBA_TAO_Policy_Remote_Proxy_Impl::CORBA_TAO_Policy_Remote_Proxy_Impl (void)
 
 CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
     CORBA::Object_ptr _collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -903,7 +903,7 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
       TAO_ClientRequestInfo_CORBA_Policy_policy_type_get ri (
         &_tao_call,
         _collocated_tao_target_
-         TAO_ENV_ARG_PARAMETER
+         ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -919,7 +919,7 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
         {
           _tao_vfr.send_request (
             &ri
-             TAO_ENV_ARG_PARAMETER
+             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -931,17 +931,17 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-               TAO_ENV_ARG_PARAMETER
+               ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -958,7 +958,7 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                   TAO_ENV_ARG_PARAMETER
+                   ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -985,7 +985,7 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-             TAO_ENV_ARG_PARAMETER
+             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -995,12 +995,12 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-           TAO_ENV_ARG_PARAMETER
+           ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1011,7 +1011,7 @@ CORBA::PolicyType CORBA_TAO_Policy_Remote_Proxy_Impl::policy_type (
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1027,7 +1027,7 @@ return _tao_retval;
 
 CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
     CORBA::Object_ptr _collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1070,7 +1070,7 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
       TAO_ClientRequestInfo_CORBA_Policy_copy ri (
         &_tao_call,
         _collocated_tao_target_
-         TAO_ENV_ARG_PARAMETER
+         ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -1086,7 +1086,7 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
         {
           _tao_vfr.send_request (
             &ri
-             TAO_ENV_ARG_PARAMETER
+             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1098,17 +1098,17 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-               TAO_ENV_ARG_PARAMETER
+               ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1125,7 +1125,7 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                   TAO_ENV_ARG_PARAMETER
+                   ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1153,7 +1153,7 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-             TAO_ENV_ARG_PARAMETER
+             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1163,12 +1163,12 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-           TAO_ENV_ARG_PARAMETER
+           ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1179,7 +1179,7 @@ CORBA::Policy_ptr CORBA_TAO_Policy_Remote_Proxy_Impl::copy (
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1195,7 +1195,7 @@ return _tao_safe_retval._retn ();
 
 void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
     CORBA::Object_ptr _collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1237,7 +1237,7 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
       TAO_ClientRequestInfo_CORBA_Policy_destroy ri (
         &_tao_call,
         _collocated_tao_target_
-         TAO_ENV_ARG_PARAMETER
+         ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -1253,7 +1253,7 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
         {
           _tao_vfr.send_request (
             &ri
-             TAO_ENV_ARG_PARAMETER
+             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1265,17 +1265,17 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-               TAO_ENV_ARG_PARAMETER
+               ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -1291,7 +1291,7 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                   TAO_ENV_ARG_PARAMETER
+                   ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -1305,7 +1305,7 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-             TAO_ENV_ARG_PARAMETER
+             ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -1315,12 +1315,12 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-           TAO_ENV_ARG_PARAMETER
+           ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1331,7 +1331,7 @@ void CORBA_TAO_Policy_Remote_Proxy_Impl::destroy (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -1386,7 +1386,7 @@ CORBA_TAO_Policy_Remote_Proxy_Broker::~CORBA_TAO_Policy_Remote_Proxy_Broker (voi
 CORBA_TAO_Policy_Proxy_Impl&
 CORBA_TAO_Policy_Remote_Proxy_Broker::select_proxy (
   ::CORBA::Policy *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -1427,24 +1427,24 @@ void CORBA_Policy::_tao_any_destructor (void *x)
 
 CORBA::Policy_ptr CORBA_Policy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return CORBA_Policy::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0" TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_Policy::_nil ());
       if (is_a == 0)
         return CORBA_Policy::_nil ();
     }
-  return CORBA_Policy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_Policy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Policy_ptr CORBA_Policy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1501,14 +1501,14 @@ CORBA_Policy::_duplicate (CORBA_Policy_ptr obj)
   return obj;
 }
 
-CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *CORBA::Policy::_tao_QueryInterface (ptr_arith_t type)
@@ -1558,53 +1558,53 @@ CORBA_Policy::_tao_scope (void) const
 }
 
 CORBA::PolicyType CORBA_Policy::policy_type (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   CORBA_TAO_Policy_Proxy_Impl &proxy =
-    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.policy_type (
       this
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 
 CORBA::Policy_ptr CORBA_Policy::copy (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   CORBA_TAO_Policy_Proxy_Impl &proxy =
-    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.copy (
       this
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 
 void CORBA::Policy::destroy (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   CORBA_TAO_Policy_Proxy_Impl &proxy =
-    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_CORBA_TAO_Policy_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.destroy (
       this
-       TAO_ENV_ARG_PARAMETER
+       ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -1681,11 +1681,11 @@ void CORBA::Policy::destroy (
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_downcast (
       void* target,
       CORBA_Object *src
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
     CORBA::Policy **tmp = ACE_static_cast (CORBA::Policy**, target);
-    *tmp = CORBA::Policy::_narrow (src TAO_ENV_ARG_PARAMETER);
+    *tmp = CORBA::Policy::_narrow (src ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -1870,10 +1870,10 @@ tao_CORBA_PolicyManager_nil (
 CORBA_PolicyManager_ptr
 tao_CORBA_PolicyManager_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_PolicyManager::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_PolicyManager::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1997,10 +1997,10 @@ CORBA_PolicyManager_var::tao_nil (void)
 ::CORBA_PolicyManager_ptr
 CORBA_PolicyManager_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_PolicyManager::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_PolicyManager::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2082,15 +2082,15 @@ CORBA_PolicyManager::~CORBA_PolicyManager (void)
 
 CORBA_PolicyManager_ptr CORBA_PolicyManager::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA::PolicyManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA::PolicyManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_PolicyManager_ptr CORBA_PolicyManager::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2167,10 +2167,10 @@ tao_CORBA_PolicyCurrent_nil (
 CORBA_PolicyCurrent_ptr
 tao_CORBA_PolicyCurrent_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_PolicyCurrent::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_PolicyCurrent::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2294,10 +2294,10 @@ CORBA_PolicyCurrent_var::tao_nil (void)
 ::CORBA_PolicyCurrent_ptr
 CORBA_PolicyCurrent_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_PolicyCurrent::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_PolicyCurrent::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2379,15 +2379,15 @@ CORBA_PolicyCurrent::~CORBA_PolicyCurrent (void)
 
 CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_PolicyCurrent::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_PolicyCurrent::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2501,7 +2501,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyError
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyError TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyError ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2591,7 +2591,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InvalidPolic
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_InvalidPolicies TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_InvalidPolicies ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2664,7 +2664,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Policy_ptr &_tao_
     _tao_elem = CORBA::Policy::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_Policy TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_Policy ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2747,7 +2747,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyList
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyList TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyList ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2838,7 +2838,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyTypeS
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyTypeSeq TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_PolicyTypeSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -2901,7 +2901,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType &
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_SetOverrideType TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_SetOverrideType ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -3004,7 +3004,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       CORBA::Policy::_unchecked_narrow (
           obj.in ()
-           TAO_ENV_ARG_PARAMETER
+           ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 3b762cf53c6..0480c095dca 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -86,12 +86,12 @@ public:
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
 
     static CORBA_PolicyError *_downcast (CORBA::Exception *);
@@ -219,12 +219,12 @@ public:
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
 
     static CORBA_InvalidPolicies *_downcast (CORBA::Exception *);
@@ -270,7 +270,7 @@ public:
     static CORBA_Policy_ptr tao_duplicate (CORBA_Policy_ptr);
     static void tao_release (CORBA_Policy_ptr);
     static CORBA_Policy_ptr tao_nil (void);
-    static CORBA_Policy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static CORBA_Policy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -333,11 +333,11 @@ class TAO_Export CORBA_Policy
     static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj);
     static CORBA_Policy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static CORBA_Policy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static CORBA_Policy_ptr _nil (void)
       {
@@ -347,21 +347,21 @@ class TAO_Export CORBA_Policy
     static void _tao_any_destructor (void*);
 
     virtual CORBA::PolicyType policy_type (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual CORBA::Policy_ptr copy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -369,7 +369,7 @@ class TAO_Export CORBA_Policy
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -428,7 +428,7 @@ class TAO_Export CORBA_Policy
 
         virtual CORBA::PolicyType policy_type (
         CORBA::Object_ptr _collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -436,7 +436,7 @@ class TAO_Export CORBA_Policy
 
     virtual CORBA::Policy_ptr copy (
         CORBA::Object_ptr _collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -444,7 +444,7 @@ class TAO_Export CORBA_Policy
 
     virtual void destroy (
         CORBA::Object_ptr _collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -474,7 +474,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (
       CORBA::Object_ptr _collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -482,7 +482,7 @@ public:
 
 virtual CORBA::Policy_ptr copy (
       CORBA::Object_ptr _collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -490,7 +490,7 @@ virtual CORBA::Policy_ptr copy (
 
 virtual void destroy (
       CORBA::Object_ptr _collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -520,7 +520,7 @@ public:
   virtual ~CORBA_TAO_Policy_Proxy_Broker (void);
   virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy (
     CORBA_Policy *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) = 0;
 
 protected:
@@ -546,7 +546,7 @@ public:
 
   virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy (
     CORBA_Policy *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -599,7 +599,7 @@ public:
     virtual void _downcast (
         void* target,
         CORBA_Object *src
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     virtual CORBA_Object* _upcast (void *src) const;
 
@@ -894,7 +894,7 @@ public:
   static CORBA_PolicyManager_ptr tao_duplicate (CORBA_PolicyManager_ptr);
   static void tao_release (CORBA_PolicyManager_ptr);
   static CORBA_PolicyManager_ptr tao_nil (void);
-  static CORBA_PolicyManager_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+  static CORBA_PolicyManager_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
@@ -949,11 +949,11 @@ public:
   static CORBA_PolicyManager_ptr _duplicate (CORBA_PolicyManager_ptr obj);
   static CORBA_PolicyManager_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CORBA_PolicyManager_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CORBA_PolicyManager_ptr _nil (void)
     {
@@ -962,7 +962,7 @@ public:
 
   virtual CORBA::PolicyList * get_policy_overrides (
       const CORBA::PolicyTypeSeq & ts
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -971,7 +971,7 @@ public:
   virtual void set_policy_overrides (
       const CORBA::PolicyList & policies,
       CORBA::SetOverrideType set_add
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1024,7 +1024,7 @@ public:
   static CORBA_PolicyCurrent_ptr tao_duplicate (CORBA_PolicyCurrent_ptr);
   static void tao_release (CORBA_PolicyCurrent_ptr);
   static CORBA_PolicyCurrent_ptr tao_nil (void);
-  static CORBA_PolicyCurrent_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+  static CORBA_PolicyCurrent_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
@@ -1079,11 +1079,11 @@ public:
   static CORBA_PolicyCurrent_ptr _duplicate (CORBA_PolicyCurrent_ptr obj);
   static CORBA_PolicyCurrent_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CORBA_PolicyCurrent_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CORBA_PolicyCurrent_ptr _nil (void)
     {
diff --git a/TAO/tao/PolicyFactory_Registry.cpp b/TAO/tao/PolicyFactory_Registry.cpp
index 063df75db86..bb117836e1b 100644
--- a/TAO/tao/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PolicyFactory_Registry.cpp
@@ -27,7 +27,7 @@ void
 TAO_PolicyFactory_Registry::register_policy_factory (
   CORBA::PolicyType type,
   PortableInterceptor::PolicyFactory_ptr policy_factory
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (policy_factory))
     ACE_THROW (CORBA::BAD_PARAM (
@@ -59,7 +59,7 @@ TAO_PolicyFactory_Registry::register_policy_factory (
 CORBA::Policy_ptr
 TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type,
                                            const CORBA::Any &value
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
@@ -78,7 +78,7 @@ TAO_PolicyFactory_Registry::create_policy (CORBA::PolicyType type,
 
   return policy_factory->create_policy (type,
                                         value
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
 }
 
 
diff --git a/TAO/tao/PolicyFactory_Registry.h b/TAO/tao/PolicyFactory_Registry.h
index 04f3b15e32c..808a541a2ce 100644
--- a/TAO/tao/PolicyFactory_Registry.h
+++ b/TAO/tao/PolicyFactory_Registry.h
@@ -66,13 +66,13 @@ public:
   void register_policy_factory (
     CORBA::PolicyType type,
     PortableInterceptor::PolicyFactory_ptr policy_factory
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
 
   /// Construct a policy of the given type with the information
   /// contained in the CORBA::Any <value>.
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                    const CORBA::Any &value
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index 39f8d95f6d8..534346a2322 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -38,17 +38,17 @@ void
 TAO_Policy_Current_Impl::set_policy_overrides (
         const CORBA::PolicyList & policies,
         CORBA::SetOverrideType set_add
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
 {
-  this->manager_impl_.set_policy_overrides (policies, set_add TAO_ENV_ARG_PARAMETER);
+  this->manager_impl_.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::PolicyList *
 TAO_Policy_Current_Impl::get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
 {
-  return this->manager_impl_.get_policy_overrides (ts TAO_ENV_ARG_PARAMETER);
+  return this->manager_impl_.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
index 029d27c9c9b..11d047109fe 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -49,20 +49,20 @@ public:
 
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   // = The CORBA::PolicyManager operations
 
   virtual CORBA::PolicyList * get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_policy_overrides (const CORBA::PolicyList & policies,
                                      CORBA::SetOverrideType set_add
-                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS
                                      )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA_InvalidPolicies));
@@ -88,18 +88,18 @@ public:
 
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   // = The CORBA::PolicyManager operations
 
   CORBA::PolicyList * get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   void set_policy_overrides (const CORBA::PolicyList & policies,
                              CORBA::SetOverrideType set_add
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Obtain a single cached policy.
   CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
@@ -122,21 +122,21 @@ public:
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (
       CORBA::PolicyType policy
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   // = The CORBA::PolicyManager operations
 
   virtual CORBA::PolicyList * get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_policy_overrides (
         const CORBA::PolicyList & policies,
         CORBA::SetOverrideType set_add
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA_InvalidPolicies));
diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i
index 478156475fc..4ea2f520105 100644
--- a/TAO/tao/Policy_Manager.i
+++ b/TAO/tao/Policy_Manager.i
@@ -9,36 +9,36 @@ TAO_Policy_Manager::TAO_Policy_Manager (void)
 ACE_INLINE CORBA::Policy_ptr
 TAO_Policy_Manager::get_policy (
       CORBA::PolicyType policy
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
-  return this->impl_.get_policy (policy TAO_ENV_ARG_PARAMETER);
+  return this->impl_.get_policy (policy ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::PolicyList *
 TAO_Policy_Manager::get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
                        CORBA::SystemException
                        ))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
-  return this->impl_.get_policy_overrides (ts TAO_ENV_ARG_PARAMETER);
+  return this->impl_.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_Policy_Manager::set_policy_overrides (
         const CORBA::PolicyList & policies,
         CORBA::SetOverrideType set_add
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
                        CORBA::SystemException,
                        CORBA_InvalidPolicies
                        ))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-  this->impl_.set_policy_overrides (policies, set_add TAO_ENV_ARG_PARAMETER);
+  this->impl_.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Policy_ptr
@@ -73,9 +73,9 @@ TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void)
 ACE_INLINE CORBA::Policy_ptr
 TAO_Policy_Current_Impl::get_policy (
       CORBA::PolicyType policy
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
-  return this->manager_impl_.get_policy (policy TAO_ENV_ARG_PARAMETER);
+  return this->manager_impl_.get_policy (policy ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Policy_ptr
@@ -89,35 +89,35 @@ TAO_Policy_Current_Impl::get_cached_policy (TAO_Cached_Policy_Type type)
 ACE_INLINE CORBA::Policy_ptr
 TAO_Policy_Current::get_policy (
       CORBA::PolicyType policy
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  return impl.get_policy (policy TAO_ENV_ARG_PARAMETER);
+  return impl.get_policy (policy ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::PolicyList *
 TAO_Policy_Current::get_policy_overrides (
         const CORBA::PolicyTypeSeq & ts
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  return impl.get_policy_overrides (ts TAO_ENV_ARG_PARAMETER);
+  return impl.get_policy_overrides (ts ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies,
                                           CORBA::SetOverrideType set_add
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA_InvalidPolicies))
 {
   TAO_Policy_Current_Impl &impl = this->implementation ();
 
-  impl.set_policy_overrides (policies, set_add TAO_ENV_ARG_PARAMETER);
+  impl.set_policy_overrides (policies, set_add ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Policy_ptr
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index e0e1b2cc115..1fd96e0665a 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -11,10 +11,10 @@ ACE_RCSID(tao, Policy_Set, "$Id$")
 
 TAO_Policy_Set::~TAO_Policy_Set (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->cleanup_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -45,7 +45,7 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs)
           if (CORBA::is_nil (policy))
             continue;
 
-          CORBA::Policy_var copy = policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::Policy_var copy = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           // Add the "cacheable" policies into the cache.
@@ -70,12 +70,12 @@ TAO_Policy_Set::TAO_Policy_Set (const TAO_Policy_Set &rhs)
 
 void
 TAO_Policy_Set::copy_from (TAO_Policy_Set *source
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   if (source == 0)
     return;
 
-  this->cleanup_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   for (CORBA::ULong i = 0;
@@ -89,7 +89,7 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source
       if (! this->compatible_scope (policy->_tao_scope()))
         ACE_THROW (CORBA::NO_PERMISSION ());
 
-      CORBA::Policy_var copy = policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Policy_var copy = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::ULong length = this->policy_list_.length ();
@@ -104,7 +104,7 @@ TAO_Policy_Set::copy_from (TAO_Policy_Set *source
 }
 
 void
-TAO_Policy_Set::cleanup_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Policy_Set::cleanup_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULong i;
 
@@ -113,7 +113,7 @@ TAO_Policy_Set::cleanup_i (TAO_ENV_SINGLE_ARG_DECL)
        i < this->policy_list_.length ();
        ++i)
     {
-      this->policy_list_[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->policy_list_[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       this->policy_list_[i] = CORBA::Policy::_nil ();
     }
@@ -129,7 +129,7 @@ void
 TAO_Policy_Set::set_policy_overrides (
     const CORBA::PolicyList &policies,
     CORBA::SetOverrideType set_add
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   // @@ The spec does not say what to do on this case.
   if (set_add != CORBA::SET_OVERRIDE
@@ -138,7 +138,7 @@ TAO_Policy_Set::set_policy_overrides (
 
   if (set_add == CORBA::SET_OVERRIDE)
     {
-      this->cleanup_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->cleanup_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -157,7 +157,7 @@ TAO_Policy_Set::set_policy_overrides (
       if (CORBA::is_nil (policy.in ()))
         continue;
 
-      CORBA::PolicyType policy_type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::PolicyType policy_type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (policy_type == TAO_RT_SERVER_PROTOCOL_POLICY_TYPE)
@@ -173,22 +173,22 @@ TAO_Policy_Set::set_policy_overrides (
           server_protocol_set = 1;
         }
 
-      this->set_policy (policy.in () TAO_ENV_ARG_PARAMETER);
+      this->set_policy (policy.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   if (! this->compatible_scope (policy->_tao_scope()))
     ACE_THROW (CORBA::NO_PERMISSION ());
 
-  CORBA::PolicyType policy_type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::PolicyType policy_type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Policy_var copy = policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Policy_var copy = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 
@@ -197,12 +197,12 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy
   while (j != length)
     {
       CORBA::ULong current =
-        this->policy_list_[j]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->policy_list_[j]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (current == policy_type)
         {
-          this->policy_list_[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->policy_list_[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
           this->policy_list_[j] = copy.ptr ();
           break;
@@ -228,7 +228,7 @@ TAO_Policy_Set::set_policy (const CORBA::Policy_ptr policy
 CORBA::PolicyList *
 TAO_Policy_Set::get_policy_overrides (
     const CORBA::PolicyTypeSeq &types
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   CORBA::ULong types_length = types.length ();
 
@@ -267,7 +267,7 @@ TAO_Policy_Set::get_policy_overrides (
            ++i)
         {
           CORBA::ULong current =
-            this->policy_list_[i]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->policy_list_[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (current != slot)
@@ -284,7 +284,7 @@ TAO_Policy_Set::get_policy_overrides (
 
 CORBA::Policy_ptr
 TAO_Policy_Set::get_policy (CORBA::PolicyType type
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   CORBA::ULong length = this->policy_list_.length ();
   for (CORBA::ULong i = 0;
@@ -292,7 +292,7 @@ TAO_Policy_Set::get_policy (CORBA::PolicyType type
        ++i)
     {
       CORBA::ULong current =
-        this->policy_list_[i]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->policy_list_[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (current != type)
diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h
index 72be1d9c21a..94a52934342 100644
--- a/TAO/tao/Policy_Set.h
+++ b/TAO/tao/Policy_Set.h
@@ -52,7 +52,7 @@ public:
   /// Copy the state from <source>, it uses the copy() operator to
   /// obtain independent copies of all the policies.
   void copy_from (TAO_Policy_Set* source
-                  TAO_ENV_ARG_DECL);
+                  ACE_ENV_ARG_DECL);
 
   /**
    * Modify the list of policies to include <policies>.
@@ -63,18 +63,18 @@ public:
    */
   void set_policy_overrides (const CORBA::PolicyList & policies,
                              CORBA::SetOverrideType set_add
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   /// Get the values (if any) for the policies in <types>, if <types>
   /// is an empty list the method returns *all* the current policies.
   CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types
-                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   /// Obtain a single policy.
   CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   /// Obtain a cached policy for speedy lookups.
@@ -91,7 +91,7 @@ public:
 
   /// Utility method to set a single policy.
   void set_policy (const CORBA::Policy_ptr policy
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 
   /// Returns the policy at the specified index.
   /// CORBA::Policy::_nil () is returned if the policy doesn't exist
@@ -104,7 +104,7 @@ private:
 
   /// Remove and destroy all the policy objects owned by this policy
   /// manager.
-  void cleanup_i (TAO_ENV_SINGLE_ARG_DECL);
+  void cleanup_i (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Utility method to determine if a policy's scope is compatible with ours.
   CORBA::Boolean compatible_scope (TAO_Policy_Scope policy_scope) const;
diff --git a/TAO/tao/Policy_Validator.cpp b/TAO/tao/Policy_Validator.cpp
index 5b0c68b6457..87d6e087573 100644
--- a/TAO/tao/Policy_Validator.cpp
+++ b/TAO/tao/Policy_Validator.cpp
@@ -32,28 +32,28 @@ TAO_Policy_Validator::add_validator (TAO_Policy_Validator *validator)
 
 void
 TAO_Policy_Validator::validate (TAO_Policy_Set &policies
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
-  this->validate_impl (policies TAO_ENV_ARG_PARAMETER);
+  this->validate_impl (policies ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->next_ != 0)
     {
-      this->next_->validate (policies TAO_ENV_ARG_PARAMETER);
+      this->next_->validate (policies ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
-  this->merge_policies_impl (policies TAO_ENV_ARG_PARAMETER);
+  this->merge_policies_impl (policies ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->next_ != 0)
     {
-      this->next_->merge_policies (policies TAO_ENV_ARG_PARAMETER);
+      this->next_->merge_policies (policies ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h
index 9582e4fb9d7..fa7eaa78c5b 100644
--- a/TAO/tao/Policy_Validator.h
+++ b/TAO/tao/Policy_Validator.h
@@ -54,13 +54,13 @@ public:
    * if that is not the case.
    */
   void validate (TAO_Policy_Set &policies
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
 
   /**
    * Add/merge policies.
    **/
   void merge_policies (TAO_Policy_Set &policies
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
 
   /**
    * Return whether the specified policy type is legal for the
@@ -82,10 +82,10 @@ public:
 
 protected:
   virtual void validate_impl (TAO_Policy_Set &policies
-                              TAO_ENV_ARG_DECL) = 0;
+                              ACE_ENV_ARG_DECL) = 0;
 
   virtual void merge_policies_impl (TAO_Policy_Set &policies
-                                    TAO_ENV_ARG_DECL) = 0;
+                                    ACE_ENV_ARG_DECL) = 0;
 
   virtual CORBA::Boolean legal_policy_impl (CORBA::PolicyType type) = 0;
 
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index 4368660f227..6c02589fc72 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -144,10 +144,10 @@ CORBA_Pollable_var::tao_nil (void)
 ::CORBA_Pollable_ptr
 CORBA_Pollable_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_Pollable::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_Pollable::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -228,15 +228,15 @@ CORBA_Pollable::~CORBA_Pollable (void)
 
 CORBA_Pollable_ptr CORBA_Pollable::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_Pollable::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_Pollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_Pollable_ptr CORBA_Pollable::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -396,10 +396,10 @@ CORBA_DIIPollable_var::tao_nil (void)
 ::CORBA_DIIPollable_ptr
 CORBA_DIIPollable_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_DIIPollable::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -480,15 +480,15 @@ CORBA_DIIPollable::~CORBA_DIIPollable (void)
 
 CORBA_DIIPollable_ptr CORBA_DIIPollable::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_DIIPollable::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_DIIPollable::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_DIIPollable_ptr CORBA_DIIPollable::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -660,10 +660,10 @@ CORBA_PollableSet_var::tao_nil (void)
 ::CORBA_PollableSet_ptr
 CORBA_PollableSet_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_PollableSet::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -744,15 +744,15 @@ CORBA_PollableSet::~CORBA_PollableSet (void)
 
 CORBA_PollableSet_ptr CORBA_PollableSet::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_PollableSet::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_PollableSet::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_PollableSet_ptr CORBA_PollableSet::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -847,7 +847,7 @@ void CORBA_PollableSet::NoPossiblePollable::_raise ()
 
 void CORBA_PollableSet::NoPossiblePollable::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -855,7 +855,7 @@ void CORBA_PollableSet::NoPossiblePollable::_tao_encode (
 
 void CORBA_PollableSet::NoPossiblePollable::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -915,7 +915,7 @@ void CORBA_PollableSet::UnknownPollable::_raise ()
 
 void CORBA_PollableSet::UnknownPollable::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL) const
+    ACE_ENV_ARG_DECL) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
@@ -923,7 +923,7 @@ void CORBA_PollableSet::UnknownPollable::_tao_encode (
 
 void CORBA_PollableSet::UnknownPollable::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index eb498987691..13dbbeefbae 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -98,7 +98,7 @@ public:
   static CORBA_PollableSet_ptr tao_duplicate (CORBA_PollableSet_ptr);
   static void tao_release (CORBA_PollableSet_ptr);
   static CORBA_PollableSet_ptr tao_nil (void);
-  static CORBA_PollableSet_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+  static CORBA_PollableSet_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
@@ -174,7 +174,7 @@ public:
   static CORBA_Pollable_ptr tao_duplicate (CORBA_Pollable_ptr);
   static void tao_release (CORBA_Pollable_ptr);
   static CORBA_Pollable_ptr tao_nil (void);
-  static CORBA_Pollable_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+  static CORBA_Pollable_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
@@ -229,11 +229,11 @@ public:
   static CORBA_Pollable_ptr _duplicate (CORBA_Pollable_ptr obj);
   static CORBA_Pollable_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CORBA_Pollable_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CORBA_Pollable_ptr _nil (void)
     {
@@ -242,14 +242,14 @@ public:
 
   virtual CORBA::Boolean is_ready (
       CORBA::ULong timeout
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
   virtual CORBA_PollableSet_ptr create_pollable_set (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -310,7 +310,7 @@ public:
   static CORBA_DIIPollable_ptr tao_duplicate (CORBA_DIIPollable_ptr);
   static void tao_release (CORBA_DIIPollable_ptr);
   static CORBA_DIIPollable_ptr tao_nil (void);
-  static CORBA_DIIPollable_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+  static CORBA_DIIPollable_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
@@ -365,11 +365,11 @@ public:
   static CORBA_DIIPollable_ptr _duplicate (CORBA_DIIPollable_ptr obj);
   static CORBA_DIIPollable_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CORBA_DIIPollable_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CORBA_DIIPollable_ptr _nil (void)
     {
@@ -419,11 +419,11 @@ public:
   static CORBA_PollableSet_ptr _duplicate (CORBA_PollableSet_ptr obj);
   static CORBA_PollableSet_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CORBA_PollableSet_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CORBA_PollableSet_ptr _nil (void)
     {
@@ -453,12 +453,12 @@ public:
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
 
     static NoPossiblePollable *_downcast (CORBA::Exception *);
@@ -494,12 +494,12 @@ public:
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
 
     static UnknownPollable *_downcast (CORBA::Exception *);
@@ -513,7 +513,7 @@ public:
 #endif /* end #if !defined */
 
 virtual CORBA_DIIPollable_ptr create_dii_pollable (
-    TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -521,7 +521,7 @@ virtual CORBA_DIIPollable_ptr create_dii_pollable (
 
 virtual void add_pollable (
     CORBA_Pollable_ptr potential
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -529,7 +529,7 @@ virtual void add_pollable (
 
 virtual CORBA_Pollable_ptr poll (
     CORBA::ULong timeout
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -538,7 +538,7 @@ virtual CORBA_Pollable_ptr poll (
 
 virtual void remove (
     CORBA_Pollable_ptr potential
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -546,7 +546,7 @@ virtual void remove (
   )) = 0;
 
 virtual CORBA::UShort number_left (
-    TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i
index 152cda10df6..486f6c26e98 100644
--- a/TAO/tao/PollableC.i
+++ b/TAO/tao/PollableC.i
@@ -50,10 +50,10 @@ tao_CORBA_Pollable_nil (
 ACE_INLINE CORBA_Pollable_ptr
 tao_CORBA_Pollable_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_Pollable::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_Pollable::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -100,10 +100,10 @@ tao_CORBA_DIIPollable_nil (
 ACE_INLINE CORBA_DIIPollable_ptr
 tao_CORBA_DIIPollable_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_DIIPollable::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_DIIPollable::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -157,10 +157,10 @@ tao_CORBA_PollableSet_nil (
 ACE_INLINE CORBA_PollableSet_ptr
 tao_CORBA_PollableSet_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_PollableSet::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_PollableSet::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index d27be60dab8..afc154eec1a 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -68,10 +68,10 @@ tao_PortableInterceptor_Interceptor_nil (
 PortableInterceptor::Interceptor_ptr
 tao_PortableInterceptor_Interceptor_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::Interceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableInterceptor::Interceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -132,7 +132,7 @@ PortableInterceptor::Interceptor_var::operator const ::PortableInterceptor::Inte
   return this->ptr_;
 }
 
-PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast 
+PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -193,10 +193,10 @@ PortableInterceptor::Interceptor_var::tao_nil (void)
 ::PortableInterceptor::Interceptor_ptr
 PortableInterceptor::Interceptor_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::Interceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableInterceptor::Interceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -273,18 +273,18 @@ PortableInterceptor::Interceptor::Interceptor (void)
   // destructor
   PortableInterceptor::Interceptor::~Interceptor (void)
   {}
-  
+
   PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return Interceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return Interceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
-  
+
   PortableInterceptor::Interceptor_ptr PortableInterceptor::Interceptor::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -322,7 +322,7 @@ void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -389,27 +389,27 @@ void PortableInterceptor::ForwardRequest::_raise ()
 
 void PortableInterceptor::ForwardRequest::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableInterceptor::ForwardRequest::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -435,45 +435,45 @@ static const CORBA::Long _oc_PortableInterceptor_ForwardRequest[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x466f7277), 
-  ACE_NTOHL (0x61726452), 
-  ACE_NTOHL (0x65717565), 
-  ACE_NTOHL (0x73743a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x466f7277),
+  ACE_NTOHL (0x61726452),
+  ACE_NTOHL (0x65717565),
+  ACE_NTOHL (0x73743a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/ForwardRequest:1.0
   15,
-  ACE_NTOHL (0x466f7277), 
-  ACE_NTOHL (0x61726452), 
-  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x466f7277),
+  ACE_NTOHL (0x61726452),
+  ACE_NTOHL (0x65717565),
   ACE_NTOHL (0x73740000),  // name = ForwardRequest
   2, // member count
   8,
-  ACE_NTOHL (0x666f7277), 
+  ACE_NTOHL (0x666f7277),
   ACE_NTOHL (0x61726400),  // name = forward
   CORBA::tk_objref,
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     29,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f62), 
-    ACE_NTOHL (0x6a656374), 
-    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x49444c3a),
+    ACE_NTOHL (0x6f6d672e),
+    ACE_NTOHL (0x6f72672f),
+    ACE_NTOHL (0x434f5242),
+    ACE_NTOHL (0x412f4f62),
+    ACE_NTOHL (0x6a656374),
+    ACE_NTOHL (0x3a312e30),
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
     7,
-    ACE_NTOHL (0x4f626a65), 
+    ACE_NTOHL (0x4f626a65),
     ACE_NTOHL (0x63740000),  // name = Object
 
   10,
-  ACE_NTOHL (0x7065726d), 
-  ACE_NTOHL (0x616e656e), 
+  ACE_NTOHL (0x7065726d),
+  ACE_NTOHL (0x616e656e),
   ACE_NTOHL (0x74000000),  // name = permanent
   CORBA::tk_boolean,
 
@@ -503,19 +503,19 @@ static const CORBA::Long _oc_PortableInterceptor_ReplyStatus[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
-  ACE_NTOHL (0x7475733a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x79537461),
+  ACE_NTOHL (0x7475733a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/ReplyStatus:1.0
   12,
-  ACE_NTOHL (0x5265706c), 
-  ACE_NTOHL (0x79537461), 
+  ACE_NTOHL (0x5265706c),
+  ACE_NTOHL (0x79537461),
   ACE_NTOHL (0x74757300),  // name = ReplyStatus
   CORBA::tk_short,
 
@@ -562,17 +562,17 @@ static const CORBA::Long _oc_PortableInterceptor_SlotId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x536c6f74), 
-  ACE_NTOHL (0x49643a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x536c6f74),
+  ACE_NTOHL (0x49643a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/SlotId:1.0
   7,
-  ACE_NTOHL (0x536c6f74), 
+  ACE_NTOHL (0x536c6f74),
   ACE_NTOHL (0x49640000),  // name = SlotId
   CORBA::tk_ulong,
 
@@ -643,27 +643,27 @@ void PortableInterceptor::InvalidSlot::_raise ()
 
 void PortableInterceptor::InvalidSlot::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableInterceptor::InvalidSlot::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -679,19 +679,19 @@ static const CORBA::Long _oc_PortableInterceptor_InvalidSlot[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696453), 
-  ACE_NTOHL (0x6c6f743a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696453),
+  ACE_NTOHL (0x6c6f743a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/InvalidSlot:1.0
   12,
-  ACE_NTOHL (0x496e7661), 
-  ACE_NTOHL (0x6c696453), 
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696453),
   ACE_NTOHL (0x6c6f7400),  // name = InvalidSlot
   0, // member count
 };
@@ -745,10 +745,10 @@ tao_PortableInterceptor_Current_nil (
 PortableInterceptor::Current_ptr
 tao_PortableInterceptor_Current_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::Current::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableInterceptor::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -809,7 +809,7 @@ PortableInterceptor::Current_var::operator const ::PortableInterceptor::Current_
   return this->ptr_;
 }
 
-PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast 
+PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -870,10 +870,10 @@ PortableInterceptor::Current_var::tao_nil (void)
 ::PortableInterceptor::Current_ptr
 PortableInterceptor::Current_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::Current::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableInterceptor::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -950,18 +950,18 @@ PortableInterceptor::Current::Current (void)
   // destructor
   PortableInterceptor::Current::~Current (void)
   {}
-  
+
   PortableInterceptor::Current_ptr PortableInterceptor::Current::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
-  
+
   PortableInterceptor::Current_ptr PortableInterceptor::Current::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -1011,7 +1011,7 @@ void *PortableInterceptor::Current::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1051,10 +1051,10 @@ tao_PortableInterceptor_RequestInfo_nil (
 PortableInterceptor::RequestInfo_ptr
 tao_PortableInterceptor_RequestInfo_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::RequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableInterceptor::RequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1115,7 +1115,7 @@ PortableInterceptor::RequestInfo_var::operator const ::PortableInterceptor::Requ
   return this->ptr_;
 }
 
-PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast 
+PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1176,10 +1176,10 @@ PortableInterceptor::RequestInfo_var::tao_nil (void)
 ::PortableInterceptor::RequestInfo_ptr
 PortableInterceptor::RequestInfo_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::RequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableInterceptor::RequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1256,18 +1256,18 @@ PortableInterceptor::RequestInfo::RequestInfo (void)
   // destructor
   PortableInterceptor::RequestInfo::~RequestInfo (void)
   {}
-  
+
   PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return RequestInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return RequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
-  
+
   PortableInterceptor::RequestInfo_ptr PortableInterceptor::RequestInfo::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -1305,7 +1305,7 @@ void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1345,10 +1345,10 @@ tao_PortableInterceptor_ClientRequestInfo_nil (
 PortableInterceptor::ClientRequestInfo_ptr
 tao_PortableInterceptor_ClientRequestInfo_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ClientRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableInterceptor::ClientRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1409,7 +1409,7 @@ PortableInterceptor::ClientRequestInfo_var::operator const ::PortableInterceptor
   return this->ptr_;
 }
 
-PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast 
+PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1470,10 +1470,10 @@ PortableInterceptor::ClientRequestInfo_var::tao_nil (void)
 ::PortableInterceptor::ClientRequestInfo_ptr
 PortableInterceptor::ClientRequestInfo_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::ClientRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableInterceptor::ClientRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1550,18 +1550,18 @@ PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
   // destructor
   PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
   {}
-  
+
   PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return ClientRequestInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return ClientRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
-  
+
   PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ClientRequestInfo::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -1611,7 +1611,7 @@ void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptr_arith_t t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1651,10 +1651,10 @@ tao_PortableInterceptor_ServerRequestInfo_nil (
 PortableInterceptor::ServerRequestInfo_ptr
 tao_PortableInterceptor_ServerRequestInfo_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ServerRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableInterceptor::ServerRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1715,7 +1715,7 @@ PortableInterceptor::ServerRequestInfo_var::operator const ::PortableInterceptor
   return this->ptr_;
 }
 
-PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast 
+PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -1776,10 +1776,10 @@ PortableInterceptor::ServerRequestInfo_var::tao_nil (void)
 ::PortableInterceptor::ServerRequestInfo_ptr
 PortableInterceptor::ServerRequestInfo_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::ServerRequestInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableInterceptor::ServerRequestInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1856,18 +1856,18 @@ PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
   // destructor
   PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
   {}
-  
+
   PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return ServerRequestInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return ServerRequestInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
-  
+
   PortableInterceptor::ServerRequestInfo_ptr PortableInterceptor::ServerRequestInfo::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -1917,7 +1917,7 @@ void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptr_arith_t t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1957,10 +1957,10 @@ tao_PortableInterceptor_ClientRequestInterceptor_nil (
 PortableInterceptor::ClientRequestInterceptor_ptr
 tao_PortableInterceptor_ClientRequestInterceptor_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ClientRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableInterceptor::ClientRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2021,7 +2021,7 @@ PortableInterceptor::ClientRequestInterceptor_var::operator const ::PortableInte
   return this->ptr_;
 }
 
-PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast 
+PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2082,10 +2082,10 @@ PortableInterceptor::ClientRequestInterceptor_var::tao_nil (void)
 ::PortableInterceptor::ClientRequestInterceptor_ptr
 PortableInterceptor::ClientRequestInterceptor_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::ClientRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableInterceptor::ClientRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2162,18 +2162,18 @@ PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
   // destructor
   PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
   {}
-  
+
   PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return ClientRequestInterceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return ClientRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
-  
+
   PortableInterceptor::ClientRequestInterceptor_ptr PortableInterceptor::ClientRequestInterceptor::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -2223,7 +2223,7 @@ void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptr_ar
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2263,10 +2263,10 @@ tao_PortableInterceptor_ServerRequestInterceptor_nil (
 PortableInterceptor::ServerRequestInterceptor_ptr
 tao_PortableInterceptor_ServerRequestInterceptor_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ServerRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableInterceptor::ServerRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2327,7 +2327,7 @@ PortableInterceptor::ServerRequestInterceptor_var::operator const ::PortableInte
   return this->ptr_;
 }
 
-PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast 
+PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2388,10 +2388,10 @@ PortableInterceptor::ServerRequestInterceptor_var::tao_nil (void)
 ::PortableInterceptor::ServerRequestInterceptor_ptr
 PortableInterceptor::ServerRequestInterceptor_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::ServerRequestInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableInterceptor::ServerRequestInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2468,18 +2468,18 @@ PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
   // destructor
   PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
   {}
-  
+
   PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return ServerRequestInterceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return ServerRequestInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
-  
+
   PortableInterceptor::ServerRequestInterceptor_ptr PortableInterceptor::ServerRequestInterceptor::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -2529,7 +2529,7 @@ void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptr_ar
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2569,10 +2569,10 @@ tao_PortableInterceptor_IORInfo_nil (
 PortableInterceptor::IORInfo_ptr
 tao_PortableInterceptor_IORInfo_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::IORInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableInterceptor::IORInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2633,7 +2633,7 @@ PortableInterceptor::IORInfo_var::operator const ::PortableInterceptor::IORInfo_
   return this->ptr_;
 }
 
-PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast 
+PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2694,10 +2694,10 @@ PortableInterceptor::IORInfo_var::tao_nil (void)
 ::PortableInterceptor::IORInfo_ptr
 PortableInterceptor::IORInfo_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::IORInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableInterceptor::IORInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2774,18 +2774,18 @@ PortableInterceptor::IORInfo::IORInfo (void)
   // destructor
   PortableInterceptor::IORInfo::~IORInfo (void)
   {}
-  
+
   PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return IORInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return IORInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
-  
+
   PortableInterceptor::IORInfo_ptr PortableInterceptor::IORInfo::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -2823,7 +2823,7 @@ void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -2863,10 +2863,10 @@ tao_PortableInterceptor_IORInterceptor_nil (
 PortableInterceptor::IORInterceptor_ptr
 tao_PortableInterceptor_IORInterceptor_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::IORInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableInterceptor::IORInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2927,7 +2927,7 @@ PortableInterceptor::IORInterceptor_var::operator const ::PortableInterceptor::I
   return this->ptr_;
 }
 
-PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast 
+PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -2988,10 +2988,10 @@ PortableInterceptor::IORInterceptor_var::tao_nil (void)
 ::PortableInterceptor::IORInterceptor_ptr
 PortableInterceptor::IORInterceptor_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::IORInterceptor::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableInterceptor::IORInterceptor::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3068,18 +3068,18 @@ PortableInterceptor::IORInterceptor::IORInterceptor (void)
   // destructor
   PortableInterceptor::IORInterceptor::~IORInterceptor (void)
   {}
-  
+
   PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return IORInterceptor::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return IORInterceptor::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
-  
+
   PortableInterceptor::IORInterceptor_ptr PortableInterceptor::IORInterceptor::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -3129,7 +3129,7 @@ void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptr_arith_t type
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -3169,10 +3169,10 @@ tao_PortableInterceptor_PolicyFactory_nil (
 PortableInterceptor::PolicyFactory_ptr
 tao_PortableInterceptor_PolicyFactory_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::PolicyFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableInterceptor::PolicyFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3233,7 +3233,7 @@ PortableInterceptor::PolicyFactory_var::operator const ::PortableInterceptor::Po
   return this->ptr_;
 }
 
-PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast 
+PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3294,10 +3294,10 @@ PortableInterceptor::PolicyFactory_var::tao_nil (void)
 ::PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::PolicyFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableInterceptor::PolicyFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3374,18 +3374,18 @@ PortableInterceptor::PolicyFactory::PolicyFactory (void)
   // destructor
   PortableInterceptor::PolicyFactory::~PolicyFactory (void)
   {}
-  
+
   PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return PolicyFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return PolicyFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
-  
+
   PortableInterceptor::PolicyFactory_ptr PortableInterceptor::PolicyFactory::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -3423,7 +3423,7 @@ void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -3463,10 +3463,10 @@ tao_PortableInterceptor_ORBInitInfo_nil (
 PortableInterceptor::ORBInitInfo_ptr
 tao_PortableInterceptor_ORBInitInfo_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ORBInitInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableInterceptor::ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3527,7 +3527,7 @@ PortableInterceptor::ORBInitInfo_var::operator const ::PortableInterceptor::ORBI
   return this->ptr_;
 }
 
-PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast 
+PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -3588,10 +3588,10 @@ PortableInterceptor::ORBInitInfo_var::tao_nil (void)
 ::PortableInterceptor::ORBInitInfo_ptr
 PortableInterceptor::ORBInitInfo_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::ORBInitInfo::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableInterceptor::ORBInitInfo::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3668,18 +3668,18 @@ PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
   // destructor
   PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
   {}
-  
+
   PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return ORBInitInfo::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return ORBInitInfo::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
-  
+
   PortableInterceptor::ORBInitInfo_ptr PortableInterceptor::ORBInitInfo::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -3717,7 +3717,7 @@ void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -3776,7 +3776,7 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_raise ()
 
 void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -3784,7 +3784,7 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_encode (
 
 void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -3852,7 +3852,7 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_raise ()
 
 void PortableInterceptor::ORBInitInfo::InvalidName::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -3860,7 +3860,7 @@ void PortableInterceptor::ORBInitInfo::InvalidName::_tao_encode (
 
 void PortableInterceptor::ORBInitInfo::InvalidName::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -3903,10 +3903,10 @@ tao_PortableInterceptor_ORBInitializer_nil (
 PortableInterceptor::ORBInitializer_ptr
 tao_PortableInterceptor_ORBInitializer_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PortableInterceptor::ORBInitializer::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableInterceptor::ORBInitializer::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3967,7 +3967,7 @@ PortableInterceptor::ORBInitializer_var::operator const ::PortableInterceptor::O
   return this->ptr_;
 }
 
-PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast 
+PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast
 {
   return this->ptr_;
 }
@@ -4028,10 +4028,10 @@ PortableInterceptor::ORBInitializer_var::tao_nil (void)
 ::PortableInterceptor::ORBInitializer_ptr
 PortableInterceptor::ORBInitializer_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableInterceptor::ORBInitializer::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableInterceptor::ORBInitializer::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4108,18 +4108,18 @@ PortableInterceptor::ORBInitializer::ORBInitializer (void)
   // destructor
   PortableInterceptor::ORBInitializer::~ORBInitializer (void)
   {}
-  
+
   PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return ORBInitializer::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return ORBInitializer::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
-  
+
   PortableInterceptor::ORBInitializer_ptr PortableInterceptor::ORBInitializer::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -4157,7 +4157,7 @@ void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptr_arith_t type
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_tao_class_id))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -4214,13 +4214,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ForwardRequest TAO_ENV_ARG_PARAMETER);
+
+    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ForwardRequest ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (PortableInterceptor::ForwardRequest *)_tao_any.value ();
@@ -4304,13 +4304,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_InvalidSlot TAO_ENV_ARG_PARAMETER);
+
+    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_InvalidSlot ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
-    
+
     if (!result)
       return 0; // not equivalent
-    
+
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (PortableInterceptor::InvalidSlot *)_tao_any.value ();
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 1668d370f09..d8ef289f438 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -60,40 +60,40 @@
 
 TAO_NAMESPACE  PortableInterceptor
 {
-  
+
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___PTR_CH_
-  
+
   class Interceptor;
   typedef Interceptor *Interceptor_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CH_
-  
+
   class TAO_Export Interceptor_var : public TAO_Base_var
   {
   public:
     Interceptor_var (void); // default constructor
-    Interceptor_var (Interceptor_ptr p) : ptr_ (p) {} 
+    Interceptor_var (Interceptor_ptr p) : ptr_ (p) {}
     Interceptor_var (const Interceptor_var &); // copy constructor
     ~Interceptor_var (void); // destructor
-    
+
     Interceptor_var &operator= (Interceptor_ptr);
     Interceptor_var &operator= (const Interceptor_var &);
     Interceptor_ptr operator-> (void) const;
-    
+
     operator const Interceptor_ptr &() const;
     operator Interceptor_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     Interceptor_ptr in (void) const;
     Interceptor_ptr &inout (void);
     Interceptor_ptr &out (void);
     Interceptor_ptr _retn (void);
     Interceptor_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Interceptor_ptr tao_duplicate (Interceptor_ptr);
@@ -101,10 +101,10 @@ TAO_NAMESPACE  PortableInterceptor
     static Interceptor_ptr tao_nil (void);
     static Interceptor_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     Interceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -114,11 +114,11 @@ TAO_NAMESPACE  PortableInterceptor
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CH_
-  
+
   class TAO_Export Interceptor_out
   {
   public:
@@ -131,18 +131,18 @@ TAO_NAMESPACE  PortableInterceptor
     operator Interceptor_ptr &();
     Interceptor_ptr &ptr (void);
     Interceptor_ptr operator-> (void);
-  
+
   private:
     Interceptor_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_
-  
+
   class TAO_Export Interceptor
     : public virtual CORBA_Object
   {
@@ -153,161 +153,161 @@ TAO_NAMESPACE  PortableInterceptor
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static Interceptor_ptr _duplicate (Interceptor_ptr obj);
-    
+
     static Interceptor_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Interceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Interceptor_ptr _nil (void)
       {
         return (Interceptor_ptr)0;
       }
-    
+
     virtual char * name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     Interceptor (void);
-    
+
     virtual ~Interceptor (void);
-  
+
   private:
     Interceptor (const Interceptor &);
     void operator= (const Interceptor &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_)
 #define _PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_
-  
+
   class TAO_Export ForwardRequest : public CORBA::UserException
   {
   public:
     CORBA::Object_var forward;
     CORBA::Boolean permanent;
-    
+
     ForwardRequest (void);
     // Default constructor.
-    
+
     ForwardRequest (const ForwardRequest &);
     // Copy constructor.
-    
+
     ~ForwardRequest (void);
     // Destructor.
-    
+
     static void _tao_any_destructor (void*);
-    
+
     ForwardRequest &operator= (const ForwardRequest &);
-    
+
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     static ForwardRequest *_downcast (CORBA::Exception *);
 
     ForwardRequest (
         const CORBA::Object_ptr  _tao_forward,
         CORBA::Boolean _tao_permanent
       );
-    
+
     // = TAO extension.
     static CORBA::Exception *_alloc (void);
     virtual CORBA::TypeCode_ptr _type (void) const;
   }; // Exception PortableInterceptor::ForwardRequest.
 
 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
-  
-  
+
+
 #endif /* end #if !defined */
-  
+
   typedef CORBA::Short ReplyStatus;
   typedef CORBA::Short_out ReplyStatus_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyStatus;
-  
+
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SUCCESSFUL;
-  
+
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYSTEM_EXCEPTION;
-  
+
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short USER_EXCEPTION;
-  
+
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short LOCATION_FORWARD;
-  
+
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short LOCATION_FORWARD_PERMANENT;
-  
+
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short TRANSPORT_RETRY;
-  
+
   typedef CORBA::ULong SlotId;
   typedef CORBA::ULong_out SlotId_out;
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SlotId;
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_INVALIDSLOT_CH_)
 #define _PORTABLEINTERCEPTOR_INVALIDSLOT_CH_
-  
+
   class TAO_Export InvalidSlot : public CORBA::UserException
   {
   public:
-    
+
     InvalidSlot (void);
     // Default constructor.
-    
+
     InvalidSlot (const InvalidSlot &);
     // Copy constructor.
-    
+
     ~InvalidSlot (void);
     // Destructor.
-    
+
     static void _tao_any_destructor (void*);
-    
+
     InvalidSlot &operator= (const InvalidSlot &);
-    
+
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
-    
+
     static InvalidSlot *_downcast (CORBA::Exception *);
 
 
@@ -317,44 +317,44 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
   }; // Exception PortableInterceptor::InvalidSlot.
 
 TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT___PTR_CH_
-  
+
   class Current;
   typedef Current *Current_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT___VAR_CH_
-  
+
   class TAO_Export Current_var : public TAO_Base_var
   {
   public:
     Current_var (void); // default constructor
-    Current_var (Current_ptr p) : ptr_ (p) {} 
+    Current_var (Current_ptr p) : ptr_ (p) {}
     Current_var (const Current_var &); // copy constructor
     ~Current_var (void); // destructor
-    
+
     Current_var &operator= (Current_ptr);
     Current_var &operator= (const Current_var &);
     Current_ptr operator-> (void) const;
-    
+
     operator const Current_ptr &() const;
     operator Current_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     Current_ptr in (void) const;
     Current_ptr &inout (void);
     Current_ptr &out (void);
     Current_ptr _retn (void);
     Current_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static Current_ptr tao_duplicate (Current_ptr);
@@ -362,10 +362,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     static Current_ptr tao_nil (void);
     static Current_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     Current_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -375,11 +375,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT___OUT_CH_
-  
+
   class TAO_Export Current_out
   {
   public:
@@ -392,18 +392,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator Current_ptr &();
     Current_ptr &ptr (void);
     Current_ptr operator-> (void);
-  
+
   private:
     Current_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT_CH_
-  
+
   class TAO_Export Current
     : public virtual CORBA::Current
   {
@@ -414,93 +414,93 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-    
+
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _nil (void)
       {
         return (Current_ptr)0;
       }
-    
+
     virtual CORBA::Any * get_slot (
-        PortableInterceptor::SlotId id TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::SlotId id ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     virtual void set_slot (
         PortableInterceptor::SlotId id,
-        const CORBA::Any & data TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     Current (void);
-    
+
     virtual ~Current (void);
-  
+
   private:
     Current (const Current &);
     void operator= (const Current &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___PTR_CH_
-  
+
   class RequestInfo;
   typedef RequestInfo *RequestInfo_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CH_
-  
+
   class TAO_Export RequestInfo_var : public TAO_Base_var
   {
   public:
     RequestInfo_var (void); // default constructor
-    RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {} 
+    RequestInfo_var (RequestInfo_ptr p) : ptr_ (p) {}
     RequestInfo_var (const RequestInfo_var &); // copy constructor
     ~RequestInfo_var (void); // destructor
-    
+
     RequestInfo_var &operator= (RequestInfo_ptr);
     RequestInfo_var &operator= (const RequestInfo_var &);
     RequestInfo_ptr operator-> (void) const;
-    
+
     operator const RequestInfo_ptr &() const;
     operator RequestInfo_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     RequestInfo_ptr in (void) const;
     RequestInfo_ptr &inout (void);
     RequestInfo_ptr &out (void);
     RequestInfo_ptr _retn (void);
     RequestInfo_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static RequestInfo_ptr tao_duplicate (RequestInfo_ptr);
@@ -508,10 +508,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     static RequestInfo_ptr tao_nil (void);
     static RequestInfo_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     RequestInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -521,11 +521,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CH_
-  
+
   class TAO_Export RequestInfo_out
   {
   public:
@@ -538,18 +538,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator RequestInfo_ptr &();
     RequestInfo_ptr &ptr (void);
     RequestInfo_ptr operator-> (void);
-  
+
   private:
     RequestInfo_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
-  
+
   class TAO_Export RequestInfo
     : public virtual CORBA_Object
   {
@@ -560,179 +560,179 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static RequestInfo_ptr _duplicate (RequestInfo_ptr obj);
-    
+
     static RequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestInfo_ptr _nil (void)
       {
         return (RequestInfo_ptr)0;
       }
-    
+
     virtual CORBA::ULong request_id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual char * operation (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::Dynamic::ParameterList * arguments (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::Dynamic::ExceptionList * exceptions (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::Dynamic::ContextList * contexts (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::Dynamic::RequestContext * operation_context (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual CORBA::Any * result (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual CORBA::Boolean response_expected (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
 #if TAO_HAS_CORBA_MESSAGING == 1
 
     virtual Messaging::SyncScope sync_scope (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
 #endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
-    
+
     virtual PortableInterceptor::ReplyStatus reply_status (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual CORBA::Object_ptr forward_reference (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual CORBA::Any * get_slot (
-        PortableInterceptor::SlotId id TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::SlotId id ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     virtual ::IOP::ServiceContext * get_request_service_context (
-        IOP::ServiceId id TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        IOP::ServiceId id ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::IOP::ServiceContext * get_reply_service_context (
-        IOP::ServiceId id TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        IOP::ServiceId id ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     RequestInfo (void);
-    
+
     virtual ~RequestInfo (void);
-  
+
   private:
     RequestInfo (const RequestInfo &);
     void operator= (const RequestInfo &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___PTR_CH_
-  
+
   class ClientRequestInfo;
   typedef ClientRequestInfo *ClientRequestInfo_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CH_
-  
+
   class TAO_Export ClientRequestInfo_var : public TAO_Base_var
   {
   public:
     ClientRequestInfo_var (void); // default constructor
-    ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {} 
+    ClientRequestInfo_var (ClientRequestInfo_ptr p) : ptr_ (p) {}
     ClientRequestInfo_var (const ClientRequestInfo_var &); // copy constructor
     ~ClientRequestInfo_var (void); // destructor
-    
+
     ClientRequestInfo_var &operator= (ClientRequestInfo_ptr);
     ClientRequestInfo_var &operator= (const ClientRequestInfo_var &);
     ClientRequestInfo_ptr operator-> (void) const;
-    
+
     operator const ClientRequestInfo_ptr &() const;
     operator ClientRequestInfo_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ClientRequestInfo_ptr in (void) const;
     ClientRequestInfo_ptr &inout (void);
     ClientRequestInfo_ptr &out (void);
     ClientRequestInfo_ptr _retn (void);
     ClientRequestInfo_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ClientRequestInfo_ptr tao_duplicate (ClientRequestInfo_ptr);
@@ -740,10 +740,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     static ClientRequestInfo_ptr tao_nil (void);
     static ClientRequestInfo_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ClientRequestInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -753,11 +753,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CH_
-  
+
   class TAO_Export ClientRequestInfo_out
   {
   public:
@@ -770,18 +770,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ClientRequestInfo_ptr &();
     ClientRequestInfo_ptr &ptr (void);
     ClientRequestInfo_ptr operator-> (void);
-  
+
   private:
     ClientRequestInfo_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
-  
+
   class TAO_Export ClientRequestInfo
     : public virtual PortableInterceptor::RequestInfo
   {
@@ -792,140 +792,140 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj);
-    
+
     static ClientRequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ClientRequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ClientRequestInfo_ptr _nil (void)
       {
         return (ClientRequestInfo_ptr)0;
       }
-    
+
     virtual CORBA::Object_ptr target (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual CORBA::Object_ptr effective_target (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::IOP::TaggedProfile * effective_profile (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual CORBA::Any * received_exception (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual char * received_exception_id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::IOP::TaggedComponent * get_effective_component (
-        IOP::ComponentId id TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        IOP::ComponentId id ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::IOP::TaggedComponentSeq * get_effective_components (
-        IOP::ComponentId id TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        IOP::ComponentId id ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::CORBA::Policy_ptr get_request_policy (
-        CORBA::PolicyType type TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void add_request_service_context (
         const IOP::ServiceContext & service_context,
-        CORBA::Boolean replace TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::Boolean replace ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     ClientRequestInfo (void);
-    
+
     virtual ~ClientRequestInfo (void);
-  
+
   private:
     ClientRequestInfo (const ClientRequestInfo &);
     void operator= (const ClientRequestInfo &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___PTR_CH_
-  
+
   class ServerRequestInfo;
   typedef ServerRequestInfo *ServerRequestInfo_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CH_
-  
+
   class TAO_Export ServerRequestInfo_var : public TAO_Base_var
   {
   public:
     ServerRequestInfo_var (void); // default constructor
-    ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {} 
+    ServerRequestInfo_var (ServerRequestInfo_ptr p) : ptr_ (p) {}
     ServerRequestInfo_var (const ServerRequestInfo_var &); // copy constructor
     ~ServerRequestInfo_var (void); // destructor
-    
+
     ServerRequestInfo_var &operator= (ServerRequestInfo_ptr);
     ServerRequestInfo_var &operator= (const ServerRequestInfo_var &);
     ServerRequestInfo_ptr operator-> (void) const;
-    
+
     operator const ServerRequestInfo_ptr &() const;
     operator ServerRequestInfo_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ServerRequestInfo_ptr in (void) const;
     ServerRequestInfo_ptr &inout (void);
     ServerRequestInfo_ptr &out (void);
     ServerRequestInfo_ptr _retn (void);
     ServerRequestInfo_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServerRequestInfo_ptr tao_duplicate (ServerRequestInfo_ptr);
@@ -933,10 +933,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     static ServerRequestInfo_ptr tao_nil (void);
     static ServerRequestInfo_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ServerRequestInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -946,11 +946,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CH_
-  
+
   class TAO_Export ServerRequestInfo_out
   {
   public:
@@ -963,18 +963,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ServerRequestInfo_ptr &();
     ServerRequestInfo_ptr &ptr (void);
     ServerRequestInfo_ptr operator-> (void);
-  
+
   private:
     ServerRequestInfo_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
-  
+
   class TAO_Export ServerRequestInfo
     : public virtual PortableInterceptor::RequestInfo
   {
@@ -985,156 +985,156 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj);
-    
+
     static ServerRequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerRequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerRequestInfo_ptr _nil (void)
       {
         return (ServerRequestInfo_ptr)0;
       }
-    
+
     virtual CORBA::Any * sending_exception (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual char * server_id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual char * orb_id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::PortableInterceptor::AdapterName * adapter_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::CORBA::OctetSeq * object_id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::CORBA::OctetSeq * adapter_id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual char * target_most_derived_interface (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::CORBA::Policy_ptr get_server_policy (
-        CORBA::PolicyType type TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void set_slot (
         PortableInterceptor::SlotId id,
-        const CORBA::Any & data TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const CORBA::Any & data ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     virtual CORBA::Boolean target_is_a (
-        const char * id TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void add_reply_service_context (
         const IOP::ServiceContext & service_context,
-        CORBA::Boolean replace TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::Boolean replace ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     ServerRequestInfo (void);
-    
+
     virtual ~ServerRequestInfo (void);
-  
+
   private:
     ServerRequestInfo (const ServerRequestInfo &);
     void operator= (const ServerRequestInfo &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___PTR_CH_
-  
+
   class ClientRequestInterceptor;
   typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CH_
-  
+
   class TAO_Export ClientRequestInterceptor_var : public TAO_Base_var
   {
   public:
     ClientRequestInterceptor_var (void); // default constructor
-    ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {} 
+    ClientRequestInterceptor_var (ClientRequestInterceptor_ptr p) : ptr_ (p) {}
     ClientRequestInterceptor_var (const ClientRequestInterceptor_var &); // copy constructor
     ~ClientRequestInterceptor_var (void); // destructor
-    
+
     ClientRequestInterceptor_var &operator= (ClientRequestInterceptor_ptr);
     ClientRequestInterceptor_var &operator= (const ClientRequestInterceptor_var &);
     ClientRequestInterceptor_ptr operator-> (void) const;
-    
+
     operator const ClientRequestInterceptor_ptr &() const;
     operator ClientRequestInterceptor_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ClientRequestInterceptor_ptr in (void) const;
     ClientRequestInterceptor_ptr &inout (void);
     ClientRequestInterceptor_ptr &out (void);
     ClientRequestInterceptor_ptr _retn (void);
     ClientRequestInterceptor_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ClientRequestInterceptor_ptr tao_duplicate (ClientRequestInterceptor_ptr);
@@ -1142,10 +1142,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     static ClientRequestInterceptor_ptr tao_nil (void);
     static ClientRequestInterceptor_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ClientRequestInterceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1155,11 +1155,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CH_
-  
+
   class TAO_Export ClientRequestInterceptor_out
   {
   public:
@@ -1172,18 +1172,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ClientRequestInterceptor_ptr &();
     ClientRequestInterceptor_ptr &ptr (void);
     ClientRequestInterceptor_ptr operator-> (void);
-  
+
   private:
     ClientRequestInterceptor_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_
-  
+
   class TAO_Export ClientRequestInterceptor
     : public virtual PortableInterceptor::Interceptor
   {
@@ -1194,114 +1194,114 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj);
-    
+
     static ClientRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ClientRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ClientRequestInterceptor_ptr _nil (void)
       {
         return (ClientRequestInterceptor_ptr)0;
       }
-    
+
     virtual void send_request (
-        PortableInterceptor::ClientRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     virtual void send_poll (
-        PortableInterceptor::ClientRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void receive_reply (
-        PortableInterceptor::ClientRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void receive_exception (
-        PortableInterceptor::ClientRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     virtual void receive_other (
-        PortableInterceptor::ClientRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ClientRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     ClientRequestInterceptor (void);
-    
+
     virtual ~ClientRequestInterceptor (void);
-  
+
   private:
     ClientRequestInterceptor (const ClientRequestInterceptor &);
     void operator= (const ClientRequestInterceptor &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___PTR_CH_
-  
+
   class ServerRequestInterceptor;
   typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CH_
-  
+
   class TAO_Export ServerRequestInterceptor_var : public TAO_Base_var
   {
   public:
     ServerRequestInterceptor_var (void); // default constructor
-    ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {} 
+    ServerRequestInterceptor_var (ServerRequestInterceptor_ptr p) : ptr_ (p) {}
     ServerRequestInterceptor_var (const ServerRequestInterceptor_var &); // copy constructor
     ~ServerRequestInterceptor_var (void); // destructor
-    
+
     ServerRequestInterceptor_var &operator= (ServerRequestInterceptor_ptr);
     ServerRequestInterceptor_var &operator= (const ServerRequestInterceptor_var &);
     ServerRequestInterceptor_ptr operator-> (void) const;
-    
+
     operator const ServerRequestInterceptor_ptr &() const;
     operator ServerRequestInterceptor_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ServerRequestInterceptor_ptr in (void) const;
     ServerRequestInterceptor_ptr &inout (void);
     ServerRequestInterceptor_ptr &out (void);
     ServerRequestInterceptor_ptr _retn (void);
     ServerRequestInterceptor_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ServerRequestInterceptor_ptr tao_duplicate (ServerRequestInterceptor_ptr);
@@ -1309,10 +1309,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     static ServerRequestInterceptor_ptr tao_nil (void);
     static ServerRequestInterceptor_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ServerRequestInterceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1322,11 +1322,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CH_
-  
+
   class TAO_Export ServerRequestInterceptor_out
   {
   public:
@@ -1339,18 +1339,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ServerRequestInterceptor_ptr &();
     ServerRequestInterceptor_ptr &ptr (void);
     ServerRequestInterceptor_ptr operator-> (void);
-  
+
   private:
     ServerRequestInterceptor_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_
-  
+
   class TAO_Export ServerRequestInterceptor
     : public virtual PortableInterceptor::Interceptor
   {
@@ -1361,115 +1361,115 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj);
-    
+
     static ServerRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServerRequestInterceptor_ptr _nil (void)
       {
         return (ServerRequestInterceptor_ptr)0;
       }
-    
+
     virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     virtual void receive_request (
-        PortableInterceptor::ServerRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     virtual void send_reply (
-        PortableInterceptor::ServerRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void send_exception (
-        PortableInterceptor::ServerRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     virtual void send_other (
-        PortableInterceptor::ServerRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ServerRequestInfo_ptr ri ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
       )) = 0;
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     ServerRequestInterceptor (void);
-    
+
     virtual ~ServerRequestInterceptor (void);
-  
+
   private:
     ServerRequestInterceptor (const ServerRequestInterceptor &);
     void operator= (const ServerRequestInterceptor &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO___PTR_CH_
-  
+
   class IORInfo;
   typedef IORInfo *IORInfo_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO___VAR_CH_
-  
+
   class TAO_Export IORInfo_var : public TAO_Base_var
   {
   public:
     IORInfo_var (void); // default constructor
-    IORInfo_var (IORInfo_ptr p) : ptr_ (p) {} 
+    IORInfo_var (IORInfo_ptr p) : ptr_ (p) {}
     IORInfo_var (const IORInfo_var &); // copy constructor
     ~IORInfo_var (void); // destructor
-    
+
     IORInfo_var &operator= (IORInfo_ptr);
     IORInfo_var &operator= (const IORInfo_var &);
     IORInfo_ptr operator-> (void) const;
-    
+
     operator const IORInfo_ptr &() const;
     operator IORInfo_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     IORInfo_ptr in (void) const;
     IORInfo_ptr &inout (void);
     IORInfo_ptr &out (void);
     IORInfo_ptr _retn (void);
     IORInfo_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static IORInfo_ptr tao_duplicate (IORInfo_ptr);
@@ -1477,10 +1477,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     static IORInfo_ptr tao_nil (void);
     static IORInfo_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     IORInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1490,11 +1490,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO___OUT_CH_
-  
+
   class TAO_Export IORInfo_out
   {
   public:
@@ -1507,18 +1507,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator IORInfo_ptr &();
     IORInfo_ptr &ptr (void);
     IORInfo_ptr operator-> (void);
-  
+
   private:
     IORInfo_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO_CH_
-  
+
   class TAO_Export IORInfo
     : public virtual CORBA_Object
   {
@@ -1529,133 +1529,133 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static IORInfo_ptr _duplicate (IORInfo_ptr obj);
-    
+
     static IORInfo_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IORInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IORInfo_ptr _nil (void)
       {
         return (IORInfo_ptr)0;
       }
-    
+
     virtual ::CORBA::Policy_ptr get_effective_policy (
-        CORBA::PolicyType type TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::PolicyType type ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void add_ior_component (
-        const IOP::TaggedComponent & component TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const IOP::TaggedComponent & component ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void add_ior_component_to_profile (
         const IOP::TaggedComponent & component,
-        IOP::ProfileId profile_id TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        IOP::ProfileId profile_id ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual PortableInterceptor::AdapterManagerId manager_id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual PortableInterceptor::AdapterState state (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::PortableInterceptor::ObjectReferenceTemplate * adapter_template (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::PortableInterceptor::ObjectReferenceFactory * current_factory (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void current_factory (
-        PortableInterceptor::ObjectReferenceFactory * current_factory TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ObjectReferenceFactory * current_factory ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     IORInfo (void);
-    
+
     virtual ~IORInfo (void);
-  
+
   private:
     IORInfo (const IORInfo &);
     void operator= (const IORInfo &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___PTR_CH_
-  
+
   class IORInterceptor;
   typedef IORInterceptor *IORInterceptor_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CH_
-  
+
   class TAO_Export IORInterceptor_var : public TAO_Base_var
   {
   public:
     IORInterceptor_var (void); // default constructor
-    IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {} 
+    IORInterceptor_var (IORInterceptor_ptr p) : ptr_ (p) {}
     IORInterceptor_var (const IORInterceptor_var &); // copy constructor
     ~IORInterceptor_var (void); // destructor
-    
+
     IORInterceptor_var &operator= (IORInterceptor_ptr);
     IORInterceptor_var &operator= (const IORInterceptor_var &);
     IORInterceptor_ptr operator-> (void) const;
-    
+
     operator const IORInterceptor_ptr &() const;
     operator IORInterceptor_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     IORInterceptor_ptr in (void) const;
     IORInterceptor_ptr &inout (void);
     IORInterceptor_ptr &out (void);
     IORInterceptor_ptr _retn (void);
     IORInterceptor_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static IORInterceptor_ptr tao_duplicate (IORInterceptor_ptr);
@@ -1663,10 +1663,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     static IORInterceptor_ptr tao_nil (void);
     static IORInterceptor_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     IORInterceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1676,11 +1676,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CH_
-  
+
   class TAO_Export IORInterceptor_out
   {
   public:
@@ -1693,18 +1693,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator IORInterceptor_ptr &();
     IORInterceptor_ptr &ptr (void);
     IORInterceptor_ptr operator-> (void);
-  
+
   private:
     IORInterceptor_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR_CH_
-  
+
   class TAO_Export IORInterceptor
     : public virtual PortableInterceptor::Interceptor
   {
@@ -1715,106 +1715,106 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static IORInterceptor_ptr _duplicate (IORInterceptor_ptr obj);
-    
+
     static IORInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IORInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IORInterceptor_ptr _nil (void)
       {
         return (IORInterceptor_ptr)0;
       }
-    
+
     virtual void establish_components (
-        PortableInterceptor::IORInfo_ptr info TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::IORInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void components_established (
-        PortableInterceptor::IORInfo_ptr info TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::IORInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void adapter_manager_state_changed (
         PortableInterceptor::AdapterManagerId id,
-        PortableInterceptor::AdapterState state TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::AdapterState state ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void adapter_state_changed (
         const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
-        PortableInterceptor::AdapterState state TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::AdapterState state ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     IORInterceptor (void);
-    
+
     virtual ~IORInterceptor (void);
-  
+
   private:
     IORInterceptor (const IORInterceptor &);
     void operator= (const IORInterceptor &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY___PTR_CH_
-  
+
   class PolicyFactory;
   typedef PolicyFactory *PolicyFactory_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CH_
-  
+
   class TAO_Export PolicyFactory_var : public TAO_Base_var
   {
   public:
     PolicyFactory_var (void); // default constructor
-    PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {} 
+    PolicyFactory_var (PolicyFactory_ptr p) : ptr_ (p) {}
     PolicyFactory_var (const PolicyFactory_var &); // copy constructor
     ~PolicyFactory_var (void); // destructor
-    
+
     PolicyFactory_var &operator= (PolicyFactory_ptr);
     PolicyFactory_var &operator= (const PolicyFactory_var &);
     PolicyFactory_ptr operator-> (void) const;
-    
+
     operator const PolicyFactory_ptr &() const;
     operator PolicyFactory_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     PolicyFactory_ptr in (void) const;
     PolicyFactory_ptr &inout (void);
     PolicyFactory_ptr &out (void);
     PolicyFactory_ptr _retn (void);
     PolicyFactory_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static PolicyFactory_ptr tao_duplicate (PolicyFactory_ptr);
@@ -1822,10 +1822,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     static PolicyFactory_ptr tao_nil (void);
     static PolicyFactory_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     PolicyFactory_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1835,11 +1835,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CH_
-  
+
   class TAO_Export PolicyFactory_out
   {
   public:
@@ -1852,18 +1852,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator PolicyFactory_ptr &();
     PolicyFactory_ptr &ptr (void);
     PolicyFactory_ptr operator-> (void);
-  
+
   private:
     PolicyFactory_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_
-  
+
   class TAO_Export PolicyFactory
     : public virtual CORBA_Object
   {
@@ -1874,85 +1874,85 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj);
-    
+
     static PolicyFactory_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyFactory_ptr _nil (void)
       {
         return (PolicyFactory_ptr)0;
       }
-    
+
     virtual ::CORBA::Policy_ptr create_policy (
         CORBA::PolicyType type,
-        const CORBA::Any & value TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const CORBA::Any & value ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         CORBA::PolicyError
       )) = 0;
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     PolicyFactory (void);
-    
+
     virtual ~PolicyFactory (void);
-  
+
   private:
     PolicyFactory (const PolicyFactory &);
     void operator= (const PolicyFactory &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___PTR_CH_
-  
+
   class ORBInitInfo;
   typedef ORBInitInfo *ORBInitInfo_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CH_
-  
+
   class TAO_Export ORBInitInfo_var : public TAO_Base_var
   {
   public:
     ORBInitInfo_var (void); // default constructor
-    ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {} 
+    ORBInitInfo_var (ORBInitInfo_ptr p) : ptr_ (p) {}
     ORBInitInfo_var (const ORBInitInfo_var &); // copy constructor
     ~ORBInitInfo_var (void); // destructor
-    
+
     ORBInitInfo_var &operator= (ORBInitInfo_ptr);
     ORBInitInfo_var &operator= (const ORBInitInfo_var &);
     ORBInitInfo_ptr operator-> (void) const;
-    
+
     operator const ORBInitInfo_ptr &() const;
     operator ORBInitInfo_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ORBInitInfo_ptr in (void) const;
     ORBInitInfo_ptr &inout (void);
     ORBInitInfo_ptr &out (void);
     ORBInitInfo_ptr _retn (void);
     ORBInitInfo_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ORBInitInfo_ptr tao_duplicate (ORBInitInfo_ptr);
@@ -1960,10 +1960,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     static ORBInitInfo_ptr tao_nil (void);
     static ORBInitInfo_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ORBInitInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1973,11 +1973,11 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CH_
-  
+
   class TAO_Export ORBInitInfo_out
   {
   public:
@@ -1990,18 +1990,18 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     operator ORBInitInfo_ptr &();
     ORBInitInfo_ptr &ptr (void);
     ORBInitInfo_ptr operator-> (void);
-  
+
   private:
     ORBInitInfo_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_
-  
+
   class TAO_Export ORBInitInfo
     : public virtual CORBA_Object
   {
@@ -2012,104 +2012,104 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj);
-    
+
     static ORBInitInfo_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ORBInitInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ORBInitInfo_ptr _nil (void)
       {
         return (ORBInitInfo_ptr)0;
       }
-    
+
     typedef char * ObjectId;
     typedef CORBA::String_var ObjectId_var;
     typedef CORBA::String_out ObjectId_out;
-    
+
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_
-    
+
     class TAO_Export DuplicateName : public CORBA::UserException
     {
     public:
       TAO_String_Manager name;
-      
+
       DuplicateName (void);
       // Default constructor.
-      
+
       DuplicateName (const DuplicateName &);
       // Copy constructor.
-      
+
       ~DuplicateName (void);
       // Destructor.
-      
+
       DuplicateName &operator= (const DuplicateName &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       static DuplicateName *_downcast (CORBA::Exception *);
 
       DuplicateName (
           const char * _tao_name
         );
-      
+
       // = TAO extension.
       static CORBA::Exception *_alloc (void);
     }; // Exception PortableInterceptor::ORBInitInfo::DuplicateName.
 
 
 #endif /* end #if !defined */
-    
-    
+
+
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_
-    
+
     class TAO_Export InvalidName : public CORBA::UserException
     {
     public:
-      
+
       InvalidName (void);
       // Default constructor.
-      
+
       InvalidName (const InvalidName &);
       // Copy constructor.
-      
+
       ~InvalidName (void);
       // Destructor.
-      
+
       InvalidName &operator= (const InvalidName &);
-      
+
       virtual void _raise (void);
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
-      
+
       static InvalidName *_downcast (CORBA::Exception *);
 
 
@@ -2119,135 +2119,135 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 
 
 #endif /* end #if !defined */
-    
+
     virtual ::CORBA::StringSeq * arguments (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual char * orb_id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual ::IOP::CodecFactory_ptr codec_factory (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void register_initial_reference (
         const char * id,
-        CORBA::Object_ptr obj TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::Object_ptr obj ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ORBInitInfo::InvalidName
       )) = 0;
-    
+
     virtual CORBA::Object_ptr resolve_initial_references (
-        const char * id TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const char * id ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ORBInitInfo::InvalidName
       )) = 0;
-    
+
     virtual void add_client_request_interceptor (
-        PortableInterceptor::ClientRequestInterceptor_ptr interceptor TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ClientRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-    
+
     virtual void add_server_request_interceptor (
-        PortableInterceptor::ServerRequestInterceptor_ptr interceptor TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ServerRequestInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-    
+
     virtual void add_ior_interceptor (
-        PortableInterceptor::IORInterceptor_ptr interceptor TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::IORInterceptor_ptr interceptor ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ORBInitInfo::DuplicateName
       )) = 0;
-    
+
     virtual PortableInterceptor::SlotId allocate_slot_id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void register_policy_factory (
         CORBA::PolicyType type,
-        PortableInterceptor::PolicyFactory_ptr policy_factory TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::PolicyFactory_ptr policy_factory ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     ORBInitInfo (void);
-    
+
     virtual ~ORBInitInfo (void);
-  
+
   private:
     ORBInitInfo (const ORBInitInfo &);
     void operator= (const ORBInitInfo &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___PTR_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___PTR_CH_
-  
+
   class ORBInitializer;
   typedef ORBInitializer *ORBInitializer_ptr;
-  
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CH_
-  
+
   class TAO_Export ORBInitializer_var : public TAO_Base_var
   {
   public:
     ORBInitializer_var (void); // default constructor
-    ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {} 
+    ORBInitializer_var (ORBInitializer_ptr p) : ptr_ (p) {}
     ORBInitializer_var (const ORBInitializer_var &); // copy constructor
     ~ORBInitializer_var (void); // destructor
-    
+
     ORBInitializer_var &operator= (ORBInitializer_ptr);
     ORBInitializer_var &operator= (const ORBInitializer_var &);
     ORBInitializer_ptr operator-> (void) const;
-    
+
     operator const ORBInitializer_ptr &() const;
     operator ORBInitializer_ptr &();
-    // in, inout, out, _retn 
+    // in, inout, out, _retn
     ORBInitializer_ptr in (void) const;
     ORBInitializer_ptr &inout (void);
     ORBInitializer_ptr &out (void);
     ORBInitializer_ptr _retn (void);
     ORBInitializer_ptr ptr (void) const;
-    
+
     // Hooks used by template sequence and object manager classes
     // for non-defined forward declared interfaces.
     static ORBInitializer_ptr tao_duplicate (ORBInitializer_ptr);
@@ -2255,10 +2255,10 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
     static ORBInitializer_ptr tao_nil (void);
     static ORBInitializer_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
-  
+
   private:
     ORBInitializer_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2270,14 +2270,14 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 /// table.
 TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
   ORBInitializer_ptr init
-  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CH_
-  
+
   class TAO_Export ORBInitializer_out
   {
   public:
@@ -2290,18 +2290,18 @@ TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
     operator ORBInitializer_ptr &();
     ORBInitializer_ptr &ptr (void);
     ORBInitializer_ptr operator-> (void);
-  
+
   private:
     ORBInitializer_ptr &ptr_;
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER_CH_
-  
+
   class TAO_Export ORBInitializer
     : public virtual CORBA_Object
   {
@@ -2312,57 +2312,57 @@ TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     static int _tao_class_id;
-    
+
     // The static operations.
     static ORBInitializer_ptr _duplicate (ORBInitializer_ptr obj);
-    
+
     static ORBInitializer_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ORBInitializer_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ORBInitializer_ptr _nil (void)
       {
         return (ORBInitializer_ptr)0;
       }
-    
+
     virtual void pre_init (
-        PortableInterceptor::ORBInitInfo_ptr info TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void post_init (
-        PortableInterceptor::ORBInitInfo_ptr info TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableInterceptor::ORBInitInfo_ptr info ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
+
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     ORBInitializer (void);
-    
+
     virtual ~ORBInitializer (void);
-  
+
   private:
     ORBInitializer (const ORBInitializer &);
     void operator= (const ORBInitializer &);
   };
-  
-  
+
+
 #endif /* end #if !defined */
-  
-  
+
+
 }
 TAO_NAMESPACE_CLOSE // module PortableInterceptor
 
diff --git a/TAO/tao/PortableServer/AMH_Response_Handler.cpp b/TAO/tao/PortableServer/AMH_Response_Handler.cpp
index 0e0f18c78c1..9c7256c746f 100644
--- a/TAO/tao/PortableServer/AMH_Response_Handler.cpp
+++ b/TAO/tao/PortableServer/AMH_Response_Handler.cpp
@@ -42,7 +42,7 @@ TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void)
 }
 
 // @@ Mayur: change the signature of this function to use
-// TAO_ENV_SINGLE_ARG_DECL... and then change the generated code in
+// ACE_ENV_SINGLE_ARG_DECL... and then change the generated code in
 // the IDL compiler too!
 void
 TAO_AMH_Response_Handler::_tao_rh_init_reply (void)
@@ -51,27 +51,27 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void)
 
   if (this->once_only_ != TAO_UNINITIALISED_REPLY)
   {
-    // Raise exception ... when exceptions have been implemented, send the 
+    // Raise exception ... when exceptions have been implemented, send the
     // appropriate exception to the client
     ACE_ERROR ((LM_ERROR, ACE_TEXT("ERROR. Tried calling method twice  \n")));
   }
 
   // We are now ready to initialise the reply
   this->once_only_ = TAO_INITIALISING_REPLY;
-  
+
   //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Initialising RH ... \n")));
   // Construct our reply generator.
   TAO_Pluggable_Reply_Params_Base reply_params;
-  
+
   //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tSetting request_id ... \n")));
   reply_params.request_id_ = this->request_id_;
-  
+
   //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tInitialising reply svc cntxt ... \n")));
   reply_params.service_context_notowned (&(this->reply_service_context_.service_info ()));
-  
+
   //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tSetting argument flag ... \n")));
   reply_params.argument_flag_ = this->argument_flag_;
-  
+
   //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tSetting reply_status ... \n")));
   if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION)
     {
@@ -81,35 +81,35 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void)
     {
       reply_params.reply_status_ = this->exception_type_;
     }
-  
+
   //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\tgenerating reply header ... \n")));
   this->mesg_base_->generate_reply_header (this->_tao_out,
                                            reply_params);
   //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Done Initialising RH. \n")));
 
   // We are done initialising the reply
-  this->once_only_ = TAO_INITIALISED_REPLY; 
+  this->once_only_ = TAO_INITIALISED_REPLY;
 }
 
 void TAO_AMH_Response_Handler::_tao_rh_send_reply (void)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
-  
+
   // If the reply has not been initialised, raise an exception
   if (this->once_only_ != TAO_INITIALISED_REPLY)
     {
-      // Raise exception ... when exceptions have been implemented, send the 
+      // Raise exception ... when exceptions have been implemented, send the
       // appropriate exception to the client
       ACE_ERROR ((LM_ERROR, ACE_TEXT("ERROR. Tried calling method twice  \n")));
     }
-  
+
   this->once_only_ = TAO_SENDING_REPLY;
-  
+
   //ACE_DEBUG ((LM_DEBUG, ACE_TEXT("TAO_RH sending message ... \n")));
-  
+
   // Send the message.
   int result = this->transport_->send_message (this->_tao_out);
-  
+
   if (result == -1)
     {
       if (TAO_debug_level > 0)
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index 652536ff186..5d23647a7ae 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -84,7 +84,7 @@ TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
                                               int unique_id_policy,
                                               int persistent_id_policy,
                                               const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
   : user_id_map_ (0),
     servant_map_ (0),
     id_uniqueness_strategy_ (0),
diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h
index 0e28031dc06..0e0f1d15f0e 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.h
+++ b/TAO/tao/PortableServer/Active_Object_Map.h
@@ -77,7 +77,7 @@ public:
                          int unique_id_policy,
                          int persistent_id_policy,
                          const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   // Constructor.
 
   ~TAO_Active_Object_Map (void);
diff --git a/TAO/tao/PortableServer/Collocated_Object.cpp b/TAO/tao/PortableServer/Collocated_Object.cpp
index 30f5e9f4400..977e3cb6085 100644
--- a/TAO/tao/PortableServer/Collocated_Object.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object.cpp
@@ -25,7 +25,7 @@ TAO_Collocated_Object::_servant (void) const
 */
 TAO_Collocated_Object *
 TAO_Collocated_Object::_narrow (CORBA::Object_ptr object
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (object == 0)
     return 0;
@@ -40,11 +40,11 @@ TAO_Collocated_Object::_narrow (CORBA::Object_ptr object
 
 CORBA::Boolean
 TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   // If the object is collocated then try locally....
   if (!this->_is_collocated ())
-    return this->CORBA_Object::_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (logical_type_id ACE_ENV_ARG_PARAMETER);
 
   if (this->_stubobj ()->type_id.in () != 0
       && ACE_OS::strcmp (logical_type_id,
@@ -65,14 +65,14 @@ TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id
       servant_upcall.prepare_for_upcall (this->_object_key (),
                                          "_is_a",
                                          forward_to.out ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-      return servant_upcall.servant ()->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);
+      return servant_upcall.servant ()->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER);
     }
 
   // Direct collocation strategy is used.
   if (this->servant_ != 0)
-    return this->servant_->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);
+    return this->servant_->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER);
 
   // @@ Maybe we want to change this exception...
   ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
@@ -80,11 +80,11 @@ TAO_Collocated_Object::_is_a (const CORBA::Char *logical_type_id
 
 CORBA::Boolean
 TAO_Collocated_Object::_is_equivalent (CORBA_Object_ptr other_obj
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC (())
 {
   CORBA::Boolean equivalent =
-    this->CORBA_Object::_is_equivalent (other_obj TAO_ENV_ARG_PARAMETER);
+    this->CORBA_Object::_is_equivalent (other_obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (equivalent)
@@ -106,7 +106,7 @@ TAO_Collocated_Object::_is_equivalent (CORBA_Object_ptr other_obj
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 CORBA::Boolean
-TAO_Collocated_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Collocated_Object::_non_existent (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Boolean _tao_retval = 0;
 
@@ -114,7 +114,7 @@ TAO_Collocated_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL)
     {
       // If the object is collocated then try locally....
       if (!this->_is_collocated ())
-        return this->CORBA_Object::_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+        return this->CORBA_Object::_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       TAO_Stub *stub = this->_stubobj ();
 
@@ -131,14 +131,14 @@ TAO_Collocated_Object::_non_existent (TAO_ENV_SINGLE_ARG_DECL)
           servant_upcall.prepare_for_upcall (this->_object_key (),
                                              "_non_existent",
                                              forward_to.out ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          return servant_upcall.servant ()->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+          return servant_upcall.servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
         }
 
       // Direct collocation strategy is used.
       if (this->servant_ != 0)
-        return this->servant_->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+        return this->servant_->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       // @@ Maybe we want to change this exception...
       ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
diff --git a/TAO/tao/PortableServer/Collocated_Object.h b/TAO/tao/PortableServer/Collocated_Object.h
index 5326817da53..768d51b2286 100644
--- a/TAO/tao/PortableServer/Collocated_Object.h
+++ b/TAO/tao/PortableServer/Collocated_Object.h
@@ -44,17 +44,17 @@ public:
 */
 
   static TAO_Collocated_Object *_narrow (CORBA::Object_ptr object
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Downcast operation
 
   // = The CORBA_Object methods, check the tao/Object.h file for details
   virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual CORBA::Boolean _is_equivalent (CORBA_Object_ptr other_obj
-                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                         ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC (());
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-  virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 #endif /* TAO_HAS_MINIMUM_CORBA */
   virtual void *_tao_QueryInterface(ptr_arith_t type);
 
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
index ffb35bb4320..8d4d5b2aa33 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
@@ -18,26 +18,26 @@ TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator (void)
 
 void
 TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
-                                                 TAO_ENV_ARG_DECL)
+                                                 ACE_ENV_ARG_DECL)
 {
 #if (TAO_HAS_MINIMUM_POA == 0)
   CORBA::Policy_var policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_SERVANT_RETENTION);
   PortableServer::ServantRetentionPolicy_var srp =
     PortableServer::ServantRetentionPolicy::_narrow (policy.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ServantRetentionPolicyValue servant_retention =
-    srp->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+    srp->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   policy = policies.get_cached_policy (TAO_CACHED_POLICY_REQUEST_PROCESSING);
   PortableServer::RequestProcessingPolicy_var rpp =
     PortableServer::RequestProcessingPolicy::_narrow (policy.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::RequestProcessingPolicyValue request_processing =
-    rpp->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+    rpp->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // The NON_RETAIN policy requires either the USE_DEFAULT_SERVANT or
@@ -56,29 +56,29 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
   policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_UNIQUENESS);
   PortableServer::IdUniquenessPolicy_var iup =
     PortableServer::IdUniquenessPolicy::_narrow (policy.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::IdUniquenessPolicyValue id_uniqueness =
-    iup->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+    iup->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 
   policy = policies.get_cached_policy (TAO_CACHED_POLICY_IMPLICIT_ACTIVATION);
   PortableServer::ImplicitActivationPolicy_var iap =
     PortableServer::ImplicitActivationPolicy::_narrow (policy.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ImplicitActivationPolicyValue implicit_activation =
-    iap->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+    iap->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   policy = policies.get_cached_policy (TAO_CACHED_POLICY_ID_ASSIGNMENT);
   PortableServer::IdAssignmentPolicy_var idap =
     PortableServer::IdAssignmentPolicy::_narrow (policy.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::IdAssignmentPolicyValue id_assignment =
-    idap->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+    idap->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 
@@ -94,7 +94,7 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
       ACE_THROW (PortableServer::POA::InvalidPolicy ());
 #else /* TAO_HAS_MINIMUM_POA == 0 */
   ACE_UNUSED_ARG (policies);
-  TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
+  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 }
 
@@ -113,6 +113,6 @@ TAO_POA_Default_Policy_Validator::legal_policy_impl (CORBA::PolicyType type)
 
 void
 TAO_POA_Default_Policy_Validator::merge_policies_impl (TAO_Policy_Set &
-                                                       TAO_ENV_ARG_DECL_NOT_USED)
+                                                       ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h
index 5dcbf878594..873b830f335 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.h
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.h
@@ -41,11 +41,11 @@ protected:
    * if that is not the case.
    */
   void validate_impl (TAO_Policy_Set &policies
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
   /// Add/merge policies.
   void merge_policies_impl (TAO_Policy_Set &policies
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
   /**
    * Return whether the specified policy type is legal for the
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index b4aea740b64..8d837738eee 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -13,11 +13,11 @@ void
 TAO_Default_Servant_Dispatcher::dispatch (
   TAO_Object_Adapter::Servant_Upcall &servant_upcall,
   TAO_ServerRequest &req
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   servant_upcall.servant ()->_dispatch (req,
                                         &servant_upcall
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_POA *
@@ -29,7 +29,7 @@ TAO_Default_Servant_Dispatcher::create_POA (const ACE_CString &name,
                                             TAO_SYNCH_MUTEX &thread_lock,
                                             TAO_ORB_Core &orb_core,
                                             TAO_Object_Adapter *object_adapter
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
 {
   TAO_POA *poa;
 
@@ -42,7 +42,7 @@ TAO_Default_Servant_Dispatcher::create_POA (const ACE_CString &name,
                              thread_lock,
                              orb_core,
                              object_adapter
-                             TAO_ENV_ARG_PARAMETER),
+                             ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
index 339747a9645..0c4ac669529 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
@@ -40,7 +40,7 @@ public:
   /// Dispatch the request to the servant.
   virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
                          TAO_ServerRequest &req
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
 
   /// Factory method for creating new POA's.
   virtual TAO_POA *create_POA (const ACE_CString &name,
@@ -51,7 +51,7 @@ public:
                                TAO_SYNCH_MUTEX &thread_lock,
                                TAO_ORB_Core &orb_core,
                                TAO_Object_Adapter *object_adapter
-                               TAO_ENV_ARG_DECL);
+                               ACE_ENV_ARG_DECL);
 };
 
 #include "ace/post.h"
diff --git a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
index c86f002de75..78e69462db7 100644
--- a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
+++ b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.cpp
@@ -20,11 +20,11 @@ TAO_Direct_Object_Proxy_Impl::~TAO_Direct_Object_Proxy_Impl (void)
 CORBA::Boolean
 TAO_Direct_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
                                      const CORBA::Char *logical_type_id
-                                     TAO_ENV_ARG_DECL )
+                                     ACE_ENV_ARG_DECL )
 {
 
   return target->_servant ()->_is_a (logical_type_id
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -32,13 +32,13 @@ TAO_Direct_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
 
 CORBA::Boolean
 TAO_Direct_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean _tao_retval = 0;
   ACE_TRY
     {
       if (target->_servant () != 0)
-        return target->_servant ()->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+        return target->_servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       // @@ Maybe we want to change this exception...
       ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
@@ -58,12 +58,12 @@ TAO_Direct_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
 
 CORBA_InterfaceDef_ptr
 TAO_Direct_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       if (target->_servant () != 0)
-        return target->_servant ()->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+        return target->_servant ()->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       // @@ Maybe we want to change this exception...
       ACE_THROW_RETURN (CORBA::INV_OBJREF (), 0);
diff --git a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h
index bb6927fdad3..1a9390437f2 100644
--- a/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h
+++ b/TAO/tao/PortableServer/Direct_Object_Proxy_Impl.h
@@ -51,16 +51,16 @@ public:
 
   virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,
                                 const CORBA::Char *logical_type_id
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
   virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target
-                                        TAO_ENV_ARG_DECL);
+                                        ACE_ENV_ARG_DECL);
 
   virtual CORBA_InterfaceDef_ptr _get_interface (
       const CORBA::Object_ptr target
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/IORInfo.cpp b/TAO/tao/PortableServer/IORInfo.cpp
index e8feb18d2fc..90753275567 100644
--- a/TAO/tao/PortableServer/IORInfo.cpp
+++ b/TAO/tao/PortableServer/IORInfo.cpp
@@ -25,7 +25,7 @@ TAO_IORInfo::~TAO_IORInfo (void)
 
 CORBA::Policy_ptr
 TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::PolicyList *policy_list =
@@ -38,7 +38,7 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
     {
       CORBA::PolicyType pt =
         (*policy_list)[i]->policy_type (
-          TAO_ENV_SINGLE_ARG_PARAMETER);
+          ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
       if (pt == type)
@@ -55,7 +55,7 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
 
 void
 TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Priyanka, why aren't you using the following:
@@ -64,7 +64,7 @@ TAO_IORInfo::add_ior_component (const IOP::TaggedComponent &component
 
   // Add the given tagged component to all profiles.
   this->poa_->save_ior_component (component
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -72,7 +72,7 @@ void
 TAO_IORInfo::add_ior_component_to_profile (
     const IOP::TaggedComponent &component,
     IOP::ProfileId profile_id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the given tagged component to all profiles matching the given
@@ -83,26 +83,26 @@ TAO_IORInfo::add_ior_component_to_profile (
   //    ?!!!?
   this->poa_->save_ior_component_and_profile_id (component,
                                                  profile_id
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableInterceptor::AdapterManagerId
-TAO_IORInfo::manager_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_IORInfo::manager_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->poa_->get_manager_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->poa_->get_manager_id (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableInterceptor::AdapterState
-TAO_IORInfo::state (TAO_ENV_SINGLE_ARG_DECL)
+TAO_IORInfo::state (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->poa_->get_adapter_state (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->poa_->get_adapter_state (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableInterceptor::ObjectReferenceTemplate *
-TAO_IORInfo::adapter_template (TAO_ENV_SINGLE_ARG_DECL)
+TAO_IORInfo::adapter_template (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /* Returns Object Reference Template whenever an IOR Interceptor is
@@ -125,7 +125,7 @@ TAO_IORInfo::adapter_template (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 PortableInterceptor::ObjectReferenceFactory *
-TAO_IORInfo::current_factory (TAO_ENV_SINGLE_ARG_DECL)
+TAO_IORInfo::current_factory (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /* Returns the current_factory that is used to create the object
@@ -143,17 +143,17 @@ TAO_IORInfo::current_factory (TAO_ENV_SINGLE_ARG_DECL)
                                               CORBA::COMPLETED_NO),
                         0);
     }
-    
+
   return adapter_factory;
 }
 
 void
 TAO_IORInfo::current_factory (
     PortableInterceptor::ObjectReferenceFactory * current_factory
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->poa_->set_obj_ref_factory (current_factory
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tao/PortableServer/IORInfo.h b/TAO/tao/PortableServer/IORInfo.h
index 2477742fae7..4c399535dfb 100644
--- a/TAO/tao/PortableServer/IORInfo.h
+++ b/TAO/tao/PortableServer/IORInfo.h
@@ -62,21 +62,21 @@ public:
   TAO_IORInfo (TAO_ORB_Core *orb_core,
                TAO_POA *poa);
 
-  /*	       TAO_MProfile &mp,
-	       CORBA::PolicyList *policy_list);
+  /*           TAO_MProfile &mp,
+               CORBA::PolicyList *policy_list);
   */
 
   /// Return the policy matching the given policy type that is in
   /// effect for the object whose IOR is being created.
   virtual CORBA::Policy_ptr get_effective_policy (
       CORBA::PolicyType type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the given tagged component to all profiles.
   virtual void add_ior_component (
       const IOP::TaggedComponent & component
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the given tagged component to all profiles matching the given
@@ -84,28 +84,28 @@ public:
   virtual void add_ior_component_to_profile (
       const IOP::TaggedComponent & component,
       IOP::ProfileId profile_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual PortableInterceptor::AdapterManagerId manager_id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual PortableInterceptor::AdapterState state (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual PortableInterceptor::ObjectReferenceTemplate * adapter_template (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual PortableInterceptor::ObjectReferenceFactory * current_factory (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void current_factory (
       PortableInterceptor::ObjectReferenceFactory * current_factory
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index b11c3aff750..039d9c077a7 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -150,10 +150,10 @@ ImplementationRepository::ServerObject_var::tao_nil (void)
 ::ImplementationRepository::ServerObject_ptr
 ImplementationRepository::ServerObject_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::ImplementationRepository::ServerObject::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::ImplementationRepository::ServerObject::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -230,21 +230,21 @@ public:
   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -258,30 +258,30 @@ private:
 TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -289,13 +289,13 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (TA
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -307,21 +307,21 @@ public:
   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -335,30 +335,30 @@ private:
 TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -366,13 +366,13 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -394,7 +394,7 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::_TAO_ServerObject
 
 void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -436,7 +436,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
       TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -452,7 +452,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -464,17 +464,17 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -490,7 +490,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -504,7 +504,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -514,12 +514,12 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -530,7 +530,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -546,7 +546,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
 
 void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -588,7 +588,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
       TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -604,7 +604,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -616,17 +616,17 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -642,7 +642,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -656,7 +656,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -666,12 +666,12 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -682,7 +682,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -737,7 +737,7 @@ ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::~_TAO_ServerObj
 ImplementationRepository::_TAO_ServerObject_Proxy_Impl&
 ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::select_proxy (
   ::ImplementationRepository::ServerObject *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -778,24 +778,24 @@ void ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_voi
 
 ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ServerObject::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerObject:1.0"TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerObject:1.0"ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ServerObject::_nil ());
       if (is_a == 0)
         return ServerObject::_nil ();
     }
-  return ServerObject::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ServerObject::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObject::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -864,14 +864,14 @@ ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj)
   return obj;
 }
 
-CORBA::Boolean ImplementationRepository::ServerObject::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean ImplementationRepository::ServerObject::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t type)
@@ -896,36 +896,36 @@ const char* ImplementationRepository::ServerObject::_interface_repository_id (vo
 }
 
 void ImplementationRepository::ServerObject::ping (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ServerObject_Proxy_Impl &proxy =
-    this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.ping (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::ServerObject::shutdown (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ServerObject_Proxy_Impl &proxy =
-    this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.shutdown (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -2144,10 +2144,10 @@ ImplementationRepository::Administration_var::tao_nil (void)
 ::ImplementationRepository::Administration_ptr
 ImplementationRepository::Administration_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::ImplementationRepository::Administration::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::ImplementationRepository::Administration::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2225,21 +2225,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2255,19 +2255,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::T
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * server
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     server_ (server)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2283,12 +2283,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::a
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -2312,13 +2312,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::e
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2332,21 +2332,21 @@ public:
       CORBA::Object_ptr _tao_target,
       const char * server,
       const ImplementationRepository::StartupOptions & options
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2364,7 +2364,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::T
     CORBA::Object_ptr _tao_target,
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     server_ (server),
@@ -2372,12 +2372,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::T
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2396,12 +2396,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::a
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -2424,13 +2424,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::e
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2444,21 +2444,21 @@ public:
       CORBA::Object_ptr _tao_target,
       const char * server,
       const ImplementationRepository::StartupOptions & options
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2476,7 +2476,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server:
     CORBA::Object_ptr _tao_target,
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     server_ (server),
@@ -2484,12 +2484,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2508,12 +2508,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server:
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -2521,13 +2521,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server:
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2540,21 +2540,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2570,19 +2570,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::TAO
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * server
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     server_ (server)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2598,12 +2598,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arg
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -2626,13 +2626,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exc
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2645,21 +2645,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2675,19 +2675,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::T
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * server
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     server_ (server)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2703,12 +2703,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::a
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -2731,13 +2731,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::e
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2752,21 +2752,21 @@ public:
       const char * server,
       const char * addr,
       ImplementationRepository::ServerObject_ptr server_object
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2788,7 +2788,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
     const char * server,
     const char * addr,
     ImplementationRepository::ServerObject_ptr server_object
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     server_ (server),
@@ -2797,12 +2797,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2824,12 +2824,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -2852,13 +2852,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running:
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2881,21 +2881,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -2911,19 +2911,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * server
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     server_ (server)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2939,12 +2939,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -2967,13 +2967,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2986,21 +2986,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const char * server
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3016,19 +3016,19 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::TAO_ClientRe
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const char * server
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     server_ (server)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3044,12 +3044,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (T
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -3072,13 +3072,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3092,21 +3092,21 @@ public:
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & how_many
 
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -3124,7 +3124,7 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRe
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & how_many
 
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     how_many_ (how_many)
@@ -3132,12 +3132,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRe
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3154,12 +3154,12 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (T
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -3167,13 +3167,13 @@ TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions (
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3196,7 +3196,7 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::_TAO_Administra
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -3253,7 +3253,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
         &_tao_call,
         _collocated_tao_target_,
         server
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -3269,7 +3269,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3281,12 +3281,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -3299,7 +3299,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
             );
 
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3315,7 +3315,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3329,7 +3329,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3339,12 +3339,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3355,7 +3355,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3373,7 +3373,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
     CORBA_Object *_collocated_tao_target_,
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -3426,7 +3426,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
         _collocated_tao_target_,
         server,
         options
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -3442,7 +3442,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3454,12 +3454,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -3473,7 +3473,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
             );
 
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3489,7 +3489,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3503,7 +3503,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3513,12 +3513,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3529,7 +3529,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3547,7 +3547,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
     CORBA_Object *_collocated_tao_target_,
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3591,7 +3591,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
         _collocated_tao_target_,
         server,
         options
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -3607,7 +3607,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3619,12 +3619,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -3638,7 +3638,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3654,7 +3654,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3668,7 +3668,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3678,12 +3678,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3694,7 +3694,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3711,7 +3711,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -3763,7 +3763,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
         &_tao_call,
         _collocated_tao_target_,
         server
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -3779,7 +3779,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3791,12 +3791,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -3809,7 +3809,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
             );
 
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3825,7 +3825,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -3839,7 +3839,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3849,12 +3849,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3865,7 +3865,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -3882,7 +3882,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -3934,7 +3934,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
         &_tao_call,
         _collocated_tao_target_,
         server
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -3950,7 +3950,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -3962,12 +3962,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -3980,7 +3980,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
             );
 
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -3996,7 +3996,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4010,7 +4010,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4020,12 +4020,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4036,7 +4036,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4055,7 +4055,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
     const char * server,
     const char * addr,
     ImplementationRepository::ServerObject_ptr server_object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -4109,7 +4109,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
         server,
         addr,
         server_object
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN (0);
 
@@ -4125,7 +4125,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4137,12 +4137,12 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
@@ -4158,7 +4158,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
             );
 
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4175,7 +4175,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4203,7 +4203,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4213,12 +4213,12 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4229,7 +4229,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
     ACE_CHECK_RETURN (0);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4246,7 +4246,7 @@ return _tao_safe_retval._retn ();
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_shutting_down (
     CORBA_Object *_collocated_tao_target_,
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -4298,7 +4298,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
         &_tao_call,
         _collocated_tao_target_,
         server
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -4314,7 +4314,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4326,12 +4326,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -4344,7 +4344,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
             );
 
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4360,7 +4360,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4374,7 +4374,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4384,12 +4384,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4400,7 +4400,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4418,7 +4418,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
     CORBA_Object *_collocated_tao_target_,
     const char * server,
     ImplementationRepository::ServerInformation_out info
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -4475,7 +4475,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
         &_tao_call,
         _collocated_tao_target_,
         server
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -4491,7 +4491,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4503,12 +4503,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -4521,7 +4521,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
             );
 
           _invoke_status =
-            _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4537,7 +4537,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4561,7 +4561,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4571,12 +4571,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4587,7 +4587,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4606,7 +4606,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
     ImplementationRepository::ServerInformationIterator_out server_iterator
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4655,7 +4655,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
         _collocated_tao_target_,
         how_many
 
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -4671,7 +4671,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4683,12 +4683,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
@@ -4701,7 +4701,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -4717,7 +4717,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -4742,7 +4742,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -4752,12 +4752,12 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4768,7 +4768,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -4823,7 +4823,7 @@ ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::~_TAO_Adminis
 ImplementationRepository::_TAO_Administration_Proxy_Impl&
 ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::select_proxy (
   ::ImplementationRepository::Administration *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -4864,24 +4864,24 @@ void ImplementationRepository::Administration::_tao_any_destructor (void *_tao_v
 
 ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return Administration::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/Administration:1.0"TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/Administration:1.0"ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (Administration::_nil ());
       if (is_a == 0)
         return Administration::_nil ();
     }
-  return Administration::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return Administration::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 ImplementationRepository::Administration_ptr ImplementationRepository::Administration::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4950,14 +4950,14 @@ ImplementationRepository::Administration::_duplicate (Administration_ptr obj)
   return obj;
 }
 
-CORBA::Boolean ImplementationRepository::Administration::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean ImplementationRepository::Administration::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/Administration:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t type)
@@ -5033,7 +5033,7 @@ void ImplementationRepository::Administration::AlreadyRegistered::_raise ()
 
 void ImplementationRepository::Administration::AlreadyRegistered::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -5046,7 +5046,7 @@ void ImplementationRepository::Administration::AlreadyRegistered::_tao_encode (
 
 void ImplementationRepository::Administration::AlreadyRegistered::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -5167,7 +5167,7 @@ void ImplementationRepository::Administration::CannotActivate::_raise ()
 
 void ImplementationRepository::Administration::CannotActivate::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -5180,7 +5180,7 @@ void ImplementationRepository::Administration::CannotActivate::_tao_encode (
 
 void ImplementationRepository::Administration::CannotActivate::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -5310,7 +5310,7 @@ void ImplementationRepository::Administration::NotFound::_raise ()
 
 void ImplementationRepository::Administration::NotFound::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -5323,7 +5323,7 @@ void ImplementationRepository::Administration::NotFound::_tao_encode (
 
 void ImplementationRepository::Administration::NotFound::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -5388,7 +5388,7 @@ CORBA::TypeCode_ptr ImplementationRepository::Administration::NotFound::_type (v
 
 void ImplementationRepository::Administration::activate_server (
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -5397,20 +5397,20 @@ void ImplementationRepository::Administration::activate_server (
   ))
 {
   _TAO_Administration_Proxy_Impl &proxy =
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.activate_server (
       this,
       server
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::Administration::register_server (
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -5418,41 +5418,41 @@ void ImplementationRepository::Administration::register_server (
   ))
 {
   _TAO_Administration_Proxy_Impl &proxy =
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.register_server (
       this,
       server,
       options
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::Administration::reregister_server (
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_Administration_Proxy_Impl &proxy =
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.reregister_server (
       this,
       server,
       options
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::Administration::remove_server (
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -5460,19 +5460,19 @@ void ImplementationRepository::Administration::remove_server (
   ))
 {
   _TAO_Administration_Proxy_Impl &proxy =
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.remove_server (
       this,
       server
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::Administration::shutdown_server (
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -5480,13 +5480,13 @@ void ImplementationRepository::Administration::shutdown_server (
   ))
 {
   _TAO_Administration_Proxy_Impl &proxy =
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.shutdown_server (
       this,
       server
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5494,7 +5494,7 @@ char * ImplementationRepository::Administration::server_is_running (
     const char * server,
     const char * addr,
     ImplementationRepository::ServerObject_ptr server_object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -5502,7 +5502,7 @@ char * ImplementationRepository::Administration::server_is_running (
   ))
 {
   _TAO_Administration_Proxy_Impl &proxy =
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.server_is_running (
@@ -5510,13 +5510,13 @@ char * ImplementationRepository::Administration::server_is_running (
       server,
       addr,
       server_object
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::Administration::server_is_shutting_down (
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -5524,20 +5524,20 @@ void ImplementationRepository::Administration::server_is_shutting_down (
   ))
 {
   _TAO_Administration_Proxy_Impl &proxy =
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.server_is_shutting_down (
       this,
       server
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::Administration::find (
     const char * server,
     ImplementationRepository::ServerInformation_out info
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -5545,14 +5545,14 @@ void ImplementationRepository::Administration::find (
   ))
 {
   _TAO_Administration_Proxy_Impl &proxy =
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.find (
       this,
       server,
       info
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5560,14 +5560,14 @@ void ImplementationRepository::Administration::list (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
     ImplementationRepository::ServerInformationIterator_out server_iterator
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_Administration_Proxy_Impl &proxy =
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.list (
@@ -5575,7 +5575,7 @@ void ImplementationRepository::Administration::list (
       how_many,
       server_list,
       server_iterator
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -5726,10 +5726,10 @@ ImplementationRepository::ServerInformationIterator_var::tao_nil (void)
 ::ImplementationRepository::ServerInformationIterator_ptr
 ImplementationRepository::ServerInformationIterator_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::ImplementationRepository::ServerInformationIterator::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::ImplementationRepository::ServerInformationIterator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5807,21 +5807,21 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & how_many
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5839,19 +5839,19 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & how_many
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
     how_many_ (how_many)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5867,12 +5867,12 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -5880,13 +5880,13 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5908,21 +5908,21 @@ public:
   TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target
-      TAO_ENV_ARG_DECL);
+      ACE_ENV_ARG_DECL);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL)
+      ACE_ENV_SINGLE_ARG_DECL)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -5936,30 +5936,30 @@ private:
 TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -5967,13 +5967,13 @@ TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
 
 
 CORBA::Any *
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -5997,7 +5997,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6046,7 +6046,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
         &_tao_call,
         _collocated_tao_target_,
         how_many
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK_RETURN  (_tao_retval);
 
@@ -6062,7 +6062,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6074,12 +6074,12 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
@@ -6093,7 +6093,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
             );
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6110,7 +6110,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6138,7 +6138,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6148,12 +6148,12 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6164,7 +6164,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
     ACE_CHECK_RETURN  (_tao_retval);
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK_RETURN  (_tao_retval);
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6180,7 +6180,7 @@ return _tao_retval;
 
 void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::destroy (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6222,7 +6222,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
       TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri (
         &_tao_call,
         _collocated_tao_target_
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
       ACE_CHECK;
 
@@ -6238,7 +6238,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
         {
           _tao_vfr.send_request (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6250,17 +6250,17 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag)
-              TAO_ENV_ARG_PARAMETER
+              ACE_ENV_ARG_PARAMETER
             );
           TAO_INTERCEPTOR_CHECK;
 
           _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           TAO_INTERCEPTOR_CHECK;
 
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
@@ -6276,7 +6276,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
                 ri.reply_status (_invoke_status);
                 _tao_vfr.receive_other (
                   &ri
-                  TAO_ENV_ARG_PARAMETER
+                  ACE_ENV_ARG_PARAMETER
                 );
                 ACE_TRY_CHECK;
               )
@@ -6290,7 +6290,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
           ri.reply_status (_invoke_status);
           _tao_vfr.receive_reply (
             &ri
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
           ACE_TRY_CHECK;
 
@@ -6300,12 +6300,12 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
         ri.exception (&ACE_ANY_EXCEPTION);
         _tao_vfr.receive_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
         ACE_TRY_CHECK;
 
         PortableInterceptor::ReplyStatus _tao_status =
-          ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6316,7 +6316,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
     ACE_CHECK;
 
     PortableInterceptor::ReplyStatus _tao_status =
-      ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     if (_tao_status == PortableInterceptor::LOCATION_FORWARD
@@ -6371,7 +6371,7 @@ ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::~_
 ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl&
 ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::select_proxy (
   ::ImplementationRepository::ServerInformationIterator *
-  TAO_ENV_ARG_DECL_NOT_USED
+  ACE_ENV_ARG_DECL_NOT_USED
 )
 {
   return this->remote_proxy_impl_;
@@ -6412,24 +6412,24 @@ void ImplementationRepository::ServerInformationIterator::_tao_any_destructor (v
 
 ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (CORBA::is_nil (obj))
     return ServerInformationIterator::_nil ();
   if (! obj->_is_local ())
     {
-      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerInformationIterator:1.0"TAO_ENV_ARG_PARAMETER);
+      CORBA::Boolean is_a = obj->_is_a ("IDL:ImplementationRepository/ServerInformationIterator:1.0"ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (ServerInformationIterator::_nil ());
       if (is_a == 0)
         return ServerInformationIterator::_nil ();
     }
-  return ServerInformationIterator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ServerInformationIterator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -6498,14 +6498,14 @@ ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformati
   return obj;
 }
 
-CORBA::Boolean ImplementationRepository::ServerInformationIterator::_is_a (const CORBA::Char *value TAO_ENV_ARG_DECL)
+CORBA::Boolean ImplementationRepository::ServerInformationIterator::_is_a (const CORBA::Char *value ACE_ENV_ARG_DECL)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:ImplementationRepository/ServerInformationIterator:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
-    return this->CORBA_Object::_is_a (value TAO_ENV_ARG_PARAMETER);
+    return this->CORBA_Object::_is_a (value ACE_ENV_ARG_PARAMETER);
 }
 
 void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (ptr_arith_t type)
@@ -6532,38 +6532,38 @@ const char* ImplementationRepository::ServerInformationIterator::_interface_repo
 CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ServerInformationIterator_Proxy_Impl &proxy =
-    this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return proxy.next_n (
       this,
       how_many,
       server_list
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
 void ImplementationRepository::ServerInformationIterator::destroy (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   _TAO_ServerInformationIterator_Proxy_Impl &proxy =
-    this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this TAO_ENV_ARG_PARAMETER);
+    this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   proxy.destroy (
       this
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 }
 
@@ -6632,7 +6632,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     _tao_elem = ImplementationRepository::ServerObject::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -6707,7 +6707,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -6798,7 +6798,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -6861,7 +6861,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -6921,7 +6921,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -7004,7 +7004,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -7095,7 +7095,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -7164,7 +7164,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     _tao_elem = ImplementationRepository::Administration::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -7242,7 +7242,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -7332,7 +7332,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -7422,7 +7422,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -7495,7 +7495,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     _tao_elem = ImplementationRepository::ServerInformationIterator::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -7556,7 +7556,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       ImplementationRepository::ServerObject::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -7676,7 +7676,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       ImplementationRepository::Administration::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
@@ -7712,7 +7712,7 @@ CORBA::Boolean operator>> (
     _tao_objref =
       ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
           obj.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
     ACE_TRY_CHECK;
     return 1;
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index 83789055066..19239e80f9b 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -104,7 +104,7 @@ TAO_NAMESPACE  ImplementationRepository
     static ServerObject_ptr tao_nil (void);
     static ServerObject_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -168,12 +168,12 @@ TAO_NAMESPACE  ImplementationRepository
 
     static ServerObject_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ServerObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ServerObject_ptr _nil (void)
@@ -184,14 +184,14 @@ TAO_NAMESPACE  ImplementationRepository
     static void _tao_any_destructor (void*);
 
     virtual void ping (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual void shutdown (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -199,7 +199,7 @@ TAO_NAMESPACE  ImplementationRepository
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -249,7 +249,7 @@ TAO_NAMESPACE  ImplementationRepository
     virtual ~_TAO_ServerObject_Proxy_Impl (void) { }
     virtual void ping (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -257,7 +257,7 @@ TAO_NAMESPACE  ImplementationRepository
 
     virtual void shutdown (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -287,7 +287,7 @@ TAO_NAMESPACE  ImplementationRepository
     virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) { }
     virtual void ping (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -295,7 +295,7 @@ TAO_NAMESPACE  ImplementationRepository
 
     virtual void shutdown (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -324,7 +324,7 @@ TAO_NAMESPACE  ImplementationRepository
     virtual ~_TAO_ServerObject_Proxy_Broker (void);
     virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
         ServerObject *object
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
 
   protected:
@@ -351,7 +351,7 @@ TAO_NAMESPACE  ImplementationRepository
 
     virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
         ServerObject *object
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
   private:
@@ -961,7 +961,7 @@ TAO_NAMESPACE  ImplementationRepository
     static ServerInformationIterator_ptr tao_nil (void);
     static ServerInformationIterator_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1040,7 +1040,7 @@ TAO_NAMESPACE  ImplementationRepository
     static Administration_ptr tao_nil (void);
     static Administration_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1104,12 +1104,12 @@ TAO_NAMESPACE  ImplementationRepository
 
     static Administration_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static Administration_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static Administration_ptr _nil (void)
@@ -1144,12 +1144,12 @@ TAO_NAMESPACE  ImplementationRepository
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static AlreadyRegistered *_downcast (CORBA::Exception *);
@@ -1191,12 +1191,12 @@ static CORBA::TypeCode_ptr _tc_AlreadyRegistered;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static CannotActivate *_downcast (CORBA::Exception *);
@@ -1240,12 +1240,12 @@ static CORBA::TypeCode_ptr _tc_CannotActivate;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static NotFound *_downcast (CORBA::Exception *);
@@ -1263,7 +1263,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
 
     virtual void activate_server (
         const char * server
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1274,7 +1274,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual void register_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1284,7 +1284,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual void reregister_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1292,7 +1292,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
 
     virtual void remove_server (
         const char * server
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1301,7 +1301,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
 
     virtual void shutdown_server (
         const char * server
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1312,7 +1312,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         const char * server,
         const char * addr,
         ImplementationRepository::ServerObject_ptr server_object
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1321,7 +1321,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
 
     virtual void server_is_shutting_down (
         const char * server
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1331,7 +1331,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual void find (
         const char * server,
         ImplementationRepository::ServerInformation_out info
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1342,7 +1342,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
         ImplementationRepository::ServerInformationIterator_out server_iterator
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1350,7 +1350,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -1401,7 +1401,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual void activate_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1413,7 +1413,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         CORBA_Object *_collocated_tao_target_,
         const char * server,
         const ImplementationRepository::StartupOptions & options
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1424,7 +1424,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         CORBA_Object *_collocated_tao_target_,
         const char * server,
         const ImplementationRepository::StartupOptions & options
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1433,7 +1433,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual void remove_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1443,7 +1443,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual void shutdown_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1455,7 +1455,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         const char * server,
         const char * addr,
         ImplementationRepository::ServerObject_ptr server_object
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1465,7 +1465,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual void server_is_shutting_down (
         CORBA_Object *_collocated_tao_target_,
         const char * server
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1476,7 +1476,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         CORBA_Object *_collocated_tao_target_,
         const char * server,
         ImplementationRepository::ServerInformation_out info
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1488,7 +1488,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
         ImplementationRepository::ServerInformationIterator_out server_iterator
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1519,7 +1519,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual void activate_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1531,7 +1531,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         CORBA_Object *_collocated_tao_target_,
         const char * server,
         const ImplementationRepository::StartupOptions & options
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1542,7 +1542,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         CORBA_Object *_collocated_tao_target_,
         const char * server,
         const ImplementationRepository::StartupOptions & options
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1551,7 +1551,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual void remove_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1561,7 +1561,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual void shutdown_server (
         CORBA_Object *_collocated_tao_target_,
         const char * server
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1573,7 +1573,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         const char * server,
         const char * addr,
         ImplementationRepository::ServerObject_ptr server_object
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1583,7 +1583,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual void server_is_shutting_down (
         CORBA_Object *_collocated_tao_target_,
         const char * server
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1594,7 +1594,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         CORBA_Object *_collocated_tao_target_,
         const char * server,
         ImplementationRepository::ServerInformation_out info
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1606,7 +1606,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
         ImplementationRepository::ServerInformationIterator_out server_iterator
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1635,7 +1635,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual ~_TAO_Administration_Proxy_Broker (void);
     virtual _TAO_Administration_Proxy_Impl &select_proxy (
         Administration *object
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
 
   protected:
@@ -1662,7 +1662,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
 
     virtual _TAO_Administration_Proxy_Impl &select_proxy (
         Administration *object
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
   private:
@@ -1710,12 +1710,12 @@ static CORBA::TypeCode_ptr _tc_NotFound;
 
     static ServerInformationIterator_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ServerInformationIterator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ServerInformationIterator_ptr _nil (void)
@@ -1728,14 +1728,14 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual CORBA::Boolean next_n (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     virtual void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1743,7 +1743,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
 
     virtual CORBA::Boolean _is_a (
         const CORBA::Char *type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
@@ -1795,7 +1795,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         CORBA_Object *_collocated_tao_target_,
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1803,7 +1803,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
 
     virtual void destroy (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1835,7 +1835,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
         CORBA_Object *_collocated_tao_target_,
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1843,7 +1843,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
 
     virtual void destroy (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1872,7 +1872,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
     virtual ~_TAO_ServerInformationIterator_Proxy_Broker (void);
     virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
         ServerInformationIterator *object
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       ) = 0;
 
   protected:
@@ -1899,7 +1899,7 @@ static CORBA::TypeCode_ptr _tc_NotFound;
 
     virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
         ServerInformationIterator *object
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
   private:
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index a5339a82670..38a7ee435f5 100644
--- a/TAO/tao/PortableServer/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -50,10 +50,10 @@ tao_ImplementationRepository_ServerObject_nil (
 ACE_INLINE ImplementationRepository::ServerObject_ptr
 tao_ImplementationRepository_ServerObject_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ImplementationRepository::ServerObject::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ImplementationRepository::ServerObject::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1490,10 +1490,10 @@ tao_ImplementationRepository_Administration_nil (
 ACE_INLINE ImplementationRepository::Administration_ptr
 tao_ImplementationRepository_Administration_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ImplementationRepository::Administration::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ImplementationRepository::Administration::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1551,10 +1551,10 @@ tao_ImplementationRepository_ServerInformationIterator_nil (
 ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
 tao_ImplementationRepository_ServerInformationIterator_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ImplementationRepository::ServerInformationIterator::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ImplementationRepository::ServerInformationIterator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index b5c96026e3c..137f40dfade 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -160,31 +160,31 @@ public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *tao_impl
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -201,31 +201,31 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ServerRequ
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::ServerObject *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -233,13 +233,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (TA
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -247,7 +247,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (TAO_EN
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -257,10 +257,10 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_most_de
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ServerRequestInfo
@@ -269,31 +269,31 @@ public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerObject *tao_impl
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -310,31 +310,31 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_Server
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::ServerObject *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -342,13 +342,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -356,7 +356,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (TA
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -366,10 +366,10 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_mos
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -402,17 +402,17 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::~_TAO_
 ImplementationRepository::_TAO_ServerObject_Proxy_Impl&
 POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::select_proxy (
     ::ImplementationRepository::ServerObject *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -422,7 +422,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::select
 void
 POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -501,7 +501,7 @@ POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::_TAO_ServerO
 
 void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -515,7 +515,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
       _collocated_tao_target_->_object_key (),
       "ping",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -524,14 +524,14 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
           "IDL:ImplementationRepository/ServerObject:1.0"
         )
     )->ping (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
   return;
 }
 
 void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -545,7 +545,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdow
       _collocated_tao_target_->_object_key (),
       "shutdown",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -554,7 +554,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdow
           "IDL:ImplementationRepository/ServerObject:1.0"
         )
     )->shutdown (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
   return;
 }
@@ -573,7 +573,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::_TAO_ServerOb
 
 void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping  (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -583,14 +583,14 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping  (
       POA_ImplementationRepository::ServerObject_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0")
     )->ping (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
 
 }
 
 void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown  (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -600,7 +600,7 @@ void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown
       POA_ImplementationRepository::ServerObject_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0")
     )->shutdown (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
 
 }
@@ -629,7 +629,7 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_ImplementationRepository::ServerObject *_tao_impl =
@@ -650,24 +650,24 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->ping (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -675,12 +675,12 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -701,7 +701,7 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_ImplementationRepository::ServerObject *_tao_impl =
@@ -722,24 +722,24 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->shutdown (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -747,12 +747,12 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -773,7 +773,7 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -783,7 +783,7 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in ()TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -796,11 +796,11 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -813,7 +813,7 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _tao_object_reference;
@@ -832,7 +832,7 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -859,10 +859,10 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
 
 CORBA::Boolean POA_ImplementationRepository::ServerObject::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -884,12 +884,12 @@ void* POA_ImplementationRepository::ServerObject::_downcast (
   return 0;
 }
 
-void POA_ImplementationRepository::ServerObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_ImplementationRepository::ServerObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -899,9 +899,9 @@ const char* POA_ImplementationRepository::ServerObject::_interface_repository_id
 }
 
 ImplementationRepository::ServerObject*
-POA_ImplementationRepository::ServerObject::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -1045,31 +1045,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
     const char * server
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1088,7 +1088,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::T
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1096,12 +1096,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::T
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1117,12 +1117,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::a
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -1146,13 +1146,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1160,7 +1160,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::r
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1170,10 +1170,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::t
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo
@@ -1185,31 +1185,31 @@ public:
     ,
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1230,7 +1230,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::T
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1239,12 +1239,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::T
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1263,12 +1263,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::a
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -1291,13 +1291,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1305,7 +1305,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::r
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1315,10 +1315,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::t
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo
@@ -1330,31 +1330,31 @@ public:
     ,
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1375,7 +1375,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1384,12 +1384,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1408,12 +1408,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -1421,13 +1421,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1435,7 +1435,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1445,10 +1445,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo
@@ -1459,31 +1459,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
     const char * server
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1502,7 +1502,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1510,12 +1510,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1531,12 +1531,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arg
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -1559,13 +1559,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1573,7 +1573,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::res
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1583,10 +1583,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::tar
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo
@@ -1597,31 +1597,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
     const char * server
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1640,7 +1640,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::T
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1648,12 +1648,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::T
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1669,12 +1669,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::a
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -1697,13 +1697,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1711,7 +1711,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::r
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1721,10 +1721,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::t
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo
@@ -1737,31 +1737,31 @@ public:
     const char * server,
     const char * addr,
     ImplementationRepository::ServerObject_ptr server_object
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (char * result);
@@ -1785,7 +1785,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
     const char * server,
     const char * addr,
     ImplementationRepository::ServerObject_ptr server_object
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1795,12 +1795,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1822,12 +1822,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -1850,13 +1850,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1868,7 +1868,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1878,10 +1878,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1899,31 +1899,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
     const char * server
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1942,7 +1942,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1950,12 +1950,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1971,12 +1971,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -1999,13 +1999,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2013,7 +2013,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2023,10 +2023,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo
@@ -2037,31 +2037,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::Administration *tao_impl
     ,
     const char * server
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -2080,7 +2080,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRe
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2088,12 +2088,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2109,12 +2109,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (T
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
@@ -2137,13 +2137,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2151,7 +2151,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (TAO_
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2161,10 +2161,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo
@@ -2176,31 +2176,31 @@ public:
     ,
     const CORBA::ULong & how_many
 
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -2220,7 +2220,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRe
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const CORBA::ULong & how_many
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2229,12 +2229,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2251,12 +2251,12 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (T
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -2264,13 +2264,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2278,7 +2278,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (TAO_
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2288,10 +2288,10 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -2324,17 +2324,17 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TA
 ImplementationRepository::_TAO_Administration_Proxy_Impl&
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::select_proxy (
     ::ImplementationRepository::Administration *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -2344,7 +2344,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::sele
 void
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -2424,7 +2424,7 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::_TAO_Admin
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2440,7 +2440,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ
       _collocated_tao_target_->_object_key (),
       "activate_server",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2450,7 +2450,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ
         )
     )->activate_server (
         server
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2459,7 +2459,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis
     CORBA_Object *_collocated_tao_target_,
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2474,7 +2474,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis
       _collocated_tao_target_->_object_key (),
       "register_server",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2485,7 +2485,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis
     )->register_server (
         server,
         options
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2494,7 +2494,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg
     CORBA_Object *_collocated_tao_target_,
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2508,7 +2508,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg
       _collocated_tao_target_->_object_key (),
       "reregister_server",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2519,7 +2519,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg
     )->reregister_server (
         server,
         options
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2527,7 +2527,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::rereg
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2542,7 +2542,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov
       _collocated_tao_target_->_object_key (),
       "remove_server",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2552,7 +2552,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov
         )
     )->remove_server (
         server
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2560,7 +2560,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server (
     CORBA_Object *_collocated_tao_target_,
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2575,7 +2575,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd
       _collocated_tao_target_->_object_key (),
       "shutdown_server",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2585,7 +2585,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd
         )
     )->shutdown_server (
         server
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2595,7 +2595,7 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser
     const char * server,
     const char * addr,
     ImplementationRepository::ServerObject_ptr server_object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2612,7 +2612,7 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser
       _collocated_tao_target_->_object_key (),
       "server_is_running",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2624,14 +2624,14 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser
         server,
         addr,
         server_object
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
 void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down (
     CORBA_Object *_collocated_tao_target_,
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2646,7 +2646,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve
       _collocated_tao_target_->_object_key (),
       "server_is_shutting_down",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2656,7 +2656,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve
         )
     )->server_is_shutting_down (
         server
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2665,7 +2665,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find
     CORBA_Object *_collocated_tao_target_,
     const char * server,
     ImplementationRepository::ServerInformation_out info
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2680,7 +2680,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find
       _collocated_tao_target_->_object_key (),
       "find",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2691,7 +2691,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find
     )->find (
         server,
         info
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2701,7 +2701,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
     ImplementationRepository::ServerInformationIterator_out server_iterator
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2715,7 +2715,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list
       _collocated_tao_target_->_object_key (),
       "list",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2727,7 +2727,7 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list
         how_many,
         server_list,
         server_iterator
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2747,7 +2747,7 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::_TAO_Admini
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server  (
     CORBA_Object *_collocated_tao_target_,
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2760,7 +2760,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activa
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->activate_server (
           server
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
 
 }
@@ -2769,7 +2769,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist
     CORBA_Object *_collocated_tao_target_,
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2782,7 +2782,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::regist
     )->register_server (
           server,
           options
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
 
 }
@@ -2791,7 +2791,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi
     CORBA_Object *_collocated_tao_target_,
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2803,7 +2803,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi
     )->reregister_server (
           server,
           options
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
 
 }
@@ -2811,7 +2811,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregi
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server  (
     CORBA_Object *_collocated_tao_target_,
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2823,7 +2823,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->remove_server (
           server
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
 
 }
@@ -2831,7 +2831,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server  (
     CORBA_Object *_collocated_tao_target_,
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2843,7 +2843,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdo
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->shutdown_server (
           server
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
 
 }
@@ -2853,7 +2853,7 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv
     const char * server,
     const char * addr,
     ImplementationRepository::ServerObject_ptr server_object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2867,7 +2867,7 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv
           server,
           addr,
           server_object
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
 
 }
@@ -2875,7 +2875,7 @@ char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::serv
 void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down  (
     CORBA_Object *_collocated_tao_target_,
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2887,7 +2887,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
     )->server_is_shutting_down (
           server
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
 
 }
@@ -2896,7 +2896,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find
     CORBA_Object *_collocated_tao_target_,
     const char * server,
     ImplementationRepository::ServerInformation_out info
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -2909,7 +2909,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find
     )->find (
           server,
           info
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
 
 }
@@ -2919,7 +2919,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
     ImplementationRepository::ServerInformationIterator_out server_iterator
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2932,7 +2932,7 @@ void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list
           how_many,
           server_list,
           server_iterator
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
 
 }
@@ -2961,7 +2961,7 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2990,25 +2990,25 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
       _tao_upcall,
       _tao_impl,
       server.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->activate_server (
           server.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3016,12 +3016,12 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3042,7 +3042,7 @@ void POA_ImplementationRepository::Administration::register_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3074,12 +3074,12 @@ void POA_ImplementationRepository::Administration::register_server_skel (
       _tao_impl,
       server.in (),
       options
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -3087,13 +3087,13 @@ void POA_ImplementationRepository::Administration::register_server_skel (
       _tao_impl->register_server (
           server.in (),
           options
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3101,12 +3101,12 @@ void POA_ImplementationRepository::Administration::register_server_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3127,7 +3127,7 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3159,12 +3159,12 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
       _tao_impl,
       server.in (),
       options
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -3172,13 +3172,13 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
       _tao_impl->reregister_server (
           server.in (),
           options
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3186,12 +3186,12 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3212,7 +3212,7 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3241,25 +3241,25 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
       _tao_upcall,
       _tao_impl,
       server.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->remove_server (
           server.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3267,12 +3267,12 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3293,7 +3293,7 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3322,25 +3322,25 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
       _tao_upcall,
       _tao_impl,
       server.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->shutdown_server (
           server.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3348,12 +3348,12 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3374,7 +3374,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3409,12 +3409,12 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
       server.in (),
       addr.in (),
       server_object.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -3423,7 +3423,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
           server.in (),
           addr.in (),
           server_object.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3432,7 +3432,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3440,12 +3440,12 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3473,7 +3473,7 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3502,25 +3502,25 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
       _tao_upcall,
       _tao_impl,
       server.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->server_is_shutting_down (
           server.in ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3528,12 +3528,12 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3554,7 +3554,7 @@ void POA_ImplementationRepository::Administration::find_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3583,12 +3583,12 @@ void POA_ImplementationRepository::Administration::find_skel (
       _tao_upcall,
       _tao_impl,
       server.in ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -3596,13 +3596,13 @@ void POA_ImplementationRepository::Administration::find_skel (
       _tao_impl->find (
           server.in (),
           info.out ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3610,12 +3610,12 @@ void POA_ImplementationRepository::Administration::find_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3643,7 +3643,7 @@ void POA_ImplementationRepository::Administration::list_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3674,12 +3674,12 @@ void POA_ImplementationRepository::Administration::list_skel (
       _tao_impl,
       how_many
 
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -3688,13 +3688,13 @@ void POA_ImplementationRepository::Administration::list_skel (
           how_many,
           server_list.out (),
           server_iterator.out ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -3702,12 +3702,12 @@ void POA_ImplementationRepository::Administration::list_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3736,7 +3736,7 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3746,7 +3746,7 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in ()TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3759,11 +3759,11 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3776,7 +3776,7 @@ void POA_ImplementationRepository::Administration::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _tao_object_reference;
@@ -3795,7 +3795,7 @@ void POA_ImplementationRepository::Administration::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -3822,10 +3822,10 @@ void POA_ImplementationRepository::Administration::_interface_skel (
 
 CORBA::Boolean POA_ImplementationRepository::Administration::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -3847,12 +3847,12 @@ void* POA_ImplementationRepository::Administration::_downcast (
   return 0;
 }
 
-void POA_ImplementationRepository::Administration::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_ImplementationRepository::Administration::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -3862,9 +3862,9 @@ const char* POA_ImplementationRepository::Administration::_interface_repository_
 }
 
 ImplementationRepository::Administration*
-POA_ImplementationRepository::Administration::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -3998,31 +3998,31 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl
     ,
     const CORBA::ULong & how_many
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -4042,7 +4042,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::ServerInformationIterator *tao_impl,
     const CORBA::ULong & how_many
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4050,12 +4050,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4071,12 +4071,12 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4084,13 +4084,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4102,7 +4102,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4112,10 +4112,10 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4131,31 +4131,31 @@ public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_ImplementationRepository::ServerInformationIterator *tao_impl
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -4172,31 +4172,31 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::ServerInformationIterator *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
@@ -4204,13 +4204,13 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
 
 
 CORBA::Any *
-TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4218,7 +4218,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
 
 char *
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4228,10 +4228,10 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
 CORBA::Boolean
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -4264,17 +4264,17 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl&
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::select_proxy (
     ::ImplementationRepository::ServerInformationIterator *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -4284,7 +4284,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 void
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -4365,7 +4365,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4381,7 +4381,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru
       _collocated_tao_target_->_object_key (),
       "next_n",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -4392,13 +4392,13 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Thru
     )->next_n (
         how_many,
         server_list
-        TAO_ENV_ARG_PARAMETER
+        ACE_ENV_ARG_PARAMETER
       );
 }
 
 void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4412,7 +4412,7 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_
       _collocated_tao_target_->_object_key (),
       "destroy",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -4421,7 +4421,7 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_
           "IDL:ImplementationRepository/ServerInformationIterator:1.0"
         )
     )->destroy (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
   return;
 }
@@ -4442,7 +4442,7 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Dire
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4454,14 +4454,14 @@ CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Dire
     )->next_n (
           how_many,
           server_list
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
 
 }
 
 void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy  (
     CORBA_Object *_collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4471,7 +4471,7 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_I
       POA_ImplementationRepository::ServerInformationIterator_ptr,
       _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerInformationIterator:1.0")
     )->destroy (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
 
 }
@@ -4500,7 +4500,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4530,12 +4530,12 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
       _tao_upcall,
       _tao_impl,
       how_many
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -4543,7 +4543,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
       _tao_impl->next_n (
           how_many,
           server_list.out ()
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -4551,7 +4551,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4559,12 +4559,12 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4593,7 +4593,7 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
@@ -4614,24 +4614,24 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->destroy (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4639,12 +4639,12 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4665,7 +4665,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4675,7 +4675,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in ()TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4688,11 +4688,11 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4705,7 +4705,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference;
@@ -4724,7 +4724,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -4751,10 +4751,10 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
 
 CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -4776,12 +4776,12 @@ void* POA_ImplementationRepository::ServerInformationIterator::_downcast (
   return 0;
 }
 
-void POA_ImplementationRepository::ServerInformationIterator::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_ImplementationRepository::ServerInformationIterator::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -4791,9 +4791,9 @@ const char* POA_ImplementationRepository::ServerInformationIterator::_interface_
 }
 
 ImplementationRepository::ServerInformationIterator*
-POA_ImplementationRepository::ServerInformationIterator::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index 0926dcc5a9f..136d8d42c82 100644
--- a/TAO/tao/PortableServer/ImplRepoS.h
+++ b/TAO/tao/PortableServer/ImplRepoS.h
@@ -68,7 +68,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -79,37 +79,37 @@ TAO_NAMESPACE  POA_ImplementationRepository
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::ImplementationRepository::ServerObject *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual void ping (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -119,11 +119,11 @@ TAO_NAMESPACE  POA_ImplementationRepository
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void shutdown (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -133,7 +133,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
 
@@ -153,7 +153,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
     virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl &select_proxy (
       ::ImplementationRepository::ServerObject *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -161,7 +161,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
     // Caches the proxy implementations. The proxy implementation
@@ -200,7 +200,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
     virtual void ping (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -208,7 +208,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
     virtual void shutdown (
         CORBA_Object *_collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -237,7 +237,7 @@ public:
 
   virtual void ping (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -245,7 +245,7 @@ public:
 
   virtual void shutdown (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -279,7 +279,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -290,38 +290,38 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::ImplementationRepository::Administration *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual void activate_server (
       const char * server
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -333,13 +333,13 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void register_server (
       const char * server,
       const ImplementationRepository::StartupOptions & options
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -350,13 +350,13 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void reregister_server (
       const char * server,
       const ImplementationRepository::StartupOptions & options
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -366,12 +366,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void remove_server (
       const char * server
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -382,12 +382,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void shutdown_server (
       const char * server
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -398,14 +398,14 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual char * server_is_running (
       const char * server,
       const char * addr,
       ImplementationRepository::ServerObject_ptr server_object
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -416,12 +416,12 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void server_is_shutting_down (
       const char * server
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -432,13 +432,13 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void find (
       const char * server,
       ImplementationRepository::ServerInformation_out info
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -449,14 +449,14 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void list (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
       ImplementationRepository::ServerInformationIterator_out server_iterator
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -466,7 +466,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 
@@ -486,7 +486,7 @@ public:
 
   virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl &select_proxy (
     ::ImplementationRepository::Administration *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -494,7 +494,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
   // Caches the proxy implementations. The proxy implementation
@@ -534,7 +534,7 @@ public:
   virtual void activate_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -546,7 +546,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       const char * server,
       const ImplementationRepository::StartupOptions & options
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -557,7 +557,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       const char * server,
       const ImplementationRepository::StartupOptions & options
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -566,7 +566,7 @@ public:
   virtual void remove_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -576,7 +576,7 @@ public:
   virtual void shutdown_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -588,7 +588,7 @@ public:
       const char * server,
       const char * addr,
       ImplementationRepository::ServerObject_ptr server_object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -598,7 +598,7 @@ public:
   virtual void server_is_shutting_down (
       CORBA_Object *_collocated_tao_target_,
       const char * server
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -609,7 +609,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       const char * server,
       ImplementationRepository::ServerInformation_out info
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -621,7 +621,7 @@ public:
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
       ImplementationRepository::ServerInformationIterator_out server_iterator
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -651,7 +651,7 @@ public:
   virtual void activate_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -663,7 +663,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       const char * server,
       const ImplementationRepository::StartupOptions & options
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -674,7 +674,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       const char * server,
       const ImplementationRepository::StartupOptions & options
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -683,7 +683,7 @@ public:
   virtual void remove_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -693,7 +693,7 @@ public:
   virtual void shutdown_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -705,7 +705,7 @@ public:
       const char * server,
       const char * addr,
       ImplementationRepository::ServerObject_ptr server_object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -715,7 +715,7 @@ public:
   virtual void server_is_shutting_down (
       CORBA_Object *_collocated_tao_target_,
       const char * server
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -726,7 +726,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       const char * server,
       ImplementationRepository::ServerInformation_out info
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -738,7 +738,7 @@ public:
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list,
       ImplementationRepository::ServerInformationIterator_out server_iterator
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -772,7 +772,7 @@ public:
 
   virtual CORBA::Boolean _is_a (
       const char* logical_type_id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void* _downcast (
@@ -783,31 +783,31 @@ public:
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
       void *servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
       void *_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   ::ImplementationRepository::ServerInformationIterator *_this (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual const char* _interface_repository_id (void) const;
@@ -815,7 +815,7 @@ public:
   virtual CORBA::Boolean next_n (
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -825,11 +825,11 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   virtual void destroy (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -839,7 +839,7 @@ public:
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
       void *_tao_servant_upcall
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 
@@ -859,7 +859,7 @@ public:
 
   virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
     ::ImplementationRepository::ServerInformationIterator *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
 private:
@@ -867,7 +867,7 @@ private:
   // as soon as their use is necessary.
   void create_proxy (
     int collocation_strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   );
 
   // Caches the proxy implementations. The proxy implementation
@@ -908,7 +908,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -916,7 +916,7 @@ public:
 
   virtual void destroy (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -947,7 +947,7 @@ public:
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong how_many,
       ImplementationRepository::ServerInformationList_out server_list
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -955,7 +955,7 @@ public:
 
   virtual void destroy (
       CORBA_Object *_collocated_tao_target_
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.h b/TAO/tao/PortableServer/ImplRepoS_T.h
index 82456cc70ec..676cbf18c73 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.h
+++ b/TAO/tao/PortableServer/ImplRepoS_T.h
@@ -63,17 +63,17 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     void ping (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void shutdown (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -119,11 +119,11 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     void activate_server (
         const char * server
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -134,7 +134,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void register_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -144,7 +144,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void reregister_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -152,7 +152,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
         void remove_server (
         const char * server
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -161,7 +161,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
         void shutdown_server (
         const char * server
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -172,7 +172,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
         const char * server,
         const char * addr,
         ImplementationRepository::ServerObject_ptr server_object
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -181,7 +181,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
         void server_is_shutting_down (
         const char * server
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -191,7 +191,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void find (
         const char * server,
         ImplementationRepository::ServerInformation_out info
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -202,7 +202,7 @@ TAO_NAMESPACE  POA_ImplementationRepository
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
         ImplementationRepository::ServerInformationIterator_out server_iterator
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -248,19 +248,19 @@ TAO_NAMESPACE  POA_ImplementationRepository
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::Boolean next_n (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
         void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.i b/TAO/tao/PortableServer/ImplRepoS_T.i
index f821198e58b..dc5b9eae4e1 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.i
+++ b/TAO/tao/PortableServer/ImplRepoS_T.i
@@ -90,37 +90,37 @@ POA_ImplementationRepository::ServerObject_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_ImplementationRepository::ServerObject_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_ImplementationRepository::ServerObject_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ServerObject::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->ServerObject::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::ServerObject_tie<T>::ping  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->ping (
-TAO_ENV_SINGLE_ARG_PARAMETER
+ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::ServerObject_tie<T>::shutdown  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->shutdown (
-TAO_ENV_SINGLE_ARG_PARAMETER
+ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -197,18 +197,18 @@ POA_ImplementationRepository::Administration_tie<T>::_is_owner (CORBA::Boolean b
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_ImplementationRepository::Administration_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_ImplementationRepository::Administration_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->Administration::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->Administration::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::activate_server  (
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -218,7 +218,7 @@ void POA_ImplementationRepository::Administration_tie<T>::activate_server  (
 {
   this->ptr_->activate_server (
 server
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -226,7 +226,7 @@ template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::register_server  (
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -236,7 +236,7 @@ void POA_ImplementationRepository::Administration_tie<T>::register_server  (
   this->ptr_->register_server (
 server,
     options
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -244,7 +244,7 @@ template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::reregister_server  (
     const char * server,
     const ImplementationRepository::StartupOptions & options
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -253,14 +253,14 @@ void POA_ImplementationRepository::Administration_tie<T>::reregister_server  (
   this->ptr_->reregister_server (
 server,
     options
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::remove_server  (
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -269,14 +269,14 @@ void POA_ImplementationRepository::Administration_tie<T>::remove_server  (
 {
   this->ptr_->remove_server (
 server
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::shutdown_server  (
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -285,7 +285,7 @@ void POA_ImplementationRepository::Administration_tie<T>::shutdown_server  (
 {
   this->ptr_->shutdown_server (
 server
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -294,7 +294,7 @@ char * POA_ImplementationRepository::Administration_tie<T>::server_is_running  (
     const char * server,
     const char * addr,
     ImplementationRepository::ServerObject_ptr server_object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -305,14 +305,14 @@ char * POA_ImplementationRepository::Administration_tie<T>::server_is_running  (
 server,
     addr,
     server_object
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_down  (
     const char * server
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -321,7 +321,7 @@ void POA_ImplementationRepository::Administration_tie<T>::server_is_shutting_dow
 {
   this->ptr_->server_is_shutting_down (
 server
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -329,7 +329,7 @@ template <class T> ACE_INLINE
 void POA_ImplementationRepository::Administration_tie<T>::find  (
     const char * server,
     ImplementationRepository::ServerInformation_out info
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
@@ -339,7 +339,7 @@ void POA_ImplementationRepository::Administration_tie<T>::find  (
   this->ptr_->find (
 server,
     info
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -348,7 +348,7 @@ void POA_ImplementationRepository::Administration_tie<T>::list  (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
     ImplementationRepository::ServerInformationIterator_out server_iterator
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -358,7 +358,7 @@ void POA_ImplementationRepository::Administration_tie<T>::list  (
 how_many,
     server_list,
     server_iterator
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
@@ -435,19 +435,19 @@ POA_ImplementationRepository::ServerInformationIterator_tie<T>::_is_owner (CORBA
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_ImplementationRepository::ServerInformationIterator_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_ImplementationRepository::ServerInformationIterator_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ServerInformationIterator::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->ServerInformationIterator::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::next_n  (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -456,20 +456,20 @@ CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator_tie<T>::n
   return this->ptr_->next_n (
 how_many,
     server_list
-    TAO_ENV_ARG_PARAMETER
+    ACE_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_ImplementationRepository::ServerInformationIterator_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-TAO_ENV_SINGLE_ARG_PARAMETER
+ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/tao/PortableServer/ImplRepo_i.cpp b/TAO/tao/PortableServer/ImplRepo_i.cpp
index 492bea49049..4de7a2ece9e 100644
--- a/TAO/tao/PortableServer/ImplRepo_i.cpp
+++ b/TAO/tao/PortableServer/ImplRepo_i.cpp
@@ -17,21 +17,21 @@ ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb,
 }
 
 void
-ServerObject_i::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerObject_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-ServerObject_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+ServerObject_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);
   ACE_CHECK;
 }
 
 PortableServer::POA_ptr
-ServerObject_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tao/PortableServer/ImplRepo_i.h b/TAO/tao/PortableServer/ImplRepo_i.h
index c81aa13f92c..cf598c71b65 100644
--- a/TAO/tao/PortableServer/ImplRepo_i.h
+++ b/TAO/tao/PortableServer/ImplRepo_i.h
@@ -41,15 +41,15 @@ public:
                   PortableServer::POA_ptr poa);
 
   /// Ping method.
-  void ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the server.
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the default POA for this servant.
-  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 protected:
   /// Our ORB.  We need this member in case we need to shutdown the
diff --git a/TAO/tao/PortableServer/MessagingS.cpp b/TAO/tao/PortableServer/MessagingS.cpp
index eda6af66a2d..0c1aa75efb2 100644
--- a/TAO/tao/PortableServer/MessagingS.cpp
+++ b/TAO/tao/PortableServer/MessagingS.cpp
@@ -186,17 +186,17 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::~_TAO_ReplyHandler_St
 Messaging::_TAO_ReplyHandler_Proxy_Impl&
 POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::select_proxy (
     ::Messaging::ReplyHandler *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -206,7 +206,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::select_proxy (
 void
 POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -319,7 +319,7 @@ void POA_Messaging::ReplyHandler::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -329,7 +329,7 @@ void POA_Messaging::ReplyHandler::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in ()TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -342,11 +342,11 @@ void POA_Messaging::ReplyHandler::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_Messaging::ReplyHandler *_tao_impl = (POA_Messaging::ReplyHandler *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -359,7 +359,7 @@ void POA_Messaging::ReplyHandler::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_Messaging::ReplyHandler *_tao_impl = (POA_Messaging::ReplyHandler *) _tao_object_reference;
@@ -378,7 +378,7 @@ void POA_Messaging::ReplyHandler::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -405,10 +405,10 @@ void POA_Messaging::ReplyHandler::_interface_skel (
 
 CORBA::Boolean POA_Messaging::ReplyHandler::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -430,12 +430,12 @@ void* POA_Messaging::ReplyHandler::_downcast (
   return 0;
 }
 
-void POA_Messaging::ReplyHandler::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_Messaging::ReplyHandler::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
@@ -444,9 +444,9 @@ const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
 }
 
 Messaging::ReplyHandler*
-POA_Messaging::ReplyHandler::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/tao/PortableServer/MessagingS.h b/TAO/tao/PortableServer/MessagingS.h
index eb2af498df8..08763f1c1cf 100644
--- a/TAO/tao/PortableServer/MessagingS.h
+++ b/TAO/tao/PortableServer/MessagingS.h
@@ -76,7 +76,7 @@ TAO_NAMESPACE  POA_Messaging
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -87,31 +87,31 @@ TAO_NAMESPACE  POA_Messaging
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::Messaging::ReplyHandler *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
@@ -133,7 +133,7 @@ TAO_NAMESPACE  POA_Messaging
 
     virtual ::Messaging::_TAO_ReplyHandler_Proxy_Impl &select_proxy (
       ::Messaging::ReplyHandler *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -142,7 +142,7 @@ TAO_NAMESPACE  POA_Messaging
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
diff --git a/TAO/tao/PortableServer/MessagingS_T.h b/TAO/tao/PortableServer/MessagingS_T.h
index 5e44a56a7a3..95eafa8c5d8 100644
--- a/TAO/tao/PortableServer/MessagingS_T.h
+++ b/TAO/tao/PortableServer/MessagingS_T.h
@@ -49,7 +49,7 @@ TAO_NAMESPACE  POA_Messaging
     // ctor with T*, ownership flag and a POA
     ~ReplyHandler_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -61,16 +61,16 @@ TAO_NAMESPACE  POA_Messaging
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     ReplyHandler_tie (const ReplyHandler_tie &);
     void operator= (const ReplyHandler_tie &);
diff --git a/TAO/tao/PortableServer/MessagingS_T.i b/TAO/tao/PortableServer/MessagingS_T.i
index 84f75442fea..6dad8a7e540 100644
--- a/TAO/tao/PortableServer/MessagingS_T.i
+++ b/TAO/tao/PortableServer/MessagingS_T.i
@@ -23,30 +23,30 @@
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -90,12 +90,12 @@ POA_Messaging::ReplyHandler_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_Messaging::ReplyHandler_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_Messaging::ReplyHandler_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ReplyHandler::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->ReplyHandler::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/tao/PortableServer/ORB_Manager.cpp b/TAO/tao/PortableServer/ORB_Manager.cpp
index 752ac45da94..9dcf1405533 100644
--- a/TAO/tao/PortableServer/ORB_Manager.cpp
+++ b/TAO/tao/PortableServer/ORB_Manager.cpp
@@ -28,26 +28,26 @@ TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb,
 int
 TAO_ORB_Manager::init (int &argc,
                        char **argv
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   return this->init (argc,
                      argv,
                      0
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
 }
 
 int
 TAO_ORB_Manager::init (int &argc,
                        char **argv,
                        const char *orb_name
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   if (CORBA::is_nil (this->orb_.in ()))
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     orb_name
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -56,7 +56,7 @@ TAO_ORB_Manager::init (int &argc,
       // Get the POA from the ORB.
       CORBA::Object_var poa_object =
         this->orb_->resolve_initial_references (TAO_OBJID_ROOTPOA
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -67,7 +67,7 @@ TAO_ORB_Manager::init (int &argc,
       // Get the POA object.
       this->poa_ =
         PortableServer::POA::_narrow (poa_object.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 
       ACE_CHECK_RETURN (-1);
     }
@@ -76,7 +76,7 @@ TAO_ORB_Manager::init (int &argc,
     {
       // Get the POA_Manager.
       this->poa_manager_ =
-        this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_CHECK_RETURN (-1);
     }
@@ -88,13 +88,13 @@ int
 TAO_ORB_Manager::init_child_poa (int& argc,
                                  char **argv,
                                  const char *poa_name
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   return this->init_child_poa (argc,
                                argv,
                                poa_name,
                                0
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 int
@@ -102,7 +102,7 @@ TAO_ORB_Manager::init_child_poa (int& argc,
                                  char **argv,
                                  const char *poa_name,
                                  const char *orb_name
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   int init_result;
 
@@ -110,7 +110,7 @@ TAO_ORB_Manager::init_child_poa (int& argc,
   init_result = this->init (argc,
                             argv,
                             orb_name
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (init_result == -1)
@@ -126,13 +126,13 @@ TAO_ORB_Manager::init_child_poa (int& argc,
   // Id Assignment policy
   policies[0] =
     this->poa_->create_id_assignment_policy (PortableServer::USER_ID
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Lifespan policy
   policies[1] =
     this->poa_->create_lifespan_policy (PortableServer::PERSISTENT
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // We use a different POA, otherwise the user would have to change
@@ -142,7 +142,7 @@ TAO_ORB_Manager::init_child_poa (int& argc,
     this->poa_->create_POA (poa_name,
                             this->poa_manager_.in (),
                             policies
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
   // Warning!  If create_POA fails, then the policies won't be
   // destroyed and there will be hell to pay in memory leaks!
   ACE_CHECK_RETURN (-1);
@@ -153,7 +153,7 @@ TAO_ORB_Manager::init_child_poa (int& argc,
        ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   return 0;
@@ -162,9 +162,9 @@ TAO_ORB_Manager::init_child_poa (int& argc,
 // Activate POA manager.
 
 int
-TAO_ORB_Manager::activate_poa_manager (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Manager::activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   return 0;
 }
@@ -173,21 +173,21 @@ TAO_ORB_Manager::activate_poa_manager (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ORB_Manager::activate (PortableServer::Servant servant
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   PortableServer::ObjectId_var id =
     this->poa_->activate_object (servant
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Object_var obj =
     this->poa_->id_to_reference (id.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::String_var str =
     this->orb_->object_to_string (obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return str._retn ();
@@ -195,20 +195,20 @@ TAO_ORB_Manager::activate (PortableServer::Servant servant
 
 void
 TAO_ORB_Manager::deactivate (const char *id
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object =
     this->orb_->string_to_object (id
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var object_id =
     this->poa_->reference_to_id (object.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->poa_->deactivate_object (object_id.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 // Activate the object with the object_name under the child POA.
@@ -216,7 +216,7 @@ TAO_ORB_Manager::deactivate (const char *id
 char *
 TAO_ORB_Manager::activate_under_child_poa (const char *object_name,
                                            PortableServer::Servant servant
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
 {
   if (object_name == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -229,17 +229,17 @@ TAO_ORB_Manager::activate_under_child_poa (const char *object_name,
 
   this->child_poa_->activate_object_with_id (id.in (),
                                              servant
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Object_var obj =
     this->child_poa_->id_to_reference (id.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   char * str =
     this->orb_->object_to_string (obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (0);
 
@@ -248,46 +248,46 @@ TAO_ORB_Manager::activate_under_child_poa (const char *object_name,
 
 void
 TAO_ORB_Manager::deactivate_under_child_poa (const char *id
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object =
     this->orb_->string_to_object (id
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var object_id =
     this->child_poa_->reference_to_id (object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->child_poa_->deactivate_object (object_id.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 // Enter the ORB event loop.
 
 int
 TAO_ORB_Manager::run (ACE_Time_Value &tv
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
-  this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
+  this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-TAO_ORB_Manager::fini (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Manager::fini (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+  this->poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->poa_ = 0;
 
-  this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->orb_ = 0;
@@ -295,12 +295,12 @@ TAO_ORB_Manager::fini (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-TAO_ORB_Manager::run (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ORB_Manager::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -344,7 +344,7 @@ TAO_ORB_Manager::~TAO_ORB_Manager (void)
         {
           this->poa_->destroy (1,
                                1
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tao/PortableServer/ORB_Manager.h b/TAO/tao/PortableServer/ORB_Manager.h
index 7420662f37e..034708f4f11 100644
--- a/TAO/tao/PortableServer/ORB_Manager.h
+++ b/TAO/tao/PortableServer/ORB_Manager.h
@@ -64,7 +64,7 @@ public:
    */
   int init (int &argc,
             char *argv[]
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /** Initialize the ORB/root POA, using the supplied command line
     * arguments or the default ORB components.
@@ -74,7 +74,7 @@ public:
   int init (int &argc,
             char *argv[],
             const char *orb_name
-            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Creates a child poa under the root poa with PERSISTENT and
@@ -86,7 +86,7 @@ public:
   int init_child_poa (int &argc,
                       char *argv[],
                       const char *poa_name
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Creates a child poa under the root poa with PERSISTENT and
@@ -97,13 +97,13 @@ public:
                       char *argv[],
                       const char *poa_name,
                       const char *orb_name
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /** Shut down.  Invoke the destroy() methods on the orb and poa.
    *
    * @return -1 on failure, 0 on success
    */
-  int fini (TAO_ENV_SINGLE_ARG_DECL);
+  int fini (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Destructor.
   ~TAO_ORB_Manager (void);
@@ -119,7 +119,7 @@ public:
    *
    *  @return -1 on failure, 0 on success
    */
-  int activate_poa_manager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Activate <servant>, using the POA <activate_object> call.  Users
@@ -130,7 +130,7 @@ public:
    *         memory deallocation of the string.
    */
   char *activate (PortableServer::Servant servant
-                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /** Deactivate object in RootPOA.
    *
@@ -138,7 +138,7 @@ public:
    *             of the servant to deactivate in the POA
    */
   void deactivate (const char *id
-                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Precondition: init_child_poa has been called.  Activate <servant>
@@ -156,7 +156,7 @@ public:
    */
   char *activate_under_child_poa (const char *object_name,
                                   PortableServer::Servant servant
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /** Deactivate object in child POA.
    *
@@ -164,7 +164,7 @@ public:
    *             the object to deactivate in the POA
    */
   void deactivate_under_child_poa (const char *id
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /** Run the ORB event loop with the specified <tv> time value.
    *
@@ -172,8 +172,8 @@ public:
    * @return -1 on failure, 0 on success
    */
   int run (ACE_Time_Value &tv
-           TAO_ENV_ARG_DECL_WITH_DEFAULTS);
-  int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+           ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /**
    * Accessor which returns the ORB pointer.  Following the normal
diff --git a/TAO/tao/PortableServer/ObjectReferenceFactory.cpp b/TAO/tao/PortableServer/ObjectReferenceFactory.cpp
index baa47b7ea5d..02732b62984 100644
--- a/TAO/tao/PortableServer/ObjectReferenceFactory.cpp
+++ b/TAO/tao/PortableServer/ObjectReferenceFactory.cpp
@@ -26,7 +26,7 @@ TAO_ObjectReferenceFactory::TAO_ObjectReferenceFactory (TAO_POA *poa)
 CORBA::Object *
 TAO_ObjectReferenceFactory::make_object (const char *intf,
                                          const PortableInterceptor::ObjectId & id
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
 
 {
   CORBA::OctetSeq object_id = id;
@@ -39,7 +39,7 @@ TAO_ObjectReferenceFactory::make_object (const char *intf,
   CORBA::Object_var object =
     this->poa_->invoke_key_to_object (intf,
                                       *user_id
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return object._retn ();
diff --git a/TAO/tao/PortableServer/ObjectReferenceFactory.h b/TAO/tao/PortableServer/ObjectReferenceFactory.h
index a47b3ef1a3a..4f6a75e3e9e 100644
--- a/TAO/tao/PortableServer/ObjectReferenceFactory.h
+++ b/TAO/tao/PortableServer/ObjectReferenceFactory.h
@@ -57,7 +57,7 @@ class TAO_PortableServer_Export TAO_ObjectReferenceFactory
   virtual CORBA::Object_ptr make_object (
       const char * repository_id,
       const PortableInterceptor::ObjectId & id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   void set_servant (PortableServer::Servant servant);
 
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
index f79f70d3e9a..25c44c8cdf7 100644
--- a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
@@ -26,7 +26,7 @@ TAO_ObjectReferenceTemplate::~TAO_ObjectReferenceTemplate (void)
 }
 
 char *
-TAO_ObjectReferenceTemplate::server_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ObjectReferenceTemplate::server_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Priyanka, you're not conforming to the C++ mapping.  Do a
@@ -36,7 +36,7 @@ TAO_ObjectReferenceTemplate::server_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-TAO_ObjectReferenceTemplate::orb_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ObjectReferenceTemplate::orb_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Priyanka, you're not conforming to the C++ mapping.  Do a
@@ -46,7 +46,7 @@ TAO_ObjectReferenceTemplate::orb_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 PortableInterceptor::AdapterName *
-TAO_ObjectReferenceTemplate::adapter_name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Priyanka, you're not conforming to the C++ mapping.  You must
@@ -62,7 +62,7 @@ CORBA::Object *
 TAO_ObjectReferenceTemplate::make_object (
   const char * intf,
   const PortableInterceptor::ObjectId & id
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
   // @@ Priyanka, is this method supposed to have an exception
   //    specification?
 {
@@ -78,21 +78,21 @@ TAO_ObjectReferenceTemplate::make_object (
   CORBA::Object_var object =
     this->poa_->invoke_key_to_object (intf,
                                       *user_id
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // @@ Priyanka, what purpose does this object_to_string() call
   //    serve?  Can't you remove it?
   CORBA::String_var ior =
     this->poa_->orb_core ().orb ()->object_to_string (object.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return object._retn ();
 }
 
 void
-TAO_ObjectReferenceTemplate::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ObjectReferenceTemplate::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // @@ Priyanka, this is a reference counted object.  You cannot
   //    directly call delete() on the instance.  Use the reference
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.h b/TAO/tao/PortableServer/ObjectReferenceTemplate.h
index 6941b59ab18..904dbc8f659 100644
--- a/TAO/tao/PortableServer/ObjectReferenceTemplate.h
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.h
@@ -62,22 +62,22 @@ class TAO_PortableServer_Export TAO_ObjectReferenceTemplate
   /// Destructor
   ~TAO_ObjectReferenceTemplate (void);
 
-  virtual char * server_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * orb_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual PortableInterceptor::AdapterName * adapter_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Object_ptr make_object (
       const char * repository_id,
       const PortableInterceptor::ObjectId & id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 private:
 
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 221f0f9fa6d..afeb5baca31 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -207,7 +207,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
 
 void
 TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
 {
   // Initialize the default policies.
 
@@ -215,42 +215,42 @@ TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies
 
   // Thread policy.
   TAO_Thread_Policy thread_policy (PortableServer::ORB_CTRL_MODEL);
-  policies.merge_policy (&thread_policy TAO_ENV_ARG_PARAMETER);
+  policies.merge_policy (&thread_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // Lifespan policy.
   TAO_Lifespan_Policy lifespan_policy (PortableServer::TRANSIENT);
-  policies.merge_policy (&lifespan_policy TAO_ENV_ARG_PARAMETER);
+  policies.merge_policy (&lifespan_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // ID uniqueness policy.
   TAO_Id_Uniqueness_Policy id_uniqueness_policy (PortableServer::UNIQUE_ID);
-  policies.merge_policy (&id_uniqueness_policy TAO_ENV_ARG_PARAMETER);
+  policies.merge_policy (&id_uniqueness_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // ID assignment policy.
   TAO_Id_Assignment_Policy id_assignment_policy (PortableServer::SYSTEM_ID);
-  policies.merge_policy (&id_assignment_policy TAO_ENV_ARG_PARAMETER);
+  policies.merge_policy (&id_assignment_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   // Implicit activation policy.
   TAO_Implicit_Activation_Policy implicit_activation_policy
                            (PortableServer::NO_IMPLICIT_ACTIVATION);
-  policies.merge_policy (&implicit_activation_policy TAO_ENV_ARG_PARAMETER);
+  policies.merge_policy (&implicit_activation_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Servant retention policy.
   TAO_Servant_Retention_Policy servant_retention_policy (PortableServer::RETAIN);
-  policies.merge_policy (&servant_retention_policy TAO_ENV_ARG_PARAMETER);
+  policies.merge_policy (&servant_retention_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Request processing policy.
   TAO_Request_Processing_Policy request_processing_policy
                             (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY);
-  policies.merge_policy (&request_processing_policy TAO_ENV_ARG_PARAMETER);
+  policies.merge_policy (&request_processing_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 }
@@ -295,7 +295,7 @@ int
 TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
                                       TAO_ServerRequest &req,
                                       CORBA::Object_out forward_to
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START);
 
@@ -310,7 +310,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
     servant_upcall.prepare_for_upcall (key,
                                        operation,
                                        forward_to
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (result);
 
   if (result != TAO_Adapter::DS_OK)
@@ -322,7 +322,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
 
     this->servant_dispatcher_->dispatch (servant_upcall,
                                          req
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (result);
   }
 
@@ -333,7 +333,7 @@ void
 TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
                                 PortableServer::ObjectId &system_id,
                                 TAO_POA *&poa
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   TAO_Object_Adapter::poa_name poa_system_name;
   CORBA::Boolean is_root = 0;
@@ -366,7 +366,7 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
                              is_root,
                              poa_creation_time,
                              poa
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -377,7 +377,7 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
 int
 TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
                                   TAO_POA *&poa
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   int result = -1;
 
@@ -414,7 +414,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
         {
           current = parent->find_POA_i (*iterator,
                                         1
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (PortableServer::POA::AdapterNonExistent, ex)
@@ -432,7 +432,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
 #else
   ACE_UNUSED_ARG (folded_name);
   ACE_UNUSED_ARG (poa);
-  TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
+  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   return result;
@@ -443,7 +443,7 @@ TAO_Object_Adapter::find_transient_poa (const poa_name &system_name,
                                         CORBA::Boolean root,
                                         const TAO_Temporary_Creation_Time &poa_creation_time,
                                         TAO_POA *&poa
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   int result = 0;
 
@@ -492,7 +492,7 @@ TAO_Object_Adapter::unbind_poa (TAO_POA *poa,
 
 int
 TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   PortableServer::ObjectId id;
   TAO_POA *poa = 0;
@@ -500,14 +500,14 @@ TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key
   this->locate_poa (key,
                     id,
                     poa
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   PortableServer::Servant servant = 0;
   TAO_SERVANT_LOCATION servant_location =
     poa->locate_servant_i (id,
                            servant
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   switch (servant_location)
@@ -528,7 +528,7 @@ TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key
 TAO_SERVANT_LOCATION
 TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key,
                                     PortableServer::Servant &servant
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   PortableServer::ObjectId id;
   TAO_POA *poa = 0;
@@ -536,23 +536,23 @@ TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key,
   this->locate_poa (key,
                     id,
                     poa
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
 
   TAO_SERVANT_LOCATION servant_location = poa->locate_servant_i (id,
                                                                  servant
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_SERVANT_NOT_FOUND);
 
   return servant_location;
 }
 
 void
-TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Add in the default POA policies to the default list.
   this->init_default_policies (this->default_poa_policies ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // If a POA extension hasn't changed the servant dispatcher, initialize the
@@ -572,7 +572,7 @@ TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL)
   PortableServer::POAManager_var safe_poa_manager = poa_manager;
 
   // Set the default Server Protocol Policy.
-  this->set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->set_default_server_protocol_policy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_POA_Policy_Set policies (this->default_poa_policies ());
@@ -587,12 +587,12 @@ TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL)
     implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
 
   policies.merge_policy (&implicit_activation_policy
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // Merge policies from the ORB level.
   this->validator ().merge_policies (policies.policies ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Construct a new POA
@@ -606,7 +606,7 @@ TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL)
                                            this->thread_lock (),
                                            this->orb_core_,
                                            this
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The Object_Adapter will keep a reference to the Root POA so that
@@ -621,7 +621,7 @@ TAO_Object_Adapter::open (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Object_Adapter::set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Object_Adapter::set_default_server_protocol_policy (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Thread_Lane_Resources &default_lane_resources =
     this->orb_core_.thread_lane_resources_manager ().default_lane_resources ();
@@ -630,19 +630,19 @@ TAO_Object_Adapter::set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_DECL)
     default_lane_resources.acceptor_registry ();
 
   TAO_Protocols_Hooks *protocols_hooks =
-    this->orb_core_.get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->orb_core_.get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   protocols_hooks->set_default_server_protocol_policy (acceptor_registry
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_Object_Adapter::close (int wait_for_completion
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
-  this->check_close (wait_for_completion TAO_ENV_ARG_PARAMETER);
+  this->check_close (wait_for_completion ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Shutting down the ORB causes all object adapters to be destroyed,
@@ -665,18 +665,18 @@ TAO_Object_Adapter::close (int wait_for_completion
   CORBA::Boolean etherealize_objects = 1;
   root->destroy (etherealize_objects,
                  wait_for_completion
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   CORBA::release (root);
 }
 
 void
 TAO_Object_Adapter::check_close (int wait_for_completion
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   TAO_POA::check_for_valid_wait_for_completions (this->orb_core (),
                                                  wait_for_completion
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -690,7 +690,7 @@ int
 TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
                               TAO_ServerRequest &request,
                               CORBA::Object_out forward_to
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::memcmp (key.get_buffer (),
@@ -714,7 +714,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
       // The receive_request_service_contexts() interception point
       // must be invoked before the operation is dispatched to the
       // servant.
-      sri_adapter.receive_request_service_contexts (&ri TAO_ENV_ARG_PARAMETER);
+      sri_adapter.receive_request_service_contexts (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If a PortableInterceptor::ForwardRequest exception was
@@ -722,7 +722,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
       // with the appropriate return status.
       if (sri_adapter.location_forwarded ())
         {
-          forward_to = ri.forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER);
+          forward_to = ri.forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           return TAO_Adapter::DS_FORWARD;
@@ -732,7 +732,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
       result = this->dispatch_servant (key,
                                        request,
                                        forward_to
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 
 #if TAO_HAS_INTERCEPTORS == 1
       ACE_TRY_CHECK;
@@ -741,7 +741,7 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
         {
           ri.forward_reference (forward_to.ptr ());
           sri_adapter.send_other (&ri
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -750,11 +750,11 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
       ri.exception (&ACE_ANY_EXCEPTION);
 
       sri_adapter.send_exception (&ri
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Only re-throw the exception if it hasn't been transformed by
@@ -799,7 +799,7 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub,
                           TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
         continue;
 
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
           TAO_ServantBase *servant = 0;
@@ -807,7 +807,7 @@ TAO_Object_Adapter::create_collocated_object (TAO_Stub *stub,
           TAO_SERVANT_LOCATION servant_location =
             this->find_servant (objkey.in (),
                                 servant
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (servant_location != TAO_SERVANT_NOT_FOUND)
@@ -895,7 +895,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void)
 int
 TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (const poa_name &system_name,
                                                                TAO_POA *&poa
-                                                               TAO_ENV_ARG_DECL)
+                                                               ACE_ENV_ARG_DECL)
 {
   poa_name folded_name;
   int result = this->persistent_poa_system_map_.recover_key (system_name,
@@ -914,7 +914,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (const poa_name &s
             {
               result = this->object_adapter_->activate_poa (folded_name,
                                                             poa
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (-1);
             }
         }
@@ -969,7 +969,7 @@ TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void)
 int
 TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (const poa_name &system_name,
                                                            TAO_POA *&poa
-                                                           TAO_ENV_ARG_DECL)
+                                                           ACE_ENV_ARG_DECL)
 {
   int result = this->object_adapter_->persistent_poa_name_map_->find (system_name,
                                                                       poa);
@@ -978,7 +978,7 @@ TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (const poa_name &syste
       result =
         this->object_adapter_->activate_poa (system_name,
                                              poa
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -1127,7 +1127,7 @@ TAO_Object_Adapter::Non_Servant_Upcall::~Non_Servant_Upcall (void)
     {
       ACE_TRY_NEW_ENV
         {
-          this->poa_.complete_destruction_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->poa_.complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -1169,7 +1169,7 @@ int
 TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key,
                                                         const char *operation,
                                                         CORBA::Object_out forward_to
-                                                        TAO_ENV_ARG_DECL)
+                                                        ACE_ENV_ARG_DECL)
 {
   // Acquire the object adapter lock first.
   int result = this->object_adapter_->lock ().acquire ();
@@ -1185,18 +1185,18 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
   // Check if a non-servant upcall is in progress.  If a non-servant
   // upcall is in progress, wait for it to complete.  Unless of
   // course, the thread making the non-servant upcall is this thread.
-  this->object_adapter_->wait_for_non_servant_upcalls_to_complete (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->object_adapter_->wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
 
   // Locate the POA.
   this->object_adapter_->locate_poa (key,
                                      this->system_id_,
                                      this->poa_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
 
   // Check the state of the POA Manager.
-  this->poa_->check_poa_manager_state (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->poa_->check_poa_manager_state (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
 
   // Setup current for this request.
@@ -1219,7 +1219,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
                                                      this->system_id_,
                                                      *this,
                                                      this->current_context_
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 #if (TAO_HAS_MINIMUM_CORBA == 0)
@@ -1254,7 +1254,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
   this->state_ = OBJECT_ADAPTER_LOCK_RELEASED;
 
   // Serialize servants (if appropriate).
-  this->single_threaded_poa_setup (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
 
   // We have acquired the servant lock.  Record this for later use.
@@ -1266,7 +1266,7 @@ TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (const TAO_ObjectKey &key
 
 TAO_POA *
 TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO_ObjectKey &key
-                                                TAO_ENV_ARG_DECL)
+                                                ACE_ENV_ARG_DECL)
 {
   // Acquire the object adapter lock first.
   int result = this->object_adapter_->lock ().acquire ();
@@ -1282,14 +1282,14 @@ TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO_ObjectKey &key
   // Check if a non-servant upcall is in progress.  If a non-servant
   // upcall is in progress, wait for it to complete.  Unless of
   // course, the thread making the non-servant upcall is this thread.
-  this->object_adapter_->wait_for_non_servant_upcalls_to_complete (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->object_adapter_->wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Locate the POA.
   this->object_adapter_->locate_poa (key,
                                      this->system_id_,
                                      this->poa_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return this->poa_;
@@ -1401,7 +1401,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void)
 
   if (this->using_servant_locator_)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
           this->poa_->servant_locator_->postinvoke (this->current_context_.object_id (),
@@ -1409,7 +1409,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void)
                                                     this->operation_,
                                                     this->cookie_,
                                                     this->servant_
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -1423,7 +1423,7 @@ TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void)
 }
 
 void
-TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL)
 {
 #if (TAO_HAS_MINIMUM_POA == 0)
   // Serialize servants (if necessary).
@@ -1443,7 +1443,7 @@ TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (TAO_ENV_SINGLE_AR
         ACE_THROW (CORBA::OBJ_ADAPTER ());
     }
 #else
-  TAO_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
+  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
 #endif /* !TAO_HAS_MINIMUM_POA == 0 */
 }
 
@@ -1468,11 +1468,11 @@ TAO_Object_Adapter::Servant_Upcall::servant_cleanup (void)
 
       if (new_count == 0)
         {
-          TAO_ENV_DECLARE_NEW_ENV;
+          ACE_DECLARE_NEW_CORBA_ENV;
           ACE_TRY
             {
               this->poa_->cleanup_servant (this->active_object_map_entry_
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
             }
@@ -1521,7 +1521,7 @@ TAO_Object_Adapter::Servant_Upcall::poa_cleanup (void)
         {
           ACE_TRY_NEW_ENV
             {
-              this->poa_->complete_destruction_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->poa_->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY
@@ -1587,7 +1587,7 @@ TAO_POA_Current_Impl::teardown (void)
 }
 
 PortableServer::POA_ptr
-TAO_POA_Current_Impl::get_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_POA_Current_Impl::get_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::Current::NoContext))
 {
@@ -1595,7 +1595,7 @@ TAO_POA_Current_Impl::get_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 PortableServer::ObjectId *
-TAO_POA_Current_Impl::get_object_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_POA_Current_Impl::get_object_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::Current::NoContext))
 {
@@ -1616,7 +1616,7 @@ TAO_POA_Current_Impl::orb_core (void) const
 }
 
 PortableServer::POA_ptr
-TAO_POA_Current::get_POA (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA_Current::get_POA (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::Current::NoContext))
 {
@@ -1625,11 +1625,11 @@ TAO_POA_Current::get_POA (TAO_ENV_SINGLE_ARG_DECL)
   if (impl == 0)
     ACE_THROW_RETURN (PortableServer::Current::NoContext (),
                       0);
-  return impl->get_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return impl->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableServer::ObjectId *
-TAO_POA_Current::get_object_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA_Current::get_object_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::Current::NoContext))
 {
@@ -1638,7 +1638,7 @@ TAO_POA_Current::get_object_id (TAO_ENV_SINGLE_ARG_DECL)
   if (impl == 0)
     ACE_THROW_RETURN (PortableServer::Current::NoContext (),
                       0);
-  return impl->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return impl->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 TAO_POA_Current_Impl *
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index 5b7994f8d89..b75ba21b3c3 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -73,14 +73,14 @@ public:
   TAO_POA_Current (void);
   // Constructor
 
-  PortableServer::POA_ptr get_POA (TAO_ENV_SINGLE_ARG_DECL)
+  PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::Current::NoContext));
   // Returns the POA on which the current request is being invoked.
   // Can raise the <CORBA::NoContext> exception if this function is
   // not invoked in the context of an upcall.
 
-  PortableServer::ObjectId *get_object_id (TAO_ENV_SINGLE_ARG_DECL)
+  PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::Current::NoContext));
   // Returns the object id of the current request being invoked.  Can
@@ -119,13 +119,13 @@ public:
 
   friend class TAO_POA;
 
-  PortableServer::POA_ptr get_POA (TAO_ENV_SINGLE_ARG_DECL)
+  PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::Current::NoContext));
   // Return pointer to the invoking POA.  Raises the
   // <CORBA::NoContext> exception.
 
-  PortableServer::ObjectId *get_object_id (TAO_ENV_SINGLE_ARG_DECL)
+  PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::Current::NoContext));
   // Return pointer to the object id through which this was invoked.
@@ -234,21 +234,21 @@ public:
   int dispatch_servant (const TAO_ObjectKey &key,
                         TAO_ServerRequest &req,
                         CORBA::Object_out forward_to
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
   int locate_servant (const TAO_ObjectKey &key
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
   TAO_SERVANT_LOCATION find_servant (const TAO_ObjectKey &key,
                                      PortableServer::Servant &servant
-                                     TAO_ENV_ARG_DECL);
+                                     ACE_ENV_ARG_DECL);
 
   int find_poa (const poa_name &system_name,
                 CORBA::Boolean activate_it,
                 CORBA::Boolean root,
                 const TAO_Temporary_Creation_Time &poa_creation_time,
                 TAO_POA *&poa
-                TAO_ENV_ARG_DECL);
+                ACE_ENV_ARG_DECL);
 
   int bind_poa (const poa_name &folded_name,
                 TAO_POA *poa,
@@ -260,7 +260,7 @@ public:
 
   int activate_poa (const poa_name &folded_name,
                     TAO_POA *&poa
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
 
   ACE_Lock &lock (void);
 
@@ -295,20 +295,20 @@ public:
 
   /// Initialize the default set of POA policies.
   void init_default_policies (TAO_POA_Policy_Set &policies
-                              TAO_ENV_ARG_DECL);
+                              ACE_ENV_ARG_DECL);
 
   // = The TAO_Adapter methods, please check tao/Adapter.h for the
   // documentation
-  virtual void open (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void open (ACE_ENV_SINGLE_ARG_DECL);
   virtual void close (int wait_for_completion
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
   virtual void check_close (int wait_for_completion
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   virtual int priority (void) const;
   virtual int dispatch (TAO_ObjectKey &key,
                         TAO_ServerRequest &request,
                         CORBA::Object_out foward_to
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual const char *name (void) const;
   virtual CORBA::Object_ptr root (void);
@@ -318,31 +318,31 @@ public:
 protected:
 
   int locate_servant_i (const TAO_ObjectKey &key
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
   TAO_SERVANT_LOCATION find_servant_i (const TAO_ObjectKey &key,
                                        PortableServer::Servant &servant
-                                       TAO_ENV_ARG_DECL);
+                                       ACE_ENV_ARG_DECL);
 
   void dispatch_servant_i (const TAO_ObjectKey &key,
                            TAO_ServerRequest &req,
                            void *context
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
 
   void locate_poa (const TAO_ObjectKey &key,
                    PortableServer::ObjectId &id,
                    TAO_POA *&poa
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 
   int find_transient_poa (const poa_name &system_name,
                           CORBA::Boolean root,
                           const TAO_Temporary_Creation_Time &poa_creation_time,
                           TAO_POA *&poa
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
 
   int find_persistent_poa (const poa_name &system_name,
                            TAO_POA *&poa
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
 
   int bind_transient_poa (TAO_POA *poa,
                           poa_name_out system_name);
@@ -356,7 +356,7 @@ protected:
   int unbind_persistent_poa (const poa_name &folded_name,
                              const poa_name &system_name);
 
-  void set_default_server_protocol_policy (TAO_ENV_SINGLE_ARG_DECL);
+  void set_default_server_protocol_policy (ACE_ENV_SINGLE_ARG_DECL);
 
   static ACE_Lock *create_lock (int enable_locking,
                                 TAO_SYNCH_MUTEX &thread_lock);
@@ -377,7 +377,7 @@ public:
 
     virtual int find_persistent_poa (const poa_name &system_name,
                                      TAO_POA *&poa
-                                     TAO_ENV_ARG_DECL) = 0;
+                                     ACE_ENV_ARG_DECL) = 0;
 
     virtual int bind_persistent_poa (const poa_name &folded_name,
                                      TAO_POA *poa,
@@ -410,7 +410,7 @@ public:
 
     virtual int find_persistent_poa (const poa_name &system_name,
                                      TAO_POA *&poa
-                                     TAO_ENV_ARG_DECL);
+                                     ACE_ENV_ARG_DECL);
 
     virtual int bind_persistent_poa (const poa_name &folded_name,
                                      TAO_POA *poa,
@@ -444,7 +444,7 @@ public:
 
     virtual int find_persistent_poa (const poa_name &system_name,
                                      TAO_POA *&poa
-                                     TAO_ENV_ARG_DECL);
+                                     ACE_ENV_ARG_DECL);
 
     virtual int bind_persistent_poa (const poa_name &folded_name,
                                      TAO_POA *poa,
@@ -634,11 +634,11 @@ public:
     int prepare_for_upcall (const TAO_ObjectKey &key,
                             const char *operation,
                             CORBA::Object_out forward_to
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
     // Locate POA and servant.
 
     TAO_POA *lookup_POA (const TAO_ObjectKey &key
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
     // Locate POA.
 
     TAO_POA &poa (void) const;
@@ -689,7 +689,7 @@ public:
   protected:
 
     void servant_locator_cleanup (void);
-    void single_threaded_poa_setup (TAO_ENV_SINGLE_ARG_DECL);
+    void single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL);
     void single_threaded_poa_cleanup (void);
     void servant_cleanup (void);
     void poa_cleanup (void);
diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i
index 1bbfebe3018..f472c0c0247 100644
--- a/TAO/tao/PortableServer/Object_Adapter.i
+++ b/TAO/tao/PortableServer/Object_Adapter.i
@@ -45,36 +45,36 @@ TAO_Object_Adapter::transient_poa_name_size ()
 
 ACE_INLINE int
 TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   // Lock access for the duration of this transaction.
   TAO_OBJECT_ADAPTER_GUARD_RETURN (-1);
 
   return this->locate_servant_i (key
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_SERVANT_LOCATION
 TAO_Object_Adapter::find_servant (const TAO_ObjectKey &key,
                                   PortableServer::Servant &servant
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   // Lock access for the duration of this transaction.
   TAO_OBJECT_ADAPTER_GUARD_RETURN (TAO_SERVANT_NOT_FOUND);
 
   return this->find_servant_i (key,
                                servant
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE int
 TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name,
                                          TAO_POA *&poa
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
 {
   return this->hint_strategy_->find_persistent_poa (system_name,
                                                     poa
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE int
@@ -83,13 +83,13 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name,
                               CORBA::Boolean root,
                               const TAO_Temporary_Creation_Time &poa_creation_time,
                               TAO_POA *&poa
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   if (activate_it)
     {
       return this->find_persistent_poa (system_name,
                                         poa
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
     }
   else
     {
@@ -97,7 +97,7 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name,
                                        root,
                                        poa_creation_time,
                                        poa
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
     }
 }
 
diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp
index 787e3f0efcc..b1a4e99f340 100644
--- a/TAO/tao/PortableServer/Operation_Table.cpp
+++ b/TAO/tao/PortableServer/Operation_Table.cpp
@@ -377,7 +377,7 @@ template class TAO_Singleton<TAO_Operation_Table_Parameters, TAO_SYNCH_RECURSIVE
 // This is necessary with g++ 2.91.66 to avoid a couple of strange
 // unresolved ACE_Hash_Map_Entry symbols.  (Strange because c++filt
 // can't demangle them.)
-template class ACE_Hash_Map_Entry<char const *, void (*)(CORBA_ServerRequest &, void *, void * TAO_ENV_ARG_DECL_NOT_USED)>;
+template class ACE_Hash_Map_Entry<char const *, void (*)(CORBA_ServerRequest &, void *, void * ACE_ENV_ARG_DECL_NOT_USED)>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, TAO_Skeleton, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index c8a6084c081..57cbe5236e5 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -61,7 +61,7 @@ TAO_POA::_tao_poa_downcast(void)
 
 PortableServer::ThreadPolicy_ptr
 TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Thread_Policy *thread_policy = 0;
@@ -77,7 +77,7 @@ TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
 
 PortableServer::LifespanPolicy_ptr
 TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Lifespan_Policy *lifespan_policy = 0;
@@ -91,7 +91,7 @@ TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
 
 PortableServer::IdUniquenessPolicy_ptr
 TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Id_Uniqueness_Policy *id_uniqueness_policy = 0;
@@ -105,7 +105,7 @@ TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue va
 
 PortableServer::IdAssignmentPolicy_ptr
 TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Id_Assignment_Policy *id_assignment_policy = 0;
@@ -121,7 +121,7 @@ TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue va
 
 PortableServer::ImplicitActivationPolicy_ptr
 TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Implicit_Activation_Policy *implicit_activation_policy = 0;
@@ -135,7 +135,7 @@ TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPo
 
 PortableServer::ServantRetentionPolicy_ptr
 TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Servant_Retention_Policy *servant_retention_policy = 0;
@@ -149,7 +149,7 @@ TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicy
 
 PortableServer::RequestProcessingPolicy_ptr
 TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Request_Processing_Policy *request_processing_policy = 0;
@@ -166,7 +166,7 @@ TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPoli
 void
 TAO_POA::set_obj_ref_factory (
   PortableInterceptor::ObjectReferenceFactory *current_factory
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   // @@ Priyanka, I have no idea what you're doing here.
 
@@ -209,7 +209,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
                   TAO_SYNCH_MUTEX &thread_lock,
                   TAO_ORB_Core &orb_core,
                   TAO_Object_Adapter *object_adapter
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
   : name_ (name),
     poa_manager_ (poa_manager),
     policy_list_ (0),
@@ -260,7 +260,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
   // Parse the policies that are used in the critical path in
   // a cache.
   this->cached_policies_.update (this->policies_
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #if (TAO_HAS_MINIMUM_POA == 1)
@@ -290,7 +290,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
                                            this->cached_policies_.id_uniqueness () == PortableServer::UNIQUE_ID,
                                            this->persistent (),
                                            this->orb_core_.server_factory ()->active_object_map_creation_parameters ()
-                                           TAO_ENV_ARG_PARAMETER),
+                                           ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
 
   // Give ownership of the new map to the auto pointer.  Note, that it
@@ -349,7 +349,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
     {
       int temp = this->use_imr_;
       this->use_imr_ = 0;
-      this->imr_notify_startup (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->imr_notify_startup (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       this->use_imr_ = temp;
     }
@@ -382,7 +382,7 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
                     TAO_ObjectReferenceTemplate (
                       server_id.in (),
                       orb_id.in (),
-                      this->adapter_name (TAO_ENV_SINGLE_ARG_PARAMETER),
+                      this->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER),
                       this),
                     CORBA::NO_MEMORY ());
   // @@ Priyanka, where's the ACE_CHECK?
@@ -390,13 +390,13 @@ TAO_POA::TAO_POA (const TAO_POA::String &name,
   this->ort_template_ = ort_template;
 
   this->set_obj_ref_factory (this->ort_template_
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   // @@ Priyanka, where's the ACE_CHECK?
 
   // Iterate over the registered IOR interceptors so that they may be
   // given the opportunity to add tagged components to the profiles
   // for this servant.
-  this->tao_establish_components (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->tao_establish_components (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 }
@@ -407,7 +407,7 @@ TAO_POA::~TAO_POA (void)
 }
 
 void
-TAO_POA::complete_destruction_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
 {
   // No longer awaiting destruction.
   this->waiting_destruction_ = 0;
@@ -469,7 +469,7 @@ PortableServer::POA_ptr
 TAO_POA::create_POA_i (const char *adapter_name,
                        PortableServer::POAManager_ptr poa_manager,
                        const CORBA::PolicyList &policies
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
@@ -480,12 +480,12 @@ TAO_POA::create_POA_i (const char *adapter_name,
 
   // Merge policies from the ORB level.
   this->object_adapter ().validator ().merge_policies (tao_policies.policies ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Merge in any policies that the user may have specified.
   tao_policies.merge_policies (policies
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // If any of the policy objects specified are not valid for the ORB
@@ -496,7 +496,7 @@ TAO_POA::create_POA_i (const char *adapter_name,
   // policies parameter value of the first offending policy object.
   tao_policies.validate_policies (this->object_adapter ().validator (),
                                   this->orb_core_
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // If the poa_manager parameter is null, a new POAManager object is
@@ -521,7 +521,7 @@ TAO_POA::create_POA_i (const char *adapter_name,
   TAO_POA *poa = this->create_POA_i (adapter_name,
                                      *tao_poa_manager,
                                      tao_policies
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   return PortableServer::POA::_duplicate (poa);
@@ -536,7 +536,7 @@ TAO_POA::new_POA (const String &name,
                   TAO_SYNCH_MUTEX &thread_lock,
                   TAO_ORB_Core &orb_core,
                   TAO_Object_Adapter *object_adapter
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   TAO_POA *poa;
 
@@ -549,7 +549,7 @@ TAO_POA::new_POA (const String &name,
                              thread_lock,
                              orb_core,
                              object_adapter
-                             TAO_ENV_ARG_PARAMETER),
+                             ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
@@ -560,7 +560,7 @@ TAO_POA *
 TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
                        TAO_POA_Manager &poa_manager,
                        const TAO_POA_Policy_Set &policies
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
@@ -596,7 +596,7 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
                                 this->object_adapter ().thread_lock (),
                                 this->orb_core_,
                                 this->object_adapter_
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 
   // Give ownership of the new map to the POA_var.  Note, that it
   // is important for the POA_var to take ownership before
@@ -638,7 +638,7 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
 PortableServer::POA_ptr
 TAO_POA::find_POA (const char *adapter_name,
                    CORBA::Boolean activate_it
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterNonExistent))
 {
@@ -657,7 +657,7 @@ TAO_POA::find_POA (const char *adapter_name,
 
   TAO_POA *poa = this->find_POA_i (adapter_name,
                                    activate_it
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   return PortableServer::POA::_duplicate (poa);
@@ -666,7 +666,7 @@ TAO_POA::find_POA (const char *adapter_name,
 TAO_POA *
 TAO_POA::find_POA_i (const ACE_CString &child_name,
                      CORBA::Boolean activate_it
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterNonExistent))
 {
@@ -683,13 +683,13 @@ TAO_POA::find_POA_i (const ACE_CString &child_name,
           if (!CORBA::is_nil (this->adapter_activator_.in ()))
             {
               // Check the state of the POA Manager.
-              this->check_poa_manager_state (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->check_poa_manager_state (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK_RETURN (0);
 
               CORBA::Boolean success =
                 this->adapter_activator_->unknown_adapter (this,
                                                            child_name.c_str ()
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (0);
 
               if (success)
@@ -731,7 +731,7 @@ TAO_POA::find_POA_i (const ACE_CString &child_name,
 void
 TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
                     CORBA::Boolean wait_for_completion
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->cleanup_in_progress_)
@@ -740,7 +740,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_POA::check_for_valid_wait_for_completions (this->orb_core (),
                                                  wait_for_completion
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->cleanup_in_progress_ = 1;
@@ -796,7 +796,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
 
       child_poa->destroy_i (etherealize_objects,
                             wait_for_completion
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -814,15 +814,15 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
           TAO_POA *tao_poa = 0;
 
           PortableServer::POA_var poa =
-            this->server_object_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->server_object_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           tao_poa = poa->_tao_poa_downcast();
           PortableServer::ObjectId_var id =
-            tao_poa->servant_to_id_i (this->server_object_ TAO_ENV_ARG_PARAMETER);
+            tao_poa->servant_to_id_i (this->server_object_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          tao_poa->deactivate_object_i (id.in ()TAO_ENV_ARG_PARAMETER);
+          tao_poa->deactivate_object_i (id.in ()ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -842,7 +842,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
 
   this->deactivate_all_objects_i (etherealize_objects,
                                   wait_for_completion
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // If there are no outstanding requests and that we are not in a
@@ -854,7 +854,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
       (non_servant_upcall_in_progress == 0 ||
        &non_servant_upcall_in_progress->poa () != this))
     {
-      this->complete_destruction_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
   this->adapter_state_ = PortableInterceptor::NON_EXISTENT;
@@ -888,7 +888,7 @@ TAO_POA::delete_child (const TAO_POA::String &child)
 }
 
 PortableServer::POAList *
-TAO_POA::the_children_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA::the_children_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAList_var children;
@@ -918,7 +918,7 @@ TAO_POA::the_children_i (TAO_ENV_SINGLE_ARG_DECL)
 //    TypeCodes!
 //
 CORBA::StringSeq *
-TAO_POA::adapter_name_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   /// The adapter name is the sequence of names starting from the
@@ -939,7 +939,7 @@ TAO_POA::adapter_name_i (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::StringSeq_var safe_args (name_seq);
 
   CORBA::String_var current_poa_name =
-    this->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong name_seq_length = 0;
@@ -963,11 +963,11 @@ TAO_POA::adapter_name_i (TAO_ENV_SINGLE_ARG_DECL)
       /// Make the parent name as the current_poa_name
       /// Go up the ladder by one parent ;-)
       PortableServer::POA_var current_poa_name_parent =
-        current_poa->the_parent (TAO_ENV_SINGLE_ARG_PARAMETER);
+        current_poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       current_poa_name =
-        current_poa_name_parent->the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+        current_poa_name_parent->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       current_poa =
@@ -991,7 +991,7 @@ TAO_POA::set_mprofile (TAO_MProfile *mprofile)
 
 void
 TAO_POA::tao_add_ior_component (const IOP::TaggedComponent &component
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the given tagged component to all profiles.
@@ -1002,7 +1002,7 @@ TAO_POA::tao_add_ior_component (const IOP::TaggedComponent &component
     {
       TAO_Profile *profile = this->mprofile_->get_profile (i);
 
-      profile->add_tagged_component (component TAO_ENV_ARG_PARAMETER);
+      profile->add_tagged_component (component ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
     }
@@ -1012,7 +1012,7 @@ void
 TAO_POA::tao_add_ior_component_to_profile (
     const IOP::TaggedComponent &component,
     IOP::ProfileId profile_id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Add the given tagged component to all profiles matching the given
@@ -1027,7 +1027,7 @@ TAO_POA::tao_add_ior_component_to_profile (
 
       if (profile->tag () == profile_id)
         {
-          profile->add_tagged_component (component TAO_ENV_ARG_PARAMETER);
+          profile->add_tagged_component (component ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           found_profile = 1;
@@ -1066,7 +1066,7 @@ adapter_state_changed (const PortableInterceptor::ObjectReferenceTemplateSeq *se
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::ServantManager_ptr
-TAO_POA::get_servant_manager_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA::get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -1089,7 +1089,7 @@ TAO_POA::get_servant_manager_i (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -1105,7 +1105,7 @@ TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr
   if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
     {
       this->servant_activator_ = PortableServer::ServantActivator::_narrow (imgr
-                                                                            TAO_ENV_ARG_PARAMETER);
+                                                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (CORBA::is_nil (this->servant_activator_.in ()))
@@ -1116,7 +1116,7 @@ TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr
   else
     {
       this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr
-                                                                        TAO_ENV_ARG_PARAMETER);
+                                                                        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (CORBA::is_nil (this->servant_locator_.in ()))
@@ -1127,7 +1127,7 @@ TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr
 }
 
 PortableServer::Servant
-TAO_POA::get_servant_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA::get_servant_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::NoServant,
                    PortableServer::POA::WrongPolicy))
@@ -1163,7 +1163,7 @@ TAO_POA::get_servant_i (TAO_ENV_SINGLE_ARG_DECL)
       // conforming caller need not invoke _remove_ref on the returned
       // Servant if the type of the Servant uses the default reference
       // counting inherited from ServantBase.
-      result->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      result->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       return result;
@@ -1179,7 +1179,7 @@ TAO_POA::get_servant_i (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_POA::set_servant_i (PortableServer::Servant servant
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -1212,7 +1212,7 @@ TAO_POA::set_servant_i (PortableServer::Servant servant
       TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
       ACE_UNUSED_ARG (non_servant_upcall);
 
-      servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -1300,7 +1300,7 @@ TAO_POA::is_user_id_in_map (const PortableServer::ObjectId &id,
 PortableServer::ObjectId *
 TAO_POA::activate_object_i (PortableServer::Servant servant,
                             CORBA::Short priority
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
@@ -1354,7 +1354,7 @@ TAO_POA::activate_object_i (PortableServer::Servant servant,
   // least once on the Servant argument before returning. When the POA
   // no longer needs the Servant, it will invoke _remove_ref on it the
   // same number of times.
-  servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return user_id._retn ();
@@ -1364,7 +1364,7 @@ void
 TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
                                     PortableServer::Servant servant,
                                     CORBA::Short priority
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
@@ -1452,29 +1452,29 @@ TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
   // _add_ref at least once on the Servant argument before
   // returning. When the POA no longer needs the Servant, it will
   // invoke _remove_ref on it the same number of times.
-  servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+  servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
                                    CORBA::Boolean wait_for_completion
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   this->deactivate_all_objects_i (etherealize_objects
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->wait_for_completions (wait_for_completion
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_POA::wait_for_completions (CORBA::Boolean wait_for_completion
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   while (this->object_adapter ().enable_locking_ &&
          wait_for_completion &&
@@ -1494,7 +1494,7 @@ TAO_POA::wait_for_completions (CORBA::Boolean wait_for_completion
 void
 TAO_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core,
                                                CORBA::Boolean wait_for_completion
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
 {
   if (wait_for_completion)
     {
@@ -1530,7 +1530,7 @@ TAO_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core,
 
 void
 TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -1580,14 +1580,14 @@ TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects
        ++i)
     {
       this->deactivate_map_entry (map_entries[i]
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -1611,13 +1611,13 @@ TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id
     }
 
   this->deactivate_map_entry (active_object_map_entry
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_POA::deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   // Decrement the reference count.
   CORBA::UShort new_count = --active_object_map_entry->reference_count_;
@@ -1625,7 +1625,7 @@ TAO_POA::deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_m
   if (new_count == 0)
     {
       this->cleanup_servant (active_object_map_entry
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
@@ -1647,7 +1647,7 @@ TAO_POA::deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_m
 
 void
 TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   // If a servant manager is associated with the POA,
   // ServantLocator::etherealize will be invoked with the oid and the
@@ -1702,7 +1702,7 @@ TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_en
                                                  active_object_map_entry->servant_,
                                                  this->cleanup_in_progress_,
                                                  remaining_activations
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -1721,7 +1721,7 @@ TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_en
           TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
           ACE_UNUSED_ARG (non_servant_upcall);
 
-          active_object_map_entry->servant_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+          active_object_map_entry->servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -1738,7 +1738,7 @@ TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_en
 }
 
 void
-TAO_POA::check_poa_manager_state (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA::check_poa_manager_state (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POAManager::State state = this->poa_manager_.get_state_i ();
 
@@ -1812,7 +1812,7 @@ TAO_POA::check_poa_manager_state (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Object_ptr
 TAO_POA::create_reference_i (const char *intf
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -1868,7 +1868,7 @@ TAO_POA::create_reference_i (const char *intf
   CORBA::Object_var object =
     this->obj_ref_factory_->make_object (intf,
                                          *obj_id
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return object._retn ();
@@ -1877,7 +1877,7 @@ TAO_POA::create_reference_i (const char *intf
 CORBA::Object_ptr
 TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
                                      const char *intf
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -1906,7 +1906,7 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
   CORBA::Object_var obj_ptr =
     this->obj_ref_factory_->make_object (intf,
                                          *obj_id
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return obj_ptr._retn ();
@@ -1914,7 +1914,7 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
 
 PortableServer::ObjectId *
 TAO_POA::servant_to_id_i (PortableServer::Servant servant
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -1981,7 +1981,7 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant
       // is invoked at least once on the Servant argument before
       // returning. Otherwise, the POA does not increment or decrement
       // the reference count of the Servant passed to this function.
-      servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       return user_id._retn ();
@@ -2012,7 +2012,7 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant
           if (poa_current_impl != 0 &&
               servant == poa_current_impl->servant ())
             {
-              return poa_current_impl->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+              return poa_current_impl->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
             }
         }
     }
@@ -2027,7 +2027,7 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant
 PortableServer::ObjectId *
 TAO_POA::servant_to_system_id_i (PortableServer::Servant servant,
                                  CORBA::Short &priority
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -2094,7 +2094,7 @@ TAO_POA::servant_to_system_id_i (PortableServer::Servant servant,
       // is invoked at least once on the Servant argument before
       // returning. Otherwise, the POA does not increment or decrement
       // the reference count of the Servant passed to this function.
-      servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       return system_id._retn ();
@@ -2107,7 +2107,7 @@ TAO_POA::servant_to_system_id_i (PortableServer::Servant servant,
 
 CORBA::Object_ptr
 TAO_POA::servant_to_reference (PortableServer::Servant servant
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -2123,7 +2123,7 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant
   PortableServer::ObjectId_var id =
     this->servant_to_system_id (servant,
                                 priority
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   PortableServer::ObjectId user_id;
@@ -2145,7 +2145,7 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant
   CORBA::Object_var object =
     this->obj_ref_factory_->make_object (servant->_interface_repository_id (),
                                          *obj_id
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   return object._retn ();
@@ -2153,7 +2153,7 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant
 
 PortableServer::Servant
 TAO_POA::reference_to_servant (CORBA::Object_ptr reference
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongAdapter,
@@ -2181,7 +2181,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference
   // servant associated with that object in the Active Object Map.
   if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
     {
-      TAO_ObjectKey_var key = reference->_key (TAO_ENV_SINGLE_ARG_PARAMETER);
+      TAO_ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // If the object reference was not created by this POA, the
@@ -2256,7 +2256,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference
           // _remove_ref on the returned Servant if the type of the
           // Servant uses the default reference counting inherited
           // from ServantBase.
-          servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+          servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return servant;
@@ -2301,7 +2301,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference
           // _remove_ref on the returned Servant if the type of the
           // Servant uses the default reference counting inherited
           // from ServantBase.
-          result->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+          result->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           return result;
@@ -2322,7 +2322,7 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference
 
 PortableServer::ObjectId *
 TAO_POA::reference_to_id (CORBA::Object_ptr reference
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongAdapter,
                    PortableServer::POA::WrongPolicy))
@@ -2343,7 +2343,7 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference
   // POA on which the operation is being performed.  If the object
   // reference was not created by this POA, the WrongAdapter exception
   // is raised.
-  TAO_ObjectKey_var key = reference->_key (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   PortableServer::ObjectId system_id;
@@ -2402,7 +2402,7 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference
 
 PortableServer::Servant
 TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -2440,7 +2440,7 @@ TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id
       // conforming caller need not invoke _remove_ref on the returned
       // Servant if the type of the Servant uses the default reference
       // counting inherited from ServantBase.
-      servant->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       return servant;
@@ -2455,7 +2455,7 @@ TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id
 
 CORBA::Object_ptr
 TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -2488,7 +2488,7 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id
                                   servant,
                                   1,
                                   priority
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
     }
   else
     // If the Object Id value is not active in the POA, an
@@ -2500,7 +2500,7 @@ TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id
 }
 
 CORBA::OctetSeq *
-TAO_POA::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_POA::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return new CORBA::OctetSeq (this->id_);
@@ -2509,7 +2509,7 @@ TAO_POA::id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 TAO_SERVANT_LOCATION
 TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
                            PortableServer::Servant &servant
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   // If the POA has the RETAIN policy, the POA looks in the Active
   // Object Map to find if there is a servant associated with the
@@ -2597,7 +2597,7 @@ TAO_POA::locate_servant_i (const char *operation,
                            const PortableServer::ObjectId &system_id,
                            TAO_Object_Adapter::Servant_Upcall &servant_upcall,
                            TAO_POA_Current_Impl &poa_current_impl
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   // If we have the RETAIN policy, convert/transform from system id to
   // user id.
@@ -2732,7 +2732,7 @@ TAO_POA::locate_servant_i (const char *operation,
             // Invocations of incarnate and etherealize on the servant manager are mutually exclusive.
             servant = this->servant_activator_->incarnate (poa_current_impl.object_id (),
                                                            this
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
             ACE_CHECK_RETURN (0);
 
             if (servant == 0)
@@ -2806,7 +2806,7 @@ TAO_POA::locate_servant_i (const char *operation,
                                                                                this,
                                                                                operation,
                                                                                cookie
-                                                                               TAO_ENV_ARG_PARAMETER);
+                                                                               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (servant == 0)
@@ -3312,7 +3312,7 @@ TAO_Adapter_Activator::TAO_Adapter_Activator (PortableServer::POAManager_ptr poa
 CORBA::Boolean
 TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
                                         const char *name
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Default policies
@@ -3322,19 +3322,19 @@ TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
   PortableServer::POA_var child = parent->create_POA (name,
                                                       this->poa_manager_.in (),
                                                       default_policies
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TRY
     {
-      child->the_activator (this TAO_ENV_ARG_PARAMETER);
+      child->the_activator (this ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       child->destroy (1,
                       1
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
 
       return 0;
     }
@@ -3350,7 +3350,7 @@ TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
 CORBA::Object_ptr
 TAO_POA::invoke_key_to_object (const char *intf,
                                PortableServer::ObjectId &user_id
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   CORBA::Short priority;
 
@@ -3443,7 +3443,7 @@ TAO_POA::invoke_key_to_object (const char *intf,
                                     servant,
                                     1,
                                     priority
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     }
   else
     {
@@ -3453,7 +3453,7 @@ TAO_POA::invoke_key_to_object (const char *intf,
                                     0,
                                     1,
                                     priority
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
 
@@ -3466,12 +3466,12 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key,
                         TAO_ServantBase *servant,
                         CORBA::Boolean collocated,
                         CORBA::Short priority
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   // Check if the ORB is still running, otherwise throw an exception.
   // @@ What if the ORB was destroyed?  In that case we shouldn't even
   //    get here!
-  this->orb_core_.check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   //
@@ -3499,7 +3499,7 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key,
         }
 
       CORBA::String_var imr_str =
-        imr->_stubobj ()->profile_in_use ()->to_string (TAO_ENV_SINGLE_ARG_PARAMETER);
+        imr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (obj);
 
       if (TAO_debug_level > 0)
@@ -3541,7 +3541,7 @@ TAO_POA::key_to_object (const TAO_ObjectKey &key,
                     ior.c_str ()));
 
       obj =
-        this->orb_core_.orb ()->string_to_object (ior.c_str () TAO_ENV_ARG_PARAMETER);
+        this->orb_core_.orb ()->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (obj);
 
       return obj;
@@ -3552,7 +3552,7 @@ orbkey:
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
   TAO_Stub *data =
-    this->key_to_stub_i (key, type_id, priority TAO_ENV_ARG_PARAMETER);
+    this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
 
@@ -3590,30 +3590,30 @@ TAO_Stub *
 TAO_POA::key_to_stub (const TAO_ObjectKey &key,
                       const char *type_id,
                       CORBA::Short priority
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   // Check if the ORB is still running, otherwise throw an exception.
   // @@ What if the ORB was destroyed?  In that case we shouldn't even
   //    get here!
-  this->orb_core_.check_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->key_to_stub_i (key, type_id, priority TAO_ENV_ARG_PARAMETER);
+  return this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_Stub *
 TAO_POA::key_to_stub_i (const TAO_ObjectKey &key,
                         const char *type_id,
                         CORBA::Short priority
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   CORBA::PolicyList_var client_exposed_policies =
     this->client_exposed_policies (priority
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   /// Set the endpoints
-  (void) this->orb_core_.open (TAO_ENV_SINGLE_ARG_PARAMETER);
+  (void) this->orb_core_.open (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Default_Acceptor_Filter filter;
@@ -3623,14 +3623,14 @@ TAO_POA::key_to_stub_i (const TAO_ObjectKey &key,
                               client_exposed_policies._retn (),
                               &filter,
                               this->orb_core_.lane_resources ().acceptor_registry ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return data;
 }
 
 void
-TAO_POA::tao_establish_components (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA::tao_establish_components (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableInterceptor::IORInfo_ptr info_temp;
   ACE_NEW_THROW_EX (info_temp,
@@ -3645,13 +3645,13 @@ TAO_POA::tao_establish_components (TAO_ENV_SINGLE_ARG_DECL)
   PortableInterceptor::IORInfo_var info = info_temp;
 
   this->establish_components (info.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 
 }
 
 void
 TAO_POA::establish_components (PortableInterceptor::IORInfo *info
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   // Iterate over the registered IOR interceptors so that they may be
   // given the opportunity to add tagged components to the profiles
@@ -3669,7 +3669,7 @@ TAO_POA::establish_components (PortableInterceptor::IORInfo *info
         {
           interceptors[i]->establish_components (
             info
-            TAO_ENV_ARG_PARAMETER);
+            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -3682,7 +3682,7 @@ TAO_POA::establish_components (PortableInterceptor::IORInfo *info
           if (TAO_debug_level > 1)
             {
               CORBA::String_var name = interceptors[i]->name (
-                TAO_ENV_SINGLE_ARG_PARAMETER);
+                ACE_ENV_SINGLE_ARG_PARAMETER);
               // @@ What do we do if we get an exception here?
 
               if (name.in () != 0)
@@ -3703,14 +3703,14 @@ TAO_POA::establish_components (PortableInterceptor::IORInfo *info
     }
 
   this->components_established_i (info
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 
   return;
 }
 
 void
 TAO_POA::components_established_i (PortableInterceptor::IORInfo *info
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   // Iterate over the registered IOR interceptors so that they may be
   // given the opportunity to add tagged components to the profiles
@@ -3730,7 +3730,7 @@ TAO_POA::components_established_i (PortableInterceptor::IORInfo *info
         {
           interceptors[j]->components_established (
             info
-            TAO_ENV_ARG_PARAMETER);
+            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -3757,7 +3757,7 @@ TAO_POA::get_policy_list ()
 
 void
 TAO_POA::save_ior_component (const IOP::TaggedComponent &component
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
 {
   // @@ Priyanka, let's think about why this is broken.
   //    - This method gets invoked by IORInfo::add_ior_component().
@@ -3780,7 +3780,7 @@ void
 TAO_POA::
 save_ior_component_and_profile_id (const IOP::TaggedComponent &component,
                                    IOP::ProfileId profile_id
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
 {
   // @@ Priyanka, let's think about why this is broken.
   //    - This method gets invoked by IORInfo::add_ior_component().
@@ -3810,7 +3810,7 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key,
                              CORBA::PolicyList *policy_list,
                              TAO_Acceptor_Filter *filter,
                              TAO_Acceptor_Registry &acceptor_registry
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   int error = 0;
 
@@ -3882,7 +3882,7 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key,
         {
           // Get the ith profile
           profile = mprofile.get_profile (i);
-          profile->policies (policy_list TAO_ENV_ARG_PARAMETER);
+          profile->policies (policy_list ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
     }
@@ -3898,14 +3898,14 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key,
       if (this->profile_id_ == 0)
         {
           this->tao_add_ior_component (this->tagged_component_
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
       else
         {
           this->tao_add_ior_component_to_profile (this->tagged_component_,
                                                   this->profile_id_
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
     }
@@ -3914,12 +3914,12 @@ TAO_POA::create_stub_object (const TAO_ObjectKey &object_key,
     this->orb_core_.create_stub_object (mprofile,
                                         type_id,
                                         policy_list
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::PolicyList *
 TAO_POA::client_exposed_policies (CORBA::Short object_priority
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   CORBA::PolicyList *client_exposed_policies = 0;
   ACE_NEW_THROW_EX (client_exposed_policies,
@@ -3932,7 +3932,7 @@ TAO_POA::client_exposed_policies (CORBA::Short object_priority
 
   // Add in all of the client exposed policies.
   this->policies_.add_client_exposed_fixed_policies (client_exposed_policies
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_UNUSED_ARG (object_priority);
@@ -3946,7 +3946,7 @@ TAO_POA::client_exposed_policies (CORBA::Short object_priority
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
 void
-TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA::imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notifying IMR of startup\n"));
@@ -3970,16 +3970,16 @@ TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL)
   PortableServer::ObjectId_var id =
     root_poa->activate_object_i (this->server_object_,
                                  this->cached_policies_.server_priority ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var obj = root_poa->id_to_reference_i (id.in  ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ImplementationRepository::ServerObject_var svr
     = ImplementationRepository::ServerObject::_narrow (obj.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!svr->_stubobj () || !svr->_stubobj ()->profile_in_use ())
@@ -3989,7 +3989,7 @@ TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::String_var svr_str =
-    svr->_stubobj ()->profile_in_use ()->to_string (TAO_ENV_SINGLE_ARG_PARAMETER);
+    svr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Search for "corbaloc:" alone, without the protocol.  This code
@@ -4015,7 +4015,7 @@ TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL)
   CORBA::String_var curr_addr (svr_str);
 
   ImplementationRepository::Administration_var imr_admin =
-    ImplementationRepository::Administration::_narrow (imr.in ()TAO_ENV_ARG_PARAMETER);
+    ImplementationRepository::Administration::_narrow (imr.in ()ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (TAO_debug_level > 0)
@@ -4026,7 +4026,7 @@ TAO_POA::imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL)
       imr_admin->server_is_running (this->name ().c_str (),
                                     curr_addr.in (),
                                     svr.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -4065,10 +4065,10 @@ TAO_POA::imr_notify_shutdown (void)
     {
       // Get the IMR's administrative object and call shutting_down on it
       ImplementationRepository::Administration_var imr_admin =
-        ImplementationRepository::Administration::_narrow (imr.in ()TAO_ENV_ARG_PARAMETER);
+        ImplementationRepository::Administration::_narrow (imr.in ()ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      imr_admin->server_is_shutting_down (this->the_name ()TAO_ENV_ARG_PARAMETER);
+      imr_admin->server_is_shutting_down (this->the_name ()ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -4082,7 +4082,7 @@ TAO_POA::imr_notify_shutdown (void)
 #endif /* TAO_HAS_MINIMUM_CORBA */
 
 TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa
-                              TAO_ENV_ARG_DECL,
+                              ACE_ENV_ARG_DECL,
                               int check_for_destruction)
   : guard_ (poa.lock ())
 {
@@ -4097,7 +4097,7 @@ TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa
   // Check if a non-servant upcall is in progress.  If a non-servant
   // upcall is in progress, wait for it to complete.  Unless of
   // course, the thread making the non-servant upcall is this thread.
-  poa.object_adapter ().wait_for_non_servant_upcalls_to_complete (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa.object_adapter ().wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (check_for_destruction &&
@@ -4114,7 +4114,7 @@ TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa
 
 PortableServer::ObjectId *
 TAO_POA::create_id_for_reference (CORBA::Object_ptr the_ref
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableServer::NotAGroupObject
@@ -4127,7 +4127,7 @@ TAO_POA::create_id_for_reference (CORBA::Object_ptr the_ref
     }
 
   PortableServer::ObjectId *obj_id =
-    hooks->create_id_for_reference (*this, the_ref TAO_ENV_ARG_PARAMETER);
+    hooks->create_id_for_reference (*this, the_ref ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return obj_id;
@@ -4135,7 +4135,7 @@ TAO_POA::create_id_for_reference (CORBA::Object_ptr the_ref
 
 PortableServer::IDs *
 TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableServer::NotAGroupObject
@@ -4149,7 +4149,7 @@ TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref
     }
 
   PortableServer::IDs *id_list =
-    hooks->reference_to_ids (*this, the_ref TAO_ENV_ARG_PARAMETER);
+    hooks->reference_to_ids (*this, the_ref ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return id_list;
@@ -4158,7 +4158,7 @@ TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref
 void
 TAO_POA::associate_reference_with_id (CORBA::Object_ptr ref,
                                       const PortableServer::ObjectId & oid
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableServer::NotAGroupObject
@@ -4170,14 +4170,14 @@ TAO_POA::associate_reference_with_id (CORBA::Object_ptr ref,
       ACE_THROW (CORBA::NO_IMPLEMENT ());
     }
 
-  hooks->associate_reference_with_id (*this, ref, oid TAO_ENV_ARG_PARAMETER);
+  hooks->associate_reference_with_id (*this, ref, oid ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_POA::disassociate_reference_with_id (CORBA::Object_ptr ref,
                                          const PortableServer::ObjectId & oid
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
       PortableServer::NotAGroupObject
@@ -4189,7 +4189,7 @@ TAO_POA::disassociate_reference_with_id (CORBA::Object_ptr ref,
       ACE_THROW (CORBA::NO_IMPLEMENT ());
     }
 
-  hooks->disassociate_reference_with_id (*this, ref, oid TAO_ENV_ARG_PARAMETER);
+  hooks->disassociate_reference_with_id (*this, ref, oid ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/POA.h
index edc49c0d6e6..513a5673ded 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/POA.h
@@ -148,71 +148,71 @@ public:
   PortableServer::POA_ptr create_POA (const char *adapter_name,
                                       PortableServer::POAManager_ptr poa_manager,
                                       const CORBA::PolicyList &policies
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
 
   PortableServer::POA_ptr find_POA (const char *adapter_name,
                                     CORBA::Boolean activate_it
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterNonExistent));
 
   void destroy (CORBA::Boolean etherealize_objects,
                 CORBA::Boolean wait_for_completion
-                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value
-                                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                                                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                                                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                                                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  char * the_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr the_parent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAList *the_children (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POAList *the_children (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAManager_ptr the_POAManager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POAManager_ptr the_POAManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableInterceptor::AdapterManagerId get_manager_id (TAO_ENV_SINGLE_ARG_DECL)
+  PortableInterceptor::AdapterManagerId get_manager_id (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // @@ Priyanka, shouldn't this method return a
@@ -223,7 +223,7 @@ public:
   /// This method returns the adapter_name as a sequence of strings of
   /// length one or more or just a fixed name depending on the Object
   /// Adapter. Added wrt to ORT Spec.
-  CORBA::StringSeq *adapter_name (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::StringSeq *adapter_name (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// {@ Accessor methods to ObjectReferenceTemplate
@@ -231,7 +231,7 @@ public:
 
   void set_adapter_template (PortableInterceptor::ObjectReferenceTemplate *
                              object_ref_template
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   /// @}
 
   /// {@ Accessor methods to PortableInterceptor::ObjectReferenceFactory
@@ -239,17 +239,17 @@ public:
 
   void set_obj_ref_factory (PortableInterceptor::ObjectReferenceFactory *
                             current_factory
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
   /// @}
 
   /// Call the establish components.
-  void tao_establish_components (TAO_ENV_SINGLE_ARG_DECL);
+  void tao_establish_components (ACE_ENV_SINGLE_ARG_DECL);
 
 
   /// Give each registered IOR interceptor the opportunity to add
   /// tagged components to profiles of each created servant.
   void establish_components (PortableInterceptor::IORInfo *info
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /// TAO_IORInfo requests these members.
   CORBA::PolicyList *get_policy_list ();
@@ -260,115 +260,115 @@ public:
   //    Do you really need it?
   void
   save_ior_component (const IOP::TaggedComponent &component
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
   // @@ Priyanka, this method appears to be very useless and broken.
   //    Do you really need it?
   void
   save_ior_component_and_profile_id (const IOP::TaggedComponent &component,
                                      IOP::ProfileId profile_id
-                                     TAO_ENV_ARG_DECL);
+                                     ACE_ENV_ARG_DECL);
 
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::AdapterActivator_ptr the_activator (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::AdapterActivator_ptr the_activator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ServantManager_ptr get_servant_manager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant get_servant (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::NoServant,
                      PortableServer::POA::WrongPolicy));
 
   void set_servant (PortableServer::Servant servant
-                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant
-                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
   void activate_object_with_id (const PortableServer::ObjectId &id,
                                 PortableServer::Servant p_servant
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
   void deactivate_object (const PortableServer::ObjectId &oid
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference (const char *intf
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
                                               const char *intf
-                                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
-                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference
-                                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference
-                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid
-                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::OctetSeq *id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -376,7 +376,7 @@ public:
 
   virtual PortableServer::ObjectId * create_id_for_reference (
       CORBA::Object_ptr the_ref
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -386,7 +386,7 @@ public:
 
   virtual PortableServer::IDs * reference_to_ids (
       CORBA::Object_ptr the_ref
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -396,7 +396,7 @@ public:
   virtual void associate_reference_with_id (
       CORBA::Object_ptr ref,
       const PortableServer::ObjectId & oid
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -406,7 +406,7 @@ public:
   virtual void disassociate_reference_with_id (
       CORBA::Object_ptr ref,
       const PortableServer::ObjectId & oid
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -424,7 +424,7 @@ public:
   TAO_POA_Cached_Policies &cached_policies (void);
 
   virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority
-                                                      TAO_ENV_ARG_DECL);
+                                                      ACE_ENV_ARG_DECL);
   // This method gives the policies that are exposed to the client.
   // These policies are shipped within the IOR.
 
@@ -449,7 +449,7 @@ public:
            TAO_SYNCH_MUTEX &thread_lock,
            TAO_ORB_Core &orb_core,
            TAO_Object_Adapter *object_adapter
-           TAO_ENV_ARG_DECL);
+           ACE_ENV_ARG_DECL);
 
   virtual ~TAO_POA (void);
 
@@ -470,7 +470,7 @@ public:
 
   static void check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core,
                                                     CORBA::Boolean wait_for_completion
-                                                    TAO_ENV_ARG_DECL);
+                                                    ACE_ENV_ARG_DECL);
 
   TAO_ORB_Core &orb_core (void) const;
   // ORB Core for POA.
@@ -485,7 +485,7 @@ public:
   TAO_Stub* key_to_stub (const TAO_ObjectKey &key,
                          const char *type_id,
                          CORBA::Short priority
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
   // Create the correct stub, properly initialized with the attributes
   // and policies attached to the current POA.
 
@@ -495,7 +495,7 @@ public:
   /// {@ Accesor methods to POA state. The POA can be in one of
   /// HOLDING, ACTIVE, DISCARDING, INACTIVE and NON_EXISTENT states.
   PortableInterceptor::AdapterState
-  get_adapter_state (TAO_ENV_SINGLE_ARG_DECL);
+  get_adapter_state (ACE_ENV_SINGLE_ARG_DECL);
 
   void set_adapter_state (PortableInterceptor::AdapterState
                           adapter_state,
@@ -517,12 +517,12 @@ protected:
                             TAO_SYNCH_MUTEX &thread_lock,
                             TAO_ORB_Core &orb_core,
                             TAO_Object_Adapter *object_adapter
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
   PortableServer::POA_ptr create_POA_i (const char *adapter_name,
                                         PortableServer::POAManager_ptr poa_manager,
                                         const CORBA::PolicyList &policies
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
@@ -530,25 +530,25 @@ protected:
   TAO_POA *create_POA_i (const String &adapter_name,
                          TAO_POA_Manager &poa_manager,
                          const TAO_POA_Policy_Set &policies
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
 
   TAO_POA *find_POA_i (const ACE_CString &child_name,
                        CORBA::Boolean activate_it
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterNonExistent));
 
   void destroy_i (CORBA::Boolean etherealize_objects,
                   CORBA::Boolean wait_for_completion
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void complete_destruction_i (TAO_ENV_SINGLE_ARG_DECL);
+  void complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL);
 
-  PortableServer::POAList *the_children_i (TAO_ENV_SINGLE_ARG_DECL)
+  PortableServer::POAList *the_children_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // @@ Priyanka, shouldn't this method return a
@@ -559,7 +559,7 @@ protected:
   /// This method returns the adapter_name as a sequence of strings of
   /// length one or more or just a fixed name depending on the Object
   /// Adapter. Added wrt to ORT Spec.
-  CORBA::StringSeq *adapter_name_i (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::StringSeq *adapter_name_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Method to notify the IOR Interceptors when there is a state
@@ -574,7 +574,7 @@ protected:
   /// Add the given tagged component to all profiles.
   void tao_add_ior_component (
       const IOP::TaggedComponent & component
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the given tagged component to all profiles matching the given
@@ -582,27 +582,27 @@ protected:
   void tao_add_ior_component_to_profile (
       const IOP::TaggedComponent & component,
       IOP::ProfileId profile_id
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::ServantManager_ptr get_servant_manager_i (TAO_ENV_SINGLE_ARG_DECL)
+  PortableServer::ServantManager_ptr get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   void set_servant_manager_i (PortableServer::ServantManager_ptr imgr
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant get_servant_i (TAO_ENV_SINGLE_ARG_DECL)
+  PortableServer::Servant get_servant_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::NoServant,
                      PortableServer::POA::WrongPolicy));
 
   void set_servant_i (PortableServer::Servant servant
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
@@ -613,7 +613,7 @@ protected:
 //
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-  void imr_notify_startup (TAO_ENV_SINGLE_ARG_DECL);
+  void imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL);
   // ImplRepo helper method, notify the ImplRepo on startup
 
   void imr_notify_shutdown (void);
@@ -624,21 +624,21 @@ protected:
   CORBA::Object_ptr invoke_key_to_object (const char *intf,
                                           PortableServer::ObjectId
                                           &user_id
-                                          TAO_ENV_ARG_DECL);
+                                          ACE_ENV_ARG_DECL);
 
   CORBA::Object_ptr key_to_object (const TAO_ObjectKey &key,
                                    const char *type_id,
                                    TAO_ServantBase *servant,
                                    CORBA::Boolean collocated,
                                    CORBA::Short priority
-                                   TAO_ENV_ARG_DECL);
+                                   ACE_ENV_ARG_DECL);
   // Wrapper for the ORB's key_to_object that will alter the object pointer
   // if the ImplRepo is used.
 
   virtual TAO_Stub* key_to_stub_i (const TAO_ObjectKey &key,
                                    const char *type_id,
                                    CORBA::Short priority
-                                   TAO_ENV_ARG_DECL);
+                                   ACE_ENV_ARG_DECL);
   // Like key_to_stub() but assume that the ORB is not shutting down.
 
   TAO_Stub *create_stub_object (const TAO_ObjectKey &object_key,
@@ -646,7 +646,7 @@ protected:
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
                                 TAO_Acceptor_Registry &acceptor_registry
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
   int is_servant_in_map (PortableServer::Servant servant);
 
@@ -656,7 +656,7 @@ protected:
 
   PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant,
                                                CORBA::Short priority
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
@@ -664,79 +664,79 @@ protected:
   void activate_object_with_id_i (const PortableServer::ObjectId &id,
                                   PortableServer::Servant p_servant,
                                   CORBA::Short priority
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
   void deactivate_all_objects_i (CORBA::Boolean etherealize_objects
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   void deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
                                  CORBA::Boolean wait_for_completion
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   void wait_for_completions (CORBA::Boolean wait_for_completion
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
-  void check_poa_manager_state (TAO_ENV_SINGLE_ARG_DECL);
+  void check_poa_manager_state (ACE_ENV_SINGLE_ARG_DECL);
 
   void deactivate_object_i (const PortableServer::ObjectId &oid
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy));
 
   void cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
   void deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   CORBA::Object_ptr create_reference_i (const char *intf
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference_with_id_i (const PortableServer::ObjectId &oid,
                                                 const char *intf
-                                                TAO_ENV_ARG_DECL)
+                                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId *servant_to_system_id (PortableServer::Servant p_servant,
                                                   CORBA::Short &priority
-                                                  TAO_ENV_ARG_DECL)
+                                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId *servant_to_system_id_i (PortableServer::Servant p_servant,
                                                     CORBA::Short &priority
-                                                    TAO_ENV_ARG_DECL)
+                                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
@@ -744,7 +744,7 @@ protected:
   TAO_Active_Object_Map &active_object_map (void) const;
 
   void components_established_i (PortableInterceptor::IORInfo *info
-                                 TAO_ENV_ARG_DECL);
+                                 ACE_ENV_ARG_DECL);
 
   int delete_child (const String &child);
 
@@ -772,13 +772,13 @@ protected:
 
   TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id,
                                          PortableServer::Servant &servant
-                                         TAO_ENV_ARG_DECL);
+                                         ACE_ENV_ARG_DECL);
 
   PortableServer::Servant locate_servant_i (const char *operation,
                                             const PortableServer::ObjectId &id,
                                             TAO_Object_Adapter::Servant_Upcall &servant_upcall,
                                             TAO_POA_Current_Impl &poa_current_impl
-                                            TAO_ENV_ARG_DECL);
+                                            ACE_ENV_ARG_DECL);
 
   const TAO_Creation_Time &creation_time (void);
 
@@ -933,7 +933,7 @@ class TAO_PortableServer_Export TAO_POA_Guard
 {
 public:
   TAO_POA_Guard (TAO_POA &poa
-                 TAO_ENV_ARG_DECL,
+                 ACE_ENV_ARG_DECL,
                  int check_for_destruction = 1);
 
 private:
@@ -950,7 +950,7 @@ public:
 
   CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
                                   const char *name
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tao/PortableServer/POA.i b/TAO/tao/PortableServer/POA.i
index 431b714f202..4967d6a47bf 100644
--- a/TAO/tao/PortableServer/POA.i
+++ b/TAO/tao/PortableServer/POA.i
@@ -130,7 +130,7 @@ ACE_INLINE PortableServer::POA_ptr
 TAO_POA::create_POA (const char *adapter_name,
                      PortableServer::POAManager_ptr poa_manager,
                      const CORBA::PolicyList &policies
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
@@ -141,23 +141,23 @@ TAO_POA::create_POA (const char *adapter_name,
   return this->create_POA_i (adapter_name,
                              poa_manager,
                              policies
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_POA::destroy (CORBA::Boolean etherealize_objects,
                   CORBA::Boolean wait_for_completion
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
-  TAO_POA_Guard poa_guard (*this TAO_ENV_ARG_PARAMETER, 0);
+  TAO_POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER, 0);
   ACE_CHECK;
   ACE_UNUSED_ARG (poa_guard);
 
   this->destroy_i (etherealize_objects,
                    wait_for_completion
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_POA_Policy_Set &
@@ -175,19 +175,19 @@ TAO_POA::active_object_map (void) const
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 ACE_INLINE PortableServer::ServantManager_ptr
-TAO_POA::get_servant_manager (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ());
 
-  return this->get_servant_manager_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->get_servant_manager_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -195,11 +195,11 @@ TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
   TAO_POA_GUARD;
 
   this->set_servant_manager_i (imgr
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::Servant
-TAO_POA::get_servant (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::NoServant,
                    PortableServer::POA::WrongPolicy))
@@ -207,12 +207,12 @@ TAO_POA::get_servant (TAO_ENV_SINGLE_ARG_DECL)
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->get_servant_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->get_servant_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_POA::set_servant (PortableServer::Servant servant
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -220,14 +220,14 @@ TAO_POA::set_servant (PortableServer::Servant servant
   TAO_POA_GUARD;
 
   this->set_servant_i (servant
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 ACE_INLINE PortableServer::ObjectId *
 TAO_POA::activate_object (PortableServer::Servant servant
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
@@ -237,13 +237,13 @@ TAO_POA::activate_object (PortableServer::Servant servant
 
   return this->activate_object_i (servant,
                                   this->cached_policies_.server_priority ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id,
                                   PortableServer::Servant servant
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
@@ -255,12 +255,12 @@ TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id,
   this->activate_object_with_id_i (id,
                                    servant,
                                    this->cached_policies_.server_priority ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_POA::deactivate_object (const PortableServer::ObjectId &oid
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -269,12 +269,12 @@ TAO_POA::deactivate_object (const PortableServer::ObjectId &oid
   TAO_POA_GUARD;
 
   this->deactivate_object_i (oid
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object_ptr
 TAO_POA::create_reference (const char *intf
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -282,13 +282,13 @@ TAO_POA::create_reference (const char *intf
   TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
 
   return this->create_reference_i (intf
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object_ptr
 TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id,
                                    const char *intf
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
@@ -297,12 +297,12 @@ TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id,
 
   return this->create_reference_with_id_i (id,
                                            intf
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::ObjectId *
 TAO_POA::servant_to_id (PortableServer::Servant servant
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -313,13 +313,13 @@ TAO_POA::servant_to_id (PortableServer::Servant servant
   TAO_POA_GUARD_RETURN (0);
 
   return this->servant_to_id_i (servant
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::ObjectId *
 TAO_POA::servant_to_system_id (PortableServer::Servant servant,
                                CORBA::Short &priority
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -329,12 +329,12 @@ TAO_POA::servant_to_system_id (PortableServer::Servant servant,
 
   return this->servant_to_system_id_i (servant,
                                        priority
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::Servant
 TAO_POA::id_to_servant (const PortableServer::ObjectId &oid
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -343,12 +343,12 @@ TAO_POA::id_to_servant (const PortableServer::ObjectId &oid
   TAO_POA_GUARD_RETURN (0);
 
   return this->id_to_servant_i (oid
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object_ptr
 TAO_POA::id_to_reference (const PortableServer::ObjectId &oid
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
@@ -356,11 +356,11 @@ TAO_POA::id_to_reference (const PortableServer::ObjectId &oid
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->id_to_reference_i (oid TAO_ENV_ARG_PARAMETER);
+  return this->id_to_reference_i (oid ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_POA::the_parent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->parent_ != 0)
@@ -370,24 +370,24 @@ TAO_POA::the_parent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 ACE_INLINE PortableServer::POAList *
-TAO_POA::the_children (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA::the_children (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
-  return this->the_children_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->the_children_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::POAManager_ptr
-TAO_POA::the_POAManager (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POAManager::_duplicate (&this->poa_manager_);
 }
 
 ACE_INLINE PortableInterceptor::AdapterManagerId
-TAO_POA::get_manager_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_POA::get_manager_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return TAO_POA_Manager::poa_manager_id_;
@@ -400,10 +400,10 @@ TAO_POA::get_manager_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 //    TypeCodes!
 //
 ACE_INLINE CORBA::StringSeq *
-TAO_POA::adapter_name (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->adapter_name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
@@ -421,7 +421,7 @@ TAO_POA::get_obj_ref_factory ()
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 ACE_INLINE PortableServer::AdapterActivator_ptr
-TAO_POA::the_activator (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
@@ -432,7 +432,7 @@ TAO_POA::the_activator (TAO_ENV_SINGLE_ARG_DECL)
 
 ACE_INLINE void
 TAO_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access for the duration of this transaction.
@@ -476,7 +476,7 @@ TAO_POA::name (void) const
 }
 
 ACE_INLINE char *
-TAO_POA::the_name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_POA::the_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.c_str ());
@@ -636,7 +636,7 @@ TAO_POA::thread_policy (void) const
 }
 
 ACE_INLINE PortableInterceptor::AdapterState
-TAO_POA::get_adapter_state (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_POA::get_adapter_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return this->adapter_state_;
 }
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index 910a43e9dcb..3b6ae064865 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -27,7 +27,7 @@ TAO_POA_Manager::~TAO_POA_Manager (void)
 }
 
 void
-TAO_POA_Manager::activate_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA_Manager::activate_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
@@ -49,14 +49,14 @@ TAO_POA_Manager::activate_i (TAO_ENV_SINGLE_ARG_DECL)
 void
 TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
                                CORBA::Boolean wait_for_completion
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
                                                  wait_for_completion
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // This operation changes the state of the POA manager to
@@ -107,7 +107,7 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
       TAO_POA *poa = *iterator;
       poa->deactivate_all_objects_i (etherealize_objects,
                                      wait_for_completion
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -149,14 +149,14 @@ adapter_manager_state_changed (PortableServer::POAManager::State state,
 
 void
 TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
                                                  wait_for_completion
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // This operation changes the state of the POA manager to
@@ -197,7 +197,7 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion
         {
           TAO_POA *poa = *iterator;
           poa->wait_for_completions (wait_for_completion
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -205,14 +205,14 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion
 
 void
 TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
   TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
                                                  wait_for_completion
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // This operation changes the state of the POA manager to
@@ -255,7 +255,7 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion
         {
           TAO_POA *poa = *iterator;
           poa->wait_for_completions (wait_for_completion
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index fe3bf6fe9e2..9a862da113d 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -56,31 +56,31 @@ class TAO_PortableServer_Export TAO_POA_Manager :
 
 public:
 
-  void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   void hold_requests (CORBA::Boolean wait_for_completion
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
   void discard_requests (CORBA::Boolean wait_for_completion
-                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
   void deactivate (CORBA::Boolean etherealize_objects,
                    CORBA::Boolean wait_for_completion
-                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::POAManager::State get_state (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POAManager::State get_state (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   TAO_POA_Manager (TAO_Object_Adapter &object_adapter);
@@ -89,13 +89,13 @@ public:
 
 protected:
 
-  void activate_i (TAO_ENV_SINGLE_ARG_DECL)
+  void activate_i (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
   void deactivate_i (CORBA::Boolean etherealize_objects,
                      CORBA::Boolean wait_for_completion
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
@@ -103,16 +103,16 @@ protected:
   /// of POAManager changed.
   void adapter_manager_state_changed (PortableServer::POAManager::State state,
                                       CORBA::Environment &ACE_TRY_ENV);
-  
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   void hold_requests_i (CORBA::Boolean wait_for_completion
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
   void discard_requests_i (CORBA::Boolean wait_for_completion
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POAManager::AdapterInactive));
 
diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i
index aec6e34cd32..66f172859ee 100644
--- a/TAO/tao/PortableServer/POAManager.i
+++ b/TAO/tao/PortableServer/POAManager.i
@@ -9,46 +9,46 @@ TAO_POA_Manager::lock (void)
 }
 
 ACE_INLINE void
-TAO_POA_Manager::activate (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA_Manager::activate (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Lock access to the POAManager for the duration of this transaction
   TAO_OBJECT_ADAPTER_GUARD;
 
-  this->activate_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->activate_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 ACE_INLINE void
 TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Lock access to the POAManager for the duration of this transaction
   TAO_OBJECT_ADAPTER_GUARD;
 
-  this->hold_requests_i (wait_for_completion TAO_ENV_ARG_PARAMETER);
+  this->hold_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Lock access to the POAManager for the duration of this transaction
   TAO_OBJECT_ADAPTER_GUARD;
 
-  this->discard_requests_i (wait_for_completion TAO_ENV_ARG_PARAMETER);
+  this->discard_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
                              CORBA::Boolean wait_for_completion
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POAManager::AdapterInactive))
 {
@@ -57,7 +57,7 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
 
   this->deactivate_i (etherealize_objects,
                       wait_for_completion
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
@@ -70,7 +70,7 @@ TAO_POA_Manager::get_state_i (void)
 }
 
 ACE_INLINE PortableServer::POAManager::State
-TAO_POA_Manager::get_state (TAO_ENV_SINGLE_ARG_DECL)
+TAO_POA_Manager::get_state (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Lock access to the POAManager for the duration of this transaction
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index 0ca2e26182c..fd705c3da9e 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -31,33 +31,33 @@ TAO_POA_Cached_Policies::~TAO_POA_Cached_Policies (void)
 
 void
 TAO_POA_Cached_Policies::update (TAO_POA_Policy_Set &policy_set
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   for (CORBA::ULong i = 0; i < policy_set.num_policies (); i++)
     {
       CORBA::Policy_var policy = policy_set.get_policy_by_index (i);
 
       this->update_policy (policy.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
 TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   PortableServer::ThreadPolicy_var thread
     = PortableServer::ThreadPolicy::_narrow (policy
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (thread.in ()))
     {
-      this->thread_ = thread->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->thread_ = thread->value (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -67,12 +67,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy
 
   PortableServer::LifespanPolicy_var lifespan
     = PortableServer::LifespanPolicy::_narrow (policy
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (lifespan.in ()))
     {
-      this->lifespan_ = lifespan->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->lifespan_ = lifespan->value (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -80,12 +80,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy
 
   PortableServer::IdUniquenessPolicy_var id_uniqueness
     = PortableServer::IdUniquenessPolicy::_narrow (policy
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (id_uniqueness.in ()))
     {
-      this->id_uniqueness_ = id_uniqueness->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->id_uniqueness_ = id_uniqueness->value (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -93,12 +93,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy
 
   PortableServer::IdAssignmentPolicy_var id_assignment
     = PortableServer::IdAssignmentPolicy::_narrow (policy
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (id_assignment.in ()))
     {
-      this->id_assignment_ = id_assignment->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->id_assignment_ = id_assignment->value (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -108,12 +108,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy
 
   PortableServer::ImplicitActivationPolicy_var implicit_activation
     = PortableServer::ImplicitActivationPolicy::_narrow (policy
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (implicit_activation.in ()))
     {
-      this->implicit_activation_ = implicit_activation->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->implicit_activation_ = implicit_activation->value (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -121,12 +121,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy
 
   PortableServer::ServantRetentionPolicy_var servant_retention
     = PortableServer::ServantRetentionPolicy::_narrow (policy
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (servant_retention.in ()))
     {
-      this->servant_retention_ = servant_retention->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->servant_retention_ = servant_retention->value (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -134,12 +134,12 @@ TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy
 
   PortableServer::RequestProcessingPolicy_var request_processing
     = PortableServer::RequestProcessingPolicy::_narrow (policy
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (request_processing.in ()))
     {
-      this->request_processing_ = request_processing->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->request_processing_ = request_processing->value (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h
index 127439ab984..63569e01b20 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.h
@@ -56,7 +56,7 @@ public:
 
   /// Update the cached policy values.
   void update (TAO_POA_Policy_Set &policy_set
-               TAO_ENV_ARG_DECL);
+               ACE_ENV_ARG_DECL);
 
   /// Accessor methods to cached values.
   PortableServer::ThreadPolicyValue thread (void) const;
@@ -77,7 +77,7 @@ protected:
 
   /// Helper method to update a particular policy.
   void update_policy (const CORBA::Policy_ptr policy
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
   PortableServer::ThreadPolicyValue thread_;
 
diff --git a/TAO/tao/PortableServer/POA_Policies.cpp b/TAO/tao/PortableServer/POA_Policies.cpp
index e72058e4ad5..09078bacb3f 100644
--- a/TAO/tao/PortableServer/POA_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Policies.cpp
@@ -17,14 +17,14 @@ TAO_Thread_Policy::TAO_Thread_Policy (PortableServer::ThreadPolicyValue value)
 }
 
 PortableServer::ThreadPolicyValue
-TAO_Thread_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Thread_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 CORBA::Policy_ptr
-TAO_Thread_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Thread_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Thread_Policy *thread_policy_copy = 0;
@@ -37,13 +37,13 @@ TAO_Thread_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Thread_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Thread_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyType
-TAO_Thread_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Thread_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::THREAD_POLICY_ID;
@@ -71,14 +71,14 @@ TAO_Lifespan_Policy::TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue va
 }
 
 PortableServer::LifespanPolicyValue
-TAO_Lifespan_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Lifespan_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 CORBA::Policy_ptr
-TAO_Lifespan_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Lifespan_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Lifespan_Policy *lifespan_policy_copy = 0;
@@ -91,13 +91,13 @@ TAO_Lifespan_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Lifespan_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Lifespan_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyType
-TAO_Lifespan_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Lifespan_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::LIFESPAN_POLICY_ID;
@@ -123,14 +123,14 @@ TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (PortableServer::IdUniqueness
 }
 
 PortableServer::IdUniquenessPolicyValue
-TAO_Id_Uniqueness_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Id_Uniqueness_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 CORBA::Policy_ptr
-TAO_Id_Uniqueness_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Id_Uniqueness_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Id_Uniqueness_Policy *id_uniqueness_policy_copy = 0;
@@ -143,13 +143,13 @@ TAO_Id_Uniqueness_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Id_Uniqueness_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Id_Uniqueness_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyType
-TAO_Id_Uniqueness_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Id_Uniqueness_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::ID_UNIQUENESS_POLICY_ID;
@@ -175,14 +175,14 @@ TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (PortableServer::IdAssignment
 }
 
 PortableServer::IdAssignmentPolicyValue
-TAO_Id_Assignment_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Id_Assignment_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 CORBA::Policy_ptr
-TAO_Id_Assignment_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Id_Assignment_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Id_Assignment_Policy *id_assignment_policy_copy = 0;
@@ -195,13 +195,13 @@ TAO_Id_Assignment_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Id_Assignment_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Id_Assignment_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyType
-TAO_Id_Assignment_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Id_Assignment_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::ID_ASSIGNMENT_POLICY_ID;
@@ -229,14 +229,14 @@ TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (PortableServer::
 }
 
 PortableServer::ImplicitActivationPolicyValue
-TAO_Implicit_Activation_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Implicit_Activation_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 CORBA::Policy_ptr
-TAO_Implicit_Activation_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Implicit_Activation_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Implicit_Activation_Policy *implicit_activation_policy_copy = 0;
@@ -249,13 +249,13 @@ TAO_Implicit_Activation_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Implicit_Activation_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Implicit_Activation_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyType
-TAO_Implicit_Activation_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Implicit_Activation_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::IMPLICIT_ACTIVATION_POLICY_ID;
@@ -281,14 +281,14 @@ TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (PortableServer::Serv
 }
 
 PortableServer::ServantRetentionPolicyValue
-TAO_Servant_Retention_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Servant_Retention_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 CORBA::Policy_ptr
-TAO_Servant_Retention_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Servant_Retention_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Servant_Retention_Policy *servant_retention_policy_copy = 0;
@@ -301,13 +301,13 @@ TAO_Servant_Retention_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Servant_Retention_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Servant_Retention_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyType
-TAO_Servant_Retention_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Servant_Retention_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::SERVANT_RETENTION_POLICY_ID;
@@ -333,14 +333,14 @@ TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (PortableServer::Re
 }
 
 PortableServer::RequestProcessingPolicyValue
-TAO_Request_Processing_Policy::value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Request_Processing_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
 CORBA::Policy_ptr
-TAO_Request_Processing_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Request_Processing_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Request_Processing_Policy *request_processing_policy_copy = 0;
@@ -353,13 +353,13 @@ TAO_Request_Processing_Policy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Request_Processing_Policy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Request_Processing_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 CORBA::PolicyType
-TAO_Request_Processing_Policy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Request_Processing_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::REQUEST_PROCESSING_POLICY_ID;
diff --git a/TAO/tao/PortableServer/POA_Policies.h b/TAO/tao/PortableServer/POA_Policies.h
index 4c47630e2d7..bd9231d99f9 100644
--- a/TAO/tao/PortableServer/POA_Policies.h
+++ b/TAO/tao/PortableServer/POA_Policies.h
@@ -47,16 +47,16 @@ class TAO_PortableServer_Export TAO_Thread_Policy :
 public:
   TAO_Thread_Policy (PortableServer::ThreadPolicyValue value);
 
-  PortableServer::ThreadPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ThreadPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
@@ -78,16 +78,16 @@ class TAO_PortableServer_Export TAO_Lifespan_Policy :
 public:
   TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value);
 
-  PortableServer::LifespanPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::LifespanPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
     // Return the cached policy type for this policy.
@@ -107,16 +107,16 @@ class TAO_PortableServer_Export TAO_Id_Uniqueness_Policy :
 public:
   TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value);
 
-  PortableServer::IdUniquenessPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::IdUniquenessPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
@@ -136,16 +136,16 @@ class TAO_PortableServer_Export TAO_Id_Assignment_Policy :
 public:
   TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value);
 
-  PortableServer::IdAssignmentPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::IdAssignmentPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
@@ -167,16 +167,16 @@ class TAO_PortableServer_Export TAO_Implicit_Activation_Policy :
 public:
   TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value);
 
-  PortableServer::ImplicitActivationPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ImplicitActivationPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
@@ -196,16 +196,16 @@ class TAO_PortableServer_Export TAO_Servant_Retention_Policy :
 public:
   TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value);
 
-  PortableServer::ServantRetentionPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ServantRetentionPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
@@ -225,16 +225,16 @@ class TAO_PortableServer_Export TAO_Request_Processing_Policy :
 public:
   TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value);
 
-  PortableServer::RequestProcessingPolicyValue value (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::RequestProcessingPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return the cached policy type for this policy.
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index 69c388e4aab..9907212b534 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -30,7 +30,7 @@ TAO_POA_Policy_Set::~TAO_POA_Policy_Set (void)
 
 void
 TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies
-                                                       TAO_ENV_ARG_DECL)
+                                                       ACE_ENV_ARG_DECL)
 {
   CORBA::ULong cep_index = client_exposed_policies->length ();
 
@@ -45,7 +45,7 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client
         {
           client_exposed_policies->length (cep_index + 1);
           (*client_exposed_policies)[cep_index] =
-                                  policy->copy (TAO_ENV_SINGLE_ARG_PARAMETER);
+                                  policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           cep_index++;
@@ -56,14 +56,14 @@ TAO_POA_Policy_Set::add_client_exposed_fixed_policies (CORBA::PolicyList *client
 void
 TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator,
                                        TAO_ORB_Core &orb_core
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   // Just give a last chance for all the unloaded validators in other
   // libraries to be registered
   orb_core.load_policy_validators (validator);
 
   // Validate that all of the specified policies make sense.
-  validator.validate (this->impl_  TAO_ENV_ARG_PARAMETER);
+  validator.validate (this->impl_  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Verify that all policies are legal for the currently loaded
@@ -74,7 +74,7 @@ TAO_POA_Policy_Set::validate_policies (TAO_Policy_Validator &validator,
     {
       CORBA::Policy_var policy = this->impl_.get_policy_by_index (i);
 
-      CORBA::PolicyType type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::PolicyType type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (validator.legal_policy (type) == 0)
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h
index 06353d178d6..7907df07412 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.h
+++ b/TAO/tao/PortableServer/POA_Policy_Set.h
@@ -58,18 +58,18 @@ public:
   CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
 
   void merge_policies (const CORBA::PolicyList &policies
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
 
   void merge_policy (const CORBA::Policy_ptr policy
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
   void validate_policies (TAO_Policy_Validator &validator,
                           TAO_ORB_Core &orb_core
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
 
   // Add all of the client exposed policies to the specified list.
   void add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies
-                                          TAO_ENV_ARG_DECL);
+                                          ACE_ENV_ARG_DECL);
 
   TAO_Policy_Set &policies (void);
 
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.i b/TAO/tao/PortableServer/POA_Policy_Set.i
index 3cdda2dc2cc..b0a9ec35c10 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.i
+++ b/TAO/tao/PortableServer/POA_Policy_Set.i
@@ -20,20 +20,20 @@ TAO_POA_Policy_Set::get_cached_policy (TAO_Cached_Policy_Type type)
 
 ACE_INLINE void
 TAO_POA_Policy_Set::merge_policies (const CORBA::PolicyList &policies
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   // Add the policies if they don't exist, override them if they do.
   this->impl_.set_policy_overrides (policies,
                                     CORBA::ADD_OVERRIDE
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 ACE_INLINE void
 TAO_POA_Policy_Set::merge_policy (const CORBA::Policy_ptr policy
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
-  this->impl_.set_policy (policy TAO_ENV_ARG_PARAMETER);
+  this->impl_.set_policy (policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 86647b1eae4..0689ed2d10f 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -162,31 +162,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
     POA_CORBA_Policy *tao_impl
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::PolicyType result);
@@ -204,44 +204,44 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::TAO_ServerRequestInfo_CORBA_
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Policy *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -253,7 +253,7 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (TAO_ENV_SINGLE_ARG_D
 
 char *
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -263,10 +263,10 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_most_derived_interfac
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -283,31 +283,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
     POA_CORBA_Policy *tao_impl
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Policy_ptr result);
@@ -325,44 +325,44 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::TAO_ServerRequestInfo_CORBA_Policy_copy
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Policy *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Policy_copy::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_copy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Policy_copy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_copy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Policy_copy::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_copy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -374,7 +374,7 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_Policy_copy::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -384,10 +384,10 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Policy_copy::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -404,31 +404,31 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
     POA_CORBA_Policy *tao_impl
-    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -445,44 +445,44 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::TAO_ServerRequestInfo_CORBA_Policy_d
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Policy *tao_impl
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Policy_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Policy_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Policy_destroy::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo_CORBA_Policy_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -490,7 +490,7 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::result (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo_CORBA_Policy_destroy::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -500,10 +500,10 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::target_most_derived_interface (
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Policy_destroy::target_is_a (
     const char * id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -536,17 +536,17 @@ POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::~POA_CORBA_TAO_Policy_Strategized
 CORBA_TAO_Policy_Proxy_Impl&
 POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::select_proxy (
     ::CORBA::Policy *object
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -556,7 +556,7 @@ POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::select_proxy (
 void
 POA_CORBA_TAO_Policy_Strategized_Proxy_Broker::create_proxy (
     int strategy
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -626,7 +626,7 @@ POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl
 
 CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
     CORBA::Object_ptr _collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -642,7 +642,7 @@ CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
       _collocated_tao_target_->_object_key (),
       "policy_type",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -651,13 +651,13 @@ CORBA::PolicyType POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
           "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->policy_type (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy (
     CORBA::Object_ptr _collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -673,7 +673,7 @@ CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy (
       _collocated_tao_target_->_object_key (),
       "copy",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -682,13 +682,13 @@ CORBA::Policy_ptr POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::copy (
           "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->copy (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
     CORBA::Object_ptr _collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -702,7 +702,7 @@ void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
       _collocated_tao_target_->_object_key (),
       "destroy",
       forward_to.out ()
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -711,7 +711,7 @@ void POA_CORBA_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
           "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->destroy (
-        TAO_ENV_SINGLE_ARG_PARAMETER
+        ACE_ENV_SINGLE_ARG_PARAMETER
       );
   return;
 }
@@ -729,7 +729,7 @@ _TAO_CORBA_Policy_Direct_Proxy_Impl::_TAO_CORBA_Policy_Direct_Proxy_Impl (void)
 
 CORBA::PolicyType _TAO_CORBA_Policy_Direct_Proxy_Impl::policy_type  (
     CORBA::Object_ptr _collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
     )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -739,14 +739,14 @@ CORBA::PolicyType _TAO_CORBA_Policy_Direct_Proxy_Impl::policy_type  (
            POA_CORBA_Policy_ptr,
            _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
            )->policy_type (
-                           TAO_ENV_SINGLE_ARG_PARAMETER
+                           ACE_ENV_SINGLE_ARG_PARAMETER
                            );
 
 }
 
 CORBA_Policy_ptr _TAO_CORBA_Policy_Direct_Proxy_Impl::copy  (
     CORBA::Object_ptr _collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
     )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -756,14 +756,14 @@ CORBA_Policy_ptr _TAO_CORBA_Policy_Direct_Proxy_Impl::copy  (
            POA_CORBA_Policy_ptr,
            _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
            )->copy (
-                    TAO_ENV_SINGLE_ARG_PARAMETER
+                    ACE_ENV_SINGLE_ARG_PARAMETER
                     );
 
 }
 
 void _TAO_CORBA_Policy_Direct_Proxy_Impl::destroy  (
               CORBA::Object_ptr _collocated_tao_target_
-              TAO_ENV_ARG_DECL
+              ACE_ENV_ARG_DECL
               )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -773,7 +773,7 @@ void _TAO_CORBA_Policy_Direct_Proxy_Impl::destroy  (
     POA_CORBA_Policy_ptr,
     _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
     )->destroy (
-                TAO_ENV_SINGLE_ARG_PARAMETER
+                ACE_ENV_SINGLE_ARG_PARAMETER
                 );
 
 }
@@ -803,7 +803,7 @@ void POA_CORBA_Policy::_get_policy_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Policy *_tao_impl =
@@ -824,18 +824,18 @@ void POA_CORBA_Policy::_get_policy_type_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->policy_type (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -843,7 +843,7 @@ void POA_CORBA_Policy::_get_policy_type_skel (
       CORBA::PolicyType _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -851,12 +851,12 @@ void POA_CORBA_Policy::_get_policy_type_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -883,7 +883,7 @@ void POA_CORBA_Policy::copy_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Policy *_tao_impl =
@@ -904,18 +904,18 @@ void POA_CORBA_Policy::copy_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->copy (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -924,7 +924,7 @@ void POA_CORBA_Policy::copy_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -932,12 +932,12 @@ void POA_CORBA_Policy::copy_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -965,7 +965,7 @@ void POA_CORBA_Policy::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void *_tao_servant_upcall
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Policy *_tao_impl =
@@ -986,24 +986,24 @@ void POA_CORBA_Policy::destroy_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
-      TAO_ENV_ARG_PARAMETER
+      ACE_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.receive_request (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->destroy (
-          TAO_ENV_SINGLE_ARG_PARAMETER
+          ACE_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
+      _tao_vfr.send_reply (&ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1011,12 +1011,12 @@ void POA_CORBA_Policy::destroy_skel (
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
           &ri
-          TAO_ENV_ARG_PARAMETER
+          ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1037,7 +1037,7 @@ void POA_CORBA_Policy::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1047,7 +1047,7 @@ void POA_CORBA_Policy::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in ()TAO_ENV_ARG_PARAMETER);
+  _tao_retval = _tao_impl->_is_a (value.in ()ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1060,11 +1060,11 @@ void POA_CORBA_Policy::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Policy *_tao_impl = (POA_CORBA_Policy *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1077,7 +1077,7 @@ void POA_CORBA_Policy::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /* Servant_Upcall */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   POA_CORBA_Policy *_tao_impl = (POA_CORBA_Policy *) _tao_object_reference;
@@ -1096,7 +1096,7 @@ void POA_CORBA_Policy::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_retval = _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -1123,10 +1123,10 @@ void POA_CORBA_Policy::_interface_skel (
 
 CORBA::Boolean POA_CORBA_Policy::_is_a (
     const char* value
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *base_id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -1148,12 +1148,12 @@ void* POA_CORBA_Policy::_downcast (
   return 0;
 }
 
-void POA_CORBA_Policy::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
+void POA_CORBA_Policy::_dispatch (TAO_ServerRequest &req, void *servant_upcall ACE_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
                                      this
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 }
 
 const char* POA_CORBA_Policy::_interface_repository_id (void) const
@@ -1162,9 +1162,9 @@ const char* POA_CORBA_Policy::_interface_repository_id (void) const
 }
 
 CORBA::Policy*
-POA_CORBA_Policy::_this (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index e89330ca907..1537f13465c 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -64,7 +64,7 @@
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual void* _downcast (
@@ -75,37 +75,37 @@
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     ::CORBA::Policy *_this (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA::PolicyType policy_type (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -115,11 +115,11 @@
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual CORBA::Policy_ptr copy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -129,11 +129,11 @@
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
     virtual void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -143,7 +143,7 @@
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
         void *_tao_servant_upcall
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       );
 
 
@@ -163,7 +163,7 @@
 
     virtual CORBA_TAO_Policy_Proxy_Impl &select_proxy (
       ::CORBA::Policy *object
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
   private:
@@ -171,7 +171,7 @@
     // as soon as their use is necessary.
     void create_proxy (
       int collocation_strategy
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
     // Caches the proxy implementations. The proxy implementation
@@ -210,7 +210,7 @@
 
     virtual CORBA::PolicyType policy_type (
         CORBA::Object_ptr _collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -218,7 +218,7 @@
 
 virtual CORBA::Policy_ptr copy (
         CORBA::Object_ptr _collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -226,7 +226,7 @@ virtual CORBA::Policy_ptr copy (
 
 virtual void destroy (
         CORBA::Object_ptr _collocated_tao_target_
-        TAO_ENV_ARG_DECL
+        ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -254,7 +254,7 @@ public:
 
   virtual CORBA::PolicyType policy_type (
     CORBA::Object_ptr _collocated_tao_target_
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
@@ -262,7 +262,7 @@ public:
 
   virtual CORBA_Policy_ptr copy (
                                  CORBA::Object_ptr _collocated_tao_target_
-                                 TAO_ENV_ARG_DECL
+                                 ACE_ENV_ARG_DECL
                                  )
     ACE_THROW_SPEC ((
                      CORBA::SystemException
@@ -270,7 +270,7 @@ public:
 
     virtual void destroy (
                           CORBA::Object_ptr _collocated_tao_target_
-                          TAO_ENV_ARG_DECL
+                          ACE_ENV_ARG_DECL
                           )
       ACE_THROW_SPEC ((
                        CORBA::SystemException
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index 2c64e99cf90..39647c49710 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -62,24 +62,24 @@
 
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
     CORBA::PolicyType policy_type (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     CORBA::Policy_ptr copy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
     void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/PortableServer/PolicyS_T.i b/TAO/tao/PortableServer/PolicyS_T.i
index 4552a17af9e..2598ef6287b 100644
--- a/TAO/tao/PortableServer/PolicyS_T.i
+++ b/TAO/tao/PortableServer/PolicyS_T.i
@@ -90,50 +90,50 @@ POA_CORBA_Policy_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_Policy_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+POA_CORBA_Policy_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_Policy::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->POA_CORBA_Policy::_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::PolicyType POA_CORBA_Policy_tie<T>::policy_type  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->policy_type (
-TAO_ENV_SINGLE_ARG_PARAMETER
+ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Policy_ptr POA_CORBA_Policy_tie<T>::copy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->copy (
-TAO_ENV_SINGLE_ARG_PARAMETER
+ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Policy_tie<T>::destroy  (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-TAO_ENV_SINGLE_ARG_PARAMETER
+ACE_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/tao/PortableServer/PortableGroup_Hooks.h b/TAO/tao/PortableServer/PortableGroup_Hooks.h
index 2103e700efe..d083b9bcda5 100644
--- a/TAO/tao/PortableServer/PortableGroup_Hooks.h
+++ b/TAO/tao/PortableServer/PortableGroup_Hooks.h
@@ -42,7 +42,7 @@ public:
   virtual PortableServer::ObjectId * create_id_for_reference (
       TAO_POA &the_poa,
       CORBA::Object_ptr the_ref
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -52,7 +52,7 @@ public:
   virtual PortableServer::IDs * reference_to_ids (
       TAO_POA &the_poa,
       CORBA::Object_ptr the_ref
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -63,7 +63,7 @@ public:
       TAO_POA &the_poa,
       CORBA::Object_ptr ref,
       const PortableServer::ObjectId & oid
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -74,7 +74,7 @@ public:
       TAO_POA &the_poa,
       CORBA::Object_ptr ref,
       const PortableServer::ObjectId & oid
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 6e95fd3ad6a..ea2636d8d50 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -106,11 +106,11 @@ void
 PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_downcast (
     void* target,
     CORBA_Object *src
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   PortableServer::POA **tmp = ACE_static_cast (PortableServer::POA**, target);
-  *tmp = PortableServer::POA::_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = PortableServer::POA::_narrow (src ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -317,7 +317,7 @@ void PortableServer::ForwardRequest::_raise ()
 
 void PortableServer::ForwardRequest::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -330,7 +330,7 @@ void PortableServer::ForwardRequest::_tao_encode (
 
 void PortableServer::ForwardRequest::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -479,7 +479,7 @@ void PortableServer::NotAGroupObject::_raise ()
 
 void PortableServer::NotAGroupObject::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << *this)
@@ -492,7 +492,7 @@ void PortableServer::NotAGroupObject::_tao_encode (
 
 void PortableServer::NotAGroupObject::_tao_decode (
     TAO_InputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   if (cdr >> *this)
@@ -906,10 +906,10 @@ PortableServer::ThreadPolicy_var::tao_nil (void)
 ::PortableServer::ThreadPolicy_ptr
 PortableServer::ThreadPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::ThreadPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::ThreadPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -989,15 +989,15 @@ PortableServer::ThreadPolicy::ThreadPolicy (void)
 
   PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return ThreadPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return ThreadPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -1218,10 +1218,10 @@ PortableServer::LifespanPolicy_var::tao_nil (void)
 ::PortableServer::LifespanPolicy_ptr
 PortableServer::LifespanPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::LifespanPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::LifespanPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1301,15 +1301,15 @@ PortableServer::LifespanPolicy::LifespanPolicy (void)
 
   PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return LifespanPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return LifespanPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -1530,10 +1530,10 @@ PortableServer::IdUniquenessPolicy_var::tao_nil (void)
 ::PortableServer::IdUniquenessPolicy_ptr
 PortableServer::IdUniquenessPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::IdUniquenessPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::IdUniquenessPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1613,15 +1613,15 @@ PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
 
   PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return IdUniquenessPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return IdUniquenessPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -1841,10 +1841,10 @@ PortableServer::IdAssignmentPolicy_var::tao_nil (void)
 ::PortableServer::IdAssignmentPolicy_ptr
 PortableServer::IdAssignmentPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::IdAssignmentPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::IdAssignmentPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1924,15 +1924,15 @@ PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
 
   PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return IdAssignmentPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return IdAssignmentPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -2164,10 +2164,10 @@ PortableServer::ImplicitActivationPolicy_var::tao_nil (void)
 ::PortableServer::ImplicitActivationPolicy_ptr
 PortableServer::ImplicitActivationPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::ImplicitActivationPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::ImplicitActivationPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2247,15 +2247,15 @@ PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
 
   PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return ImplicitActivationPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return ImplicitActivationPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -2477,10 +2477,10 @@ PortableServer::ServantRetentionPolicy_var::tao_nil (void)
 ::PortableServer::ServantRetentionPolicy_ptr
 PortableServer::ServantRetentionPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::ServantRetentionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::ServantRetentionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2560,15 +2560,15 @@ PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
 
   PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return ServantRetentionPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return ServantRetentionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -2804,10 +2804,10 @@ PortableServer::RequestProcessingPolicy_var::tao_nil (void)
 ::PortableServer::RequestProcessingPolicy_ptr
 PortableServer::RequestProcessingPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::RequestProcessingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::RequestProcessingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2887,15 +2887,15 @@ PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
 
   PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return RequestProcessingPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return RequestProcessingPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -3069,10 +3069,10 @@ PortableServer::POAManager_var::tao_nil (void)
 ::PortableServer::POAManager_ptr
 PortableServer::POAManager_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::POAManager::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::POAManager::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3152,15 +3152,15 @@ PortableServer::POAManager::POAManager (void)
 
   PortableServer::POAManager_ptr PortableServer::POAManager::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return POAManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return POAManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::POAManager_ptr PortableServer::POAManager::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -3255,7 +3255,7 @@ void PortableServer::POAManager::AdapterInactive::_raise ()
 
 void PortableServer::POAManager::AdapterInactive::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -3263,7 +3263,7 @@ void PortableServer::POAManager::AdapterInactive::_tao_encode (
 
 void PortableServer::POAManager::AdapterInactive::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -3390,10 +3390,10 @@ PortableServer::AdapterActivator_var::tao_nil (void)
 ::PortableServer::AdapterActivator_ptr
 PortableServer::AdapterActivator_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::AdapterActivator::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::AdapterActivator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3473,15 +3473,15 @@ PortableServer::AdapterActivator::AdapterActivator (void)
 
   PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return AdapterActivator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return AdapterActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -3641,10 +3641,10 @@ PortableServer::ServantManager_var::tao_nil (void)
 ::PortableServer::ServantManager_ptr
 PortableServer::ServantManager_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::ServantManager::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::ServantManager::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3724,15 +3724,15 @@ PortableServer::ServantManager::ServantManager (void)
 
   PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return ServantManager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return ServantManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::ServantManager_ptr PortableServer::ServantManager::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -3892,10 +3892,10 @@ PortableServer::ServantActivator_var::tao_nil (void)
 ::PortableServer::ServantActivator_ptr
 PortableServer::ServantActivator_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::ServantActivator::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::ServantActivator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3975,15 +3975,15 @@ PortableServer::ServantActivator::ServantActivator (void)
 
   PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return ServantActivator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return ServantActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -4155,10 +4155,10 @@ PortableServer::ServantLocator_var::tao_nil (void)
 ::PortableServer::ServantLocator_ptr
 PortableServer::ServantLocator_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::ServantLocator::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::ServantLocator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4238,15 +4238,15 @@ PortableServer::ServantLocator::ServantLocator (void)
 
   PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return ServantLocator::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return ServantLocator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -4420,10 +4420,10 @@ PortableServer::POA_var::tao_nil (void)
 ::PortableServer::POA_ptr
 PortableServer::POA_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4503,15 +4503,15 @@ PortableServer::POA::POA (void)
 
   PortableServer::POA_ptr PortableServer::POA::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return POA::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return POA::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::POA_ptr PortableServer::POA::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -4606,7 +4606,7 @@ void PortableServer::POA::AdapterAlreadyExists::_raise ()
 
 void PortableServer::POA::AdapterAlreadyExists::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4614,7 +4614,7 @@ void PortableServer::POA::AdapterAlreadyExists::_tao_encode (
 
 void PortableServer::POA::AdapterAlreadyExists::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4674,7 +4674,7 @@ void PortableServer::POA::AdapterNonExistent::_raise ()
 
 void PortableServer::POA::AdapterNonExistent::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4682,7 +4682,7 @@ void PortableServer::POA::AdapterNonExistent::_tao_encode (
 
 void PortableServer::POA::AdapterNonExistent::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4744,7 +4744,7 @@ void PortableServer::POA::InvalidPolicy::_raise ()
 
 void PortableServer::POA::InvalidPolicy::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4752,7 +4752,7 @@ void PortableServer::POA::InvalidPolicy::_tao_encode (
 
 void PortableServer::POA::InvalidPolicy::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4822,7 +4822,7 @@ void PortableServer::POA::NoServant::_raise ()
 
 void PortableServer::POA::NoServant::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4830,7 +4830,7 @@ void PortableServer::POA::NoServant::_tao_encode (
 
 void PortableServer::POA::NoServant::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4892,7 +4892,7 @@ void PortableServer::POA::ObjectAlreadyActive::_raise ()
 
 void PortableServer::POA::ObjectAlreadyActive::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4900,7 +4900,7 @@ void PortableServer::POA::ObjectAlreadyActive::_tao_encode (
 
 void PortableServer::POA::ObjectAlreadyActive::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4960,7 +4960,7 @@ void PortableServer::POA::ObjectNotActive::_raise ()
 
 void PortableServer::POA::ObjectNotActive::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -4968,7 +4968,7 @@ void PortableServer::POA::ObjectNotActive::_tao_encode (
 
 void PortableServer::POA::ObjectNotActive::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5028,7 +5028,7 @@ void PortableServer::POA::ServantAlreadyActive::_raise ()
 
 void PortableServer::POA::ServantAlreadyActive::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5036,7 +5036,7 @@ void PortableServer::POA::ServantAlreadyActive::_tao_encode (
 
 void PortableServer::POA::ServantAlreadyActive::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5096,7 +5096,7 @@ void PortableServer::POA::ServantNotActive::_raise ()
 
 void PortableServer::POA::ServantNotActive::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5104,7 +5104,7 @@ void PortableServer::POA::ServantNotActive::_tao_encode (
 
 void PortableServer::POA::ServantNotActive::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5164,7 +5164,7 @@ void PortableServer::POA::WrongAdapter::_raise ()
 
 void PortableServer::POA::WrongAdapter::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5172,7 +5172,7 @@ void PortableServer::POA::WrongAdapter::_tao_encode (
 
 void PortableServer::POA::WrongAdapter::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5232,7 +5232,7 @@ void PortableServer::POA::WrongPolicy::_raise ()
 
 void PortableServer::POA::WrongPolicy::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5240,7 +5240,7 @@ void PortableServer::POA::WrongPolicy::_tao_encode (
 
 void PortableServer::POA::WrongPolicy::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5365,10 +5365,10 @@ PortableServer::Current_var::tao_nil (void)
 ::PortableServer::Current_ptr
 PortableServer::Current_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::PortableServer::Current::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::PortableServer::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5448,15 +5448,15 @@ PortableServer::Current::Current (void)
 
   PortableServer::Current_ptr PortableServer::Current::_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
   {
-    return Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+    return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
   }
 
   PortableServer::Current_ptr PortableServer::Current::_unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_NOT_USED
+      ACE_ENV_ARG_DECL_NOT_USED
     )
   {
     if (CORBA::is_nil (obj))
@@ -5563,7 +5563,7 @@ void PortableServer::Current::NoContext::_raise ()
 
 void PortableServer::Current::NoContext::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5571,7 +5571,7 @@ void PortableServer::Current::NoContext::_tao_encode (
 
 void PortableServer::Current::NoContext::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5654,7 +5654,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Ob
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ObjectId TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ObjectId ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5742,7 +5742,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Fo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ForwardRequest TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ForwardRequest ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5836,7 +5836,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::No
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_NotAGroupObject TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_NotAGroupObject ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5931,7 +5931,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::ID
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IDs TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IDs ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5998,7 +5998,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ThreadPo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ThreadPolicyValue TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ThreadPolicyValue ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -6047,7 +6047,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Lifespan
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_LifespanPolicyValue TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_LifespanPolicyValue ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -6094,7 +6094,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdUnique
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -6141,7 +6141,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdAssign
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -6190,7 +6190,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Implicit
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -6237,7 +6237,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ServantR
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -6284,7 +6284,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::RequestP
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 2a8a99638b8..393d325abe2 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -116,7 +116,7 @@ TAO_NAMESPACE  PortableServer
     static POA_ptr tao_nil (void);
     static POA_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -201,7 +201,7 @@ TAO_NAMESPACE  PortableServer
     virtual void _downcast (
         void* target,
         CORBA_Object *src
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     virtual CORBA_Object* _upcast (void *src) const;
   };
@@ -467,12 +467,12 @@ TAO_NAMESPACE  PortableServer
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
 
     static ForwardRequest *_downcast (CORBA::Exception *);
@@ -519,12 +519,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       ) const;
 
     virtual void _tao_decode (
         TAO_InputCDR &
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
 
     static NotAGroupObject *_downcast (CORBA::Exception *);
@@ -771,7 +771,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static ThreadPolicy_ptr tao_nil (void);
     static ThreadPolicy_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -829,12 +829,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static ThreadPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ThreadPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ThreadPolicy_ptr _nil (void)
@@ -843,7 +843,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       }
 
     virtual ::PortableServer::ThreadPolicyValue value (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -918,7 +918,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static LifespanPolicy_ptr tao_nil (void);
     static LifespanPolicy_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -976,12 +976,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static LifespanPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static LifespanPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static LifespanPolicy_ptr _nil (void)
@@ -990,7 +990,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       }
 
     virtual ::PortableServer::LifespanPolicyValue value (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1063,7 +1063,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static IdUniquenessPolicy_ptr tao_nil (void);
     static IdUniquenessPolicy_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1121,12 +1121,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static IdUniquenessPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static IdUniquenessPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static IdUniquenessPolicy_ptr _nil (void)
@@ -1135,7 +1135,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       }
 
     virtual ::PortableServer::IdUniquenessPolicyValue value (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1208,7 +1208,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static IdAssignmentPolicy_ptr tao_nil (void);
     static IdAssignmentPolicy_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1266,12 +1266,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static IdAssignmentPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static IdAssignmentPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static IdAssignmentPolicy_ptr _nil (void)
@@ -1280,7 +1280,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       }
 
     virtual ::PortableServer::IdAssignmentPolicyValue value (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1355,7 +1355,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static ImplicitActivationPolicy_ptr tao_nil (void);
     static ImplicitActivationPolicy_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1413,12 +1413,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static ImplicitActivationPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ImplicitActivationPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ImplicitActivationPolicy_ptr _nil (void)
@@ -1427,7 +1427,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       }
 
     virtual ::PortableServer::ImplicitActivationPolicyValue value (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1504,7 +1504,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static ServantRetentionPolicy_ptr tao_nil (void);
     static ServantRetentionPolicy_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1562,12 +1562,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static ServantRetentionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ServantRetentionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ServantRetentionPolicy_ptr _nil (void)
@@ -1576,7 +1576,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       }
 
     virtual ::PortableServer::ServantRetentionPolicyValue value (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1654,7 +1654,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static RequestProcessingPolicy_ptr tao_nil (void);
     static RequestProcessingPolicy_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1712,12 +1712,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static RequestProcessingPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static RequestProcessingPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static RequestProcessingPolicy_ptr _nil (void)
@@ -1726,7 +1726,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       }
 
     virtual ::PortableServer::RequestProcessingPolicyValue value (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1791,7 +1791,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static POAManager_ptr tao_nil (void);
     static POAManager_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1849,12 +1849,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static POAManager_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static POAManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static POAManager_ptr _nil (void)
@@ -1885,12 +1885,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static AdapterInactive *_downcast (CORBA::Exception *);
@@ -1913,7 +1913,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     typedef State &State_out;
     virtual void activate (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1923,7 +1923,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     virtual void hold_requests (
-        CORBA::Boolean wait_for_completion TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1931,7 +1931,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual void discard_requests (
-        CORBA::Boolean wait_for_completion TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1940,7 +1940,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     virtual void deactivate (
         CORBA::Boolean etherealize_objects,
-        CORBA::Boolean wait_for_completion TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -1950,7 +1950,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     virtual ::PortableServer::POAManager::State get_state (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2015,7 +2015,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static AdapterActivator_ptr tao_nil (void);
     static AdapterActivator_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -2073,12 +2073,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static AdapterActivator_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static AdapterActivator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static AdapterActivator_ptr _nil (void)
@@ -2088,7 +2088,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     virtual CORBA::Boolean unknown_adapter (
         PortableServer::POA_ptr parent,
-        const char * name TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const char * name ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2152,7 +2152,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static ServantManager_ptr tao_nil (void);
     static ServantManager_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -2210,12 +2210,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static ServantManager_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ServantManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ServantManager_ptr _nil (void)
@@ -2281,7 +2281,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static ServantActivator_ptr tao_nil (void);
     static ServantActivator_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -2339,12 +2339,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static ServantActivator_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ServantActivator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ServantActivator_ptr _nil (void)
@@ -2354,7 +2354,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     virtual ::PortableServer::Servant incarnate (
         const PortableServer::ObjectId & oid,
-        PortableServer::POA_ptr adapter TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::POA_ptr adapter ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
 #if (TAO_HAS_MINIMUM_CORBA == 0)
       ACE_THROW_SPEC ((
@@ -2372,7 +2372,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         PortableServer::POA_ptr adapter,
         PortableServer::Servant serv,
         CORBA::Boolean cleanup_in_progress,
-        CORBA::Boolean remaining_activations TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::Boolean remaining_activations ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2436,7 +2436,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static ServantLocator_ptr tao_nil (void);
     static ServantLocator_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -2497,12 +2497,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static ServantLocator_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ServantLocator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static ServantLocator_ptr _nil (void)
@@ -2514,7 +2514,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         const PortableServer::ObjectId & oid,
         PortableServer::POA_ptr adapter,
         const char * operation,
-        PortableServer::ServantLocator::Cookie & the_cookie TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::ServantLocator::Cookie & the_cookie ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
 #if (TAO_HAS_MINIMUM_CORBA == 0)
       ACE_THROW_SPEC ((
@@ -2532,7 +2532,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
         PortableServer::POA_ptr adapter,
         const char * operation,
         PortableServer::ServantLocator::Cookie the_cookie,
-        PortableServer::Servant the_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::Servant the_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2596,7 +2596,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static POA_ptr tao_nil (void);
     static POA_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -2655,12 +2655,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static POA_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static POA_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static POA_ptr _nil (void)
@@ -2695,12 +2695,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static AdapterAlreadyExists *_downcast (CORBA::Exception *);
@@ -2736,12 +2736,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static AdapterNonExistent *_downcast (CORBA::Exception *);
@@ -2778,12 +2778,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static InvalidPolicy *_downcast (CORBA::Exception *);
@@ -2823,12 +2823,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static NoServant *_downcast (CORBA::Exception *);
@@ -2865,12 +2865,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static ObjectAlreadyActive *_downcast (CORBA::Exception *);
@@ -2906,12 +2906,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static ObjectNotActive *_downcast (CORBA::Exception *);
@@ -2947,12 +2947,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static ServantAlreadyActive *_downcast (CORBA::Exception *);
@@ -2988,12 +2988,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static ServantNotActive *_downcast (CORBA::Exception *);
@@ -3029,12 +3029,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static WrongAdapter *_downcast (CORBA::Exception *);
@@ -3070,12 +3070,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static WrongPolicy *_downcast (CORBA::Exception *);
@@ -3091,7 +3091,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     virtual ::PortableServer::POA_ptr create_POA (
         const char * adapter_name,
         PortableServer::POAManager_ptr a_POAManager,
-        const CORBA::PolicyList & policies TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const CORBA::PolicyList & policies ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3101,7 +3101,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     virtual ::PortableServer::POA_ptr find_POA (
         const char * adapter_name,
-        CORBA::Boolean activate_it TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::Boolean activate_it ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3110,7 +3110,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     virtual void destroy (
         CORBA::Boolean etherealize_objects,
-        CORBA::Boolean wait_for_completion TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::Boolean wait_for_completion ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3119,7 +3119,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
-        PortableServer::ThreadPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::ThreadPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3128,21 +3128,21 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy (
-        PortableServer::LifespanPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::LifespanPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual ::PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
-        PortableServer::IdUniquenessPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::IdUniquenessPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual ::PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
-        PortableServer::IdAssignmentPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::IdAssignmentPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3151,21 +3151,21 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
-        PortableServer::ImplicitActivationPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::ImplicitActivationPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
-        PortableServer::ServantRetentionPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::ServantRetentionPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
-        PortableServer::RequestProcessingPolicyValue value TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::RequestProcessingPolicyValue value ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3174,28 +3174,28 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     virtual char * the_name (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual ::PortableServer::POA_ptr the_parent (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual ::PortableServer::POAList * the_children (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual ::PortableServer::POAManager_ptr the_POAManager (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3204,21 +3204,21 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     virtual ::PortableServer::AdapterActivator_ptr the_activator (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void the_activator (
-        PortableServer::AdapterActivator_ptr the_activator TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::AdapterActivator_ptr the_activator ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual ::PortableServer::ServantManager_ptr get_servant_manager (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3226,7 +3226,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual void set_servant_manager (
-        PortableServer::ServantManager_ptr imgr TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::ServantManager_ptr imgr ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3234,7 +3234,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual ::PortableServer::Servant get_servant (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3243,7 +3243,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual void set_servant (
-        PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3253,7 +3253,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     virtual ::PortableServer::ObjectId * activate_object (
-        PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3263,7 +3263,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     virtual void activate_object_with_id (
         const PortableServer::ObjectId & id,
-        PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3273,7 +3273,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual void deactivate_object (
-        const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3282,7 +3282,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual CORBA::Object_ptr create_reference (
-        const char * intf TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const char * intf ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3291,7 +3291,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     virtual CORBA::Object_ptr create_reference_with_id (
         const PortableServer::ObjectId & oid,
-        const char * intf TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const char * intf ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3299,7 +3299,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual ::PortableServer::ObjectId * servant_to_id (
-        PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3308,7 +3308,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual CORBA::Object_ptr servant_to_reference (
-        PortableServer::Servant p_servant TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        PortableServer::Servant p_servant ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3317,7 +3317,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual ::PortableServer::Servant reference_to_servant (
-        CORBA::Object_ptr reference TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::Object_ptr reference ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3327,7 +3327,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual ::PortableServer::ObjectId * reference_to_id (
-        CORBA::Object_ptr reference TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::Object_ptr reference ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3336,7 +3336,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual ::PortableServer::Servant id_to_servant (
-        const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3345,7 +3345,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual CORBA::Object_ptr id_to_reference (
-        const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3354,7 +3354,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual ::CORBA::OctetSeq * id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3363,7 +3363,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     virtual ::PortableServer::ObjectId * create_id_for_reference (
-        CORBA::Object_ptr the_ref TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::Object_ptr the_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3371,7 +3371,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual ::PortableServer::IDs * reference_to_ids (
-        CORBA::Object_ptr the_ref TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        CORBA::Object_ptr the_ref ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3380,7 +3380,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     virtual void associate_reference_with_id (
         CORBA::Object_ptr ref,
-        const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3389,7 +3389,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     virtual void disassociate_reference_with_id (
         CORBA::Object_ptr ref,
-        const PortableServer::ObjectId & oid TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        const PortableServer::ObjectId & oid ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3456,7 +3456,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
     static Current_ptr tao_nil (void);
     static Current_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -3514,12 +3514,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
     static Current_ptr _nil (void)
@@ -3550,12 +3550,12 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static NoContext *_downcast (CORBA::Exception *);
@@ -3569,7 +3569,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 #endif /* end #if !defined */
 
     virtual ::PortableServer::POA_ptr get_POA (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -3577,7 +3577,7 @@ TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
       )) = 0;
 
     virtual ::PortableServer::ObjectId * get_object_id (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i
index ceea3c99d27..4023c0925a5 100644
--- a/TAO/tao/PortableServer/PortableServerC.i
+++ b/TAO/tao/PortableServer/PortableServerC.i
@@ -1061,10 +1061,10 @@ tao_PortableServer_ThreadPolicy_nil (
 
 ACE_INLINE PortableServer::ThreadPolicy_ptr
 tao_PortableServer_ThreadPolicy_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::ThreadPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::ThreadPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1112,10 +1112,10 @@ tao_PortableServer_LifespanPolicy_nil (
 
 ACE_INLINE PortableServer::LifespanPolicy_ptr
 tao_PortableServer_LifespanPolicy_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::LifespanPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::LifespanPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1161,10 +1161,10 @@ tao_PortableServer_IdUniquenessPolicy_nil (
 
 ACE_INLINE PortableServer::IdUniquenessPolicy_ptr
 tao_PortableServer_IdUniquenessPolicy_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::IdUniquenessPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::IdUniquenessPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1210,10 +1210,10 @@ tao_PortableServer_IdAssignmentPolicy_nil (
 
 ACE_INLINE PortableServer::IdAssignmentPolicy_ptr
 tao_PortableServer_IdAssignmentPolicy_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::IdAssignmentPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::IdAssignmentPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1261,10 +1261,10 @@ tao_PortableServer_ImplicitActivationPolicy_nil (
 
 ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr
 tao_PortableServer_ImplicitActivationPolicy_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::ImplicitActivationPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::ImplicitActivationPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1310,10 +1310,10 @@ tao_PortableServer_ServantRetentionPolicy_nil (
 
 ACE_INLINE PortableServer::ServantRetentionPolicy_ptr
 tao_PortableServer_ServantRetentionPolicy_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::ServantRetentionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::ServantRetentionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1359,10 +1359,10 @@ tao_PortableServer_RequestProcessingPolicy_nil (
 
 ACE_INLINE PortableServer::RequestProcessingPolicy_ptr
 tao_PortableServer_RequestProcessingPolicy_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::RequestProcessingPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::RequestProcessingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1414,10 +1414,10 @@ tao_PortableServer_POAManager_nil (
 
 ACE_INLINE PortableServer::POAManager_ptr
 tao_PortableServer_POAManager_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::POAManager::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::POAManager::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1465,10 +1465,10 @@ tao_PortableServer_AdapterActivator_nil (
 
 ACE_INLINE PortableServer::AdapterActivator_ptr
 tao_PortableServer_AdapterActivator_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::AdapterActivator::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::AdapterActivator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1514,10 +1514,10 @@ tao_PortableServer_ServantManager_nil (
 
 ACE_INLINE PortableServer::ServantManager_ptr
 tao_PortableServer_ServantManager_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::ServantManager::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::ServantManager::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1563,10 +1563,10 @@ tao_PortableServer_ServantActivator_nil (
 
 ACE_INLINE PortableServer::ServantActivator_ptr
 tao_PortableServer_ServantActivator_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::ServantActivator::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::ServantActivator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1612,10 +1612,10 @@ tao_PortableServer_ServantLocator_nil (
 
 ACE_INLINE PortableServer::ServantLocator_ptr
 tao_PortableServer_ServantLocator_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::ServantLocator::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::ServantLocator::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1703,10 +1703,10 @@ tao_PortableServer_POA_nil (
 
 ACE_INLINE PortableServer::POA_ptr
 tao_PortableServer_POA_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
@@ -1756,10 +1756,10 @@ tao_PortableServer_Current_nil (
 
 ACE_INLINE PortableServer::Current_ptr
 tao_PortableServer_Current_narrow (
-    CORBA::Object *p TAO_ENV_ARG_DECL
+    CORBA::Object *p ACE_ENV_ARG_DECL
   )
 {
-  return PortableServer::Current::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return PortableServer::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 43448eb0b26..fdfb09c078d 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -64,21 +64,21 @@ TAO_ServantBase::~TAO_ServantBase (void)
 }
 
 PortableServer::POA_ptr
-TAO_ServantBase::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServantBase::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::Object_var object =
-    TAO_ORB_Core_instance ()->root_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+    TAO_ORB_Core_instance ()->root_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   return PortableServer::POA::_narrow (object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_ServantBase::_is_a (const char* logical_type_id
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
-  const char *id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *id = CORBA::_tc_Object->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (ACE_OS::strcmp (logical_type_id, id) == 0)
@@ -90,13 +90,13 @@ TAO_ServantBase::_is_a (const char* logical_type_id
 }
 
 CORBA::Boolean
-TAO_ServantBase::_non_existent (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServantBase::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return 0;
 }
 
 CORBA_InterfaceDef_ptr
-TAO_ServantBase::_get_interface (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServantBase::_get_interface (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -111,7 +111,7 @@ TAO_ServantBase::_get_interface (TAO_ENV_SINGLE_ARG_DECL)
 
   return adapter->get_interface (TAO_ORB_Core_instance ()->orb (),
                                  this->_interface_repository_id ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 int
@@ -131,7 +131,7 @@ TAO_ServantBase::_bind (const char *opname,
 }
 
 TAO_Stub *
-TAO_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = 0;
 
@@ -151,15 +151,15 @@ TAO_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL)
                                                     poa_current_impl->object_key (),
                                                     this->_interface_repository_id (),
                                                     poa_current_impl->priority ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   else
     {
-      PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::Object_var object = poa->servant_to_reference (this TAO_ENV_ARG_PARAMETER);
+      CORBA::Object_var object = poa->servant_to_reference (this ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Get the stub object
@@ -180,7 +180,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (
                                                    TAO_ServerRequest &req,
                                                    void *servant_upcall,
                                                    void *derived_this
-                                                   TAO_ENV_ARG_DECL
+                                                   ACE_ENV_ARG_DECL
                                                    )
   //CORBA::Environment &ACE_TRY_ENV
 
@@ -223,7 +223,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (
       // Invoke the skeleton, it will demarshal the arguments,
       // invoke the right operation on the skeleton class
       // (<derived_this>), and marshal any results.
-      skel (req, derived_this, servant_upcall TAO_ENV_ARG_PARAMETER); //, ACE_TRY_ENV);
+      skel (req, derived_this, servant_upcall ACE_ENV_ARG_PARAMETER); //, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // It is our job to send the already marshaled reply, but only
@@ -266,7 +266,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (
                                                     TAO_ServerRequest &req,
                                                     void *servant_upcall,
                                                     void *derived_this
-                                                    TAO_ENV_ARG_DECL
+                                                    ACE_ENV_ARG_DECL
                                                     //  CORBA::Environment &ACE_TRY_ENV
                                                     )
 {
@@ -306,7 +306,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (
       // Invoke the skeleton, it will demarshal the arguments,
       // invoke the right operation on the skeleton class
       // (<derived_this>), and marshal any results.
-      skel (req, derived_this, servant_upcall TAO_ENV_ARG_PARAMETER);
+      skel (req, derived_this, servant_upcall ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // It is our job to send the already marshaled reply, but only
@@ -351,13 +351,13 @@ TAO_RefCountServantBase::~TAO_RefCountServantBase (void)
 }
 
 void
-TAO_RefCountServantBase::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RefCountServantBase::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ++this->ref_count_;
 }
 
 void
-TAO_RefCountServantBase::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_RefCountServantBase::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::ULong new_count = --this->ref_count_;
 
@@ -485,7 +485,7 @@ TAO_ServantBase_var::_retn (void)
 void
 TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &,
                                   void *
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_THROW (CORBA::BAD_OPERATION ());
 }
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 7604d668c08..4dcc688c811 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -47,30 +47,30 @@ public:
   // Destructor.
 
   virtual PortableServer::POA_ptr _default_POA (
-                                                TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+                                                ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   // Returns the default POA for this servant.
 
   virtual CORBA::Boolean _is_a (const char* logical_type_id
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Local implementation of the CORBA::Object::_is_a method.
 
-  virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Default <_non_existent>: always returns false.
 
   virtual CORBA_InterfaceDef_ptr _get_interface (
-                                                 TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+                                                 ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual void *_downcast (const char *repository_id) = 0;
   // Get the correct vtable.
 
-  virtual TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL);
   // This is an auxiliar method for _this() and _narrow().
 
   virtual void _dispatch (TAO_ServerRequest &request,
                           void *servant_upcall
-                          TAO_ENV_ARG_DECL) = 0;
+                          ACE_ENV_ARG_DECL) = 0;
   // Dispatches a request to the object: find the operation, cast the
   // type to the most derived type, demarshall all the parameters from
   // the request and finally invokes the operation, storing the
@@ -93,12 +93,12 @@ protected:
                                             void *servant_upcall,
                                             void *derived_this
                                             // CORBA::Environment &ACE_TRY_ENV);
-                                            TAO_ENV_ARG_DECL);
+                                            ACE_ENV_ARG_DECL);
 
   virtual void asynchronous_upcall_dispatch (TAO_ServerRequest &req,
                                              void *servant_upcall,
                                              void *derived_this
-                                             TAO_ENV_ARG_DECL);
+                                             ACE_ENV_ARG_DECL);
   //CORBA::Environment &ACE_TRY_ENV);
 
   virtual int _find (const char *opname,
@@ -153,10 +153,10 @@ public:
   ~TAO_RefCountServantBase (void);
   // Destructor.
 
-  virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Increase reference count by one.
 
-  virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Decreases reference count by one; if the resulting reference
   // count equals zero, _remove_ref invokes delete on its this pointer
   // in order to destroy the servant.
@@ -241,13 +241,13 @@ class TAO_PortableServer_Export TAO_Local_ServantBase
   //     registered with the POA.
   //
 protected:
-  TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // This is an auxiliar method for _this().  Make sure *not* to
   // register with the default POA.
 
   void _dispatch (TAO_ServerRequest &request,
                   void *servant_upcall
-                  TAO_ENV_ARG_DECL);
+                  ACE_ENV_ARG_DECL);
   // Throws CORBA::BAD_OPERATION exception.
 };
 
diff --git a/TAO/tao/PortableServer/Servant_Base.i b/TAO/tao/PortableServer/Servant_Base.i
index d8478e202b0..2037908841a 100644
--- a/TAO/tao/PortableServer/Servant_Base.i
+++ b/TAO/tao/PortableServer/Servant_Base.i
@@ -7,7 +7,7 @@ TAO_Servant_Hash::operator () (PortableServer::Servant servant) const
 }
 
 ACE_INLINE TAO_Stub *
-TAO_Local_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Local_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
 {
 #if 0
   PortableServer::ObjectId_var invalid_oid =
@@ -27,10 +27,10 @@ TAO_Local_ServantBase::_create_stub (TAO_ENV_SINGLE_ARG_DECL)
   // the creation of a local stub, hence causing a infinite loop.
   return TAO_ORB_Core_instance ()->orb ()->create_stub_object (tmp_key,
                                                                this->_interface_repository_id ()
-                                                               TAO_ENV_ARG_PARAMETER);
+                                                               ACE_ENV_ARG_PARAMETER);
 #else
 # if !defined (ACE_HAS_EXCEPTIONS)
-  ACE_UNUSED_ARG (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_UNUSED_ARG (ACE_ENV_SINGLE_ARG_PARAMETER);
 #endif
   return 0;
 #endif
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h
index 15b3b623328..eaeb04bc7e2 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.h
@@ -44,7 +44,7 @@ public:
   /// Dispatch the request to the servant.
   virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
                          TAO_ServerRequest &req
-                         TAO_ENV_ARG_DECL) = 0;
+                         ACE_ENV_ARG_DECL) = 0;
 
   /// Factory method for creating new POA's.
   virtual TAO_POA *create_POA (const ACE_CString &name,
@@ -55,7 +55,7 @@ public:
                                TAO_SYNCH_MUTEX &thread_lock,
                                TAO_ORB_Core &orb_core,
                                TAO_Object_Adapter *object_adapter
-                               TAO_ENV_ARG_DECL) = 0;
+                               ACE_ENV_ARG_DECL) = 0;
 
 };
 
diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp b/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
index 5927d4fcbe0..b862fca42d2 100644
--- a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
@@ -25,7 +25,7 @@ void
 TAO_ServerRequestInterceptor_Adapter::
 receive_request_service_contexts (
   TAO_ServerRequestInfo *ri
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   // This method implements one of the "starting" server side
   // interception point.
@@ -43,7 +43,7 @@ receive_request_service_contexts (
         {
           this->interceptors_[i]->receive_request_service_contexts (
             ri
-            TAO_ENV_ARG_PARAMETER);
+            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // The starting interception point completed successfully.
@@ -55,7 +55,7 @@ receive_request_service_contexts (
     {
       ri->forward_reference (exc);
       this->send_other (ri
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->location_forwarded_ = 1;
@@ -67,7 +67,7 @@ receive_request_service_contexts (
 void
 TAO_ServerRequestInterceptor_Adapter::
 receive_request (TAO_ServerRequestInfo *ri
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   // This method implements an "intermediate" server side interception
   // point.  Interceptors are invoked in the same order they were
@@ -91,7 +91,7 @@ receive_request (TAO_ServerRequestInfo *ri
       for (size_t i = 0; i < this->stack_size_; ++i)
         {
           this->interceptors_[i]->receive_request (ri
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Note that no interceptors are pushed on to or popped off
@@ -103,7 +103,7 @@ receive_request (TAO_ServerRequestInfo *ri
     {
       ri->forward_reference (exc);
       this->send_other (ri
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->location_forwarded_ = 1;
@@ -116,7 +116,7 @@ receive_request (TAO_ServerRequestInfo *ri
 void
 TAO_ServerRequestInterceptor_Adapter::
 send_reply (TAO_ServerRequestInfo *ri
-            TAO_ENV_ARG_DECL)
+            ACE_ENV_ARG_DECL)
 {
   // This is an "ending" interception point so we only process the
   // interceptors pushed on to the flow stack.
@@ -137,7 +137,7 @@ send_reply (TAO_ServerRequestInfo *ri
 
       this->interceptors_[this->stack_size_]->send_reply (
         ri
-        TAO_ENV_ARG_PARAMETER);
+        ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -149,7 +149,7 @@ send_reply (TAO_ServerRequestInfo *ri
 void
 TAO_ServerRequestInterceptor_Adapter::
 send_exception (TAO_ServerRequestInfo *ri
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
@@ -172,7 +172,7 @@ send_exception (TAO_ServerRequestInfo *ri
 
           this->interceptors_[this->stack_size_]->send_exception (
             ri
-            TAO_ENV_ARG_PARAMETER);
+            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -180,7 +180,7 @@ send_exception (TAO_ServerRequestInfo *ri
     {
       ri->forward_reference (exc);
       this->send_other (ri
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->location_forwarded_ = 1;
@@ -199,11 +199,11 @@ send_exception (TAO_ServerRequestInfo *ri
 
       ri->exception (&ACE_ANY_EXCEPTION);
 
-      this->send_exception (ri TAO_ENV_ARG_PARAMETER);
+      this->send_exception (ri ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus status =
-        ri->reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Only re-throw the exception if it hasn't been transformed by
@@ -220,7 +220,7 @@ send_exception (TAO_ServerRequestInfo *ri
 void
 TAO_ServerRequestInterceptor_Adapter::
 send_other (TAO_ServerRequestInfo *ri
-            TAO_ENV_ARG_DECL)
+            ACE_ENV_ARG_DECL)
 {
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
@@ -243,7 +243,7 @@ send_other (TAO_ServerRequestInfo *ri
 
           this->interceptors_[this->stack_size_]->send_other (
             ri
-            TAO_ENV_ARG_PARAMETER);
+            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -251,7 +251,7 @@ send_other (TAO_ServerRequestInfo *ri
     {
       ri->forward_reference (exc);
       this->send_other (ri
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->location_forwarded_ = 1;
diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.h b/TAO/tao/PortableServer/ServerInterceptorAdapter.h
index 03aab708e15..04678976caf 100644
--- a/TAO/tao/PortableServer/ServerInterceptorAdapter.h
+++ b/TAO/tao/PortableServer/ServerInterceptorAdapter.h
@@ -71,26 +71,26 @@ public:
   /// point.
   void receive_request_service_contexts (
     TAO_ServerRequestInfo *ri
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
 
   /// This method an "intermediate" server side interception point.
   void receive_request (TAO_ServerRequestInfo *ri
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
 
   /// This method implements one of the "ending" server side
   /// interception points.
   void send_reply (TAO_ServerRequestInfo *ri
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 
   /// This method implements one of the "ending" server side
   /// interception points.
   void send_exception (TAO_ServerRequestInfo *ri
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
 
   /// This method implements one of the "ending" server side
   /// interception points.
   void send_other (TAO_ServerRequestInfo *ri
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
   //@}
 
   /// Returns true if a LOCATION_FORWARD was generated, and false
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp
index 4dea2e6e54b..bf2bb46aec5 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.cpp
+++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp
@@ -33,7 +33,7 @@ TAO_ServerRequestInfo::TAO_ServerRequestInfo (
 }
 
 CORBA::ULong
-TAO_ServerRequestInfo::request_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The request ID returned by this method need not correspond to the
@@ -76,14 +76,14 @@ TAO_ServerRequestInfo::request_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-TAO_ServerRequestInfo::operation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServerRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->server_request_.operation ());
 }
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -92,7 +92,7 @@ TAO_ServerRequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -101,7 +101,7 @@ TAO_ServerRequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ContextList *
-TAO_ServerRequestInfo::contexts (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -110,7 +110,7 @@ TAO_ServerRequestInfo::contexts (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::RequestContext *
-TAO_ServerRequestInfo::operation_context (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -119,7 +119,7 @@ TAO_ServerRequestInfo::operation_context (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -128,7 +128,7 @@ TAO_ServerRequestInfo::result (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Boolean
-TAO_ServerRequestInfo::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServerRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->server_request_.response_expected ();
@@ -136,7 +136,7 @@ TAO_ServerRequestInfo::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 # if TAO_HAS_CORBA_MESSAGING == 1
 Messaging::SyncScope
-TAO_ServerRequestInfo::sync_scope (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->server_request_.sync_with_server ())
@@ -149,7 +149,7 @@ TAO_ServerRequestInfo::sync_scope (TAO_ENV_SINGLE_ARG_DECL)
 #endif  /* TAO_HAS_CORBA_MESSAGING */
 
 PortableInterceptor::ReplyStatus
-TAO_ServerRequestInfo::reply_status (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ == -1)
@@ -162,7 +162,7 @@ TAO_ServerRequestInfo::reply_status (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Object_ptr
-TAO_ServerRequestInfo::forward_reference (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD)
@@ -177,7 +177,7 @@ TAO_ServerRequestInfo::forward_reference (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Any *
 TAO_ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -189,20 +189,20 @@ TAO_ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
   if (pi_current == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  pi_current->check_validity (id TAO_ENV_ARG_PARAMETER);
+  pi_current->check_validity (id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Retrieve the request scope PICurrent object.
   TAO_PICurrent_Impl &rsc = this->server_request_.rs_pi_current ();
 
-  return rsc.get_slot (id TAO_ENV_ARG_PARAMETER);
+  return rsc.get_slot (id ACE_ENV_ARG_PARAMETER);
 
 }
 
 IOP::ServiceContext *
 TAO_ServerRequestInfo::get_request_service_context (
     IOP::ServiceId id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Service_Context &service_context_list =
@@ -210,13 +210,13 @@ TAO_ServerRequestInfo::get_request_service_context (
 
   return this->get_service_context_i (service_context_list,
                                       id
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 }
 
 IOP::ServiceContext *
 TAO_ServerRequestInfo::get_reply_service_context (
     IOP::ServiceId id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_Service_Context &service_context_list =
@@ -224,14 +224,14 @@ TAO_ServerRequestInfo::get_reply_service_context (
 
   return this->get_service_context_i (service_context_list,
                                       id
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 }
 
 IOP::ServiceContext *
 TAO_ServerRequestInfo::get_service_context_i (
     TAO_Service_Context &service_context_list,
     IOP::ServiceId id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create a new service context to be returned.  Assume
@@ -267,7 +267,7 @@ TAO_ServerRequestInfo::get_service_context_i (
 // exception from an Any. This method is in place just to be compliant
 // with the spec.
 CORBA::Any *
-TAO_ServerRequestInfo::sending_exception (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
@@ -304,14 +304,14 @@ TAO_ServerRequestInfo::sending_exception (TAO_ENV_SINGLE_ARG_DECL)
 // = TAO specific method done since there currently is no simple way
 // to extract exceptions from an Any
 CORBA::Exception *
-TAO_ServerRequestInfo::_sending_exception (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServerRequestInfo::_sending_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->caught_exception_;
 }
 
 char *
-TAO_ServerRequestInfo::server_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::server_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
@@ -325,7 +325,7 @@ TAO_ServerRequestInfo::server_id (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO_ServerRequestInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
@@ -338,7 +338,7 @@ TAO_ServerRequestInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 PortableInterceptor::AdapterName *
-TAO_ServerRequestInfo::adapter_name (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Fill in later
@@ -354,7 +354,7 @@ TAO_ServerRequestInfo::adapter_name (TAO_ENV_SINGLE_ARG_DECL)
     {
       CORBA::StringSeq *adapter_name = 0;
       adapter_name =
-        this->servant_upcall_->poa ().adapter_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->servant_upcall_->poa ().adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       return adapter_name;
@@ -366,7 +366,7 @@ TAO_ServerRequestInfo::adapter_name (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::OctetSeq *
-TAO_ServerRequestInfo::object_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
@@ -409,11 +409,11 @@ TAO_ServerRequestInfo::object_id (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::OctetSeq *
-TAO_ServerRequestInfo::adapter_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::adapter_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->servant_upcall_ != 0)
-    return this->servant_upcall_->poa ().id (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->servant_upcall_->poa ().id (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
                                           CORBA::COMPLETED_NO),
@@ -422,7 +422,7 @@ TAO_ServerRequestInfo::adapter_id (TAO_ENV_SINGLE_ARG_DECL)
 
 char *
 TAO_ServerRequestInfo::target_most_derived_interface (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Implemented in the generated skeleton.
@@ -434,7 +434,7 @@ TAO_ServerRequestInfo::target_most_derived_interface (
 
 CORBA::Policy_ptr
 TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Currently, it is only possible to retrieve the server policy
@@ -458,7 +458,7 @@ TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type
           //    object reference!!!
           CORBA::Policy_var policy = policies.get_policy_by_index (i);
 
-          CORBA::PolicyType ptype = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::PolicyType ptype = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
           if (ptype == type)
@@ -482,7 +482,7 @@ TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type
 void
 TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
                                  const CORBA::Any &data
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::InvalidSlot))
 {
@@ -494,7 +494,7 @@ TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
   if (pi_current == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  pi_current->check_validity (id TAO_ENV_ARG_PARAMETER);
+  pi_current->check_validity (id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Retrieve the "request scope current" (RSC).
@@ -507,13 +507,13 @@ TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
   if (tsc != 0)
     tsc->copy (rsc, 1);  // Deep copy
 
-  rsc.set_slot (id, data TAO_ENV_ARG_PARAMETER);
+  rsc.set_slot (id, data ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::Boolean
 TAO_ServerRequestInfo::target_is_a (const char * /* id */
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Implemented in the generated skeleton.
@@ -526,7 +526,7 @@ void
 TAO_ServerRequestInfo::add_reply_service_context (
     const IOP::ServiceContext & service_context,
     CORBA::Boolean replace
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the service context from the list
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.h b/TAO/tao/PortableServer/ServerRequestInfo.h
index 3bd363ad2bd..bf2d856464b 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.h
+++ b/TAO/tao/PortableServer/ServerRequestInfo.h
@@ -65,43 +65,43 @@ public:
   /// Return an ID unique to the current request.  This request ID may
   /// or may not be the same as the GIOP request ID.
   virtual CORBA::ULong request_id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the operation name for the current request.
   virtual char * operation (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the list of arguments passed to the current operation.
   virtual Dynamic::ParameterList * arguments (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the list of exceptions the current operation is capable
   /// of throwing.
   virtual Dynamic::ExceptionList * exceptions (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ContextList * contexts (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::RequestContext * operation_context (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the result of the current request.  If there is no return
   /// value then an Any with tk_void TypeCode is returned.  This is
   /// method is not valid for oneway operations.
   virtual CORBA::Any * result (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns true for a two-way operation, and false otherwis.e
   virtual CORBA::Boolean response_expected (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
 #if TAO_HAS_CORBA_MESSAGING == 1
@@ -109,7 +109,7 @@ public:
   /// operation.  If the operation is not a one-way, a
   /// CORBA::BAD_INV_ORDER exception is thrown.
   virtual Messaging::SyncScope sync_scope (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 #endif  /* TAO_HAS_CORBA_MESSAGING */
 
@@ -118,20 +118,20 @@ public:
   /// USER_EXCEPTION, LOCATION_FORWARD, LOCATION_FORWARD_PERMANENT,
   /// TRANSPORT_RETRY.
   virtual PortableInterceptor::ReplyStatus reply_status (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// If the reply status is PortableInterceptor::LOCATION_FORWARD or
   /// PortableInterceptor::LOCATION_FORWARD_PERMANENT, return the
   /// object reference to which the request was forwarded.
   virtual CORBA::Object_ptr forward_reference (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException)) ;
 
   /// Retrieve data from the "request scope" PICurrent object.
   virtual CORBA::Any * get_slot (
       PortableInterceptor::SlotId id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
@@ -139,14 +139,14 @@ public:
   /// from the request service context list.
   virtual IOP::ServiceContext * get_request_service_context (
       IOP::ServiceId id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the IOP::ServiceContext with the given IOP::ServiceId
   /// from the reply service context list.
   virtual IOP::ServiceContext * get_reply_service_context (
       IOP::ServiceId id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return an Any containing the exception being sent, if any.
@@ -155,7 +155,7 @@ public:
    * @note There is no trivial way to extract the exception from an Any.
    */
   virtual CORBA::Any * sending_exception (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -164,51 +164,51 @@ public:
    *       possible.
    */
   virtual CORBA::Exception * _sending_exception (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the ObjectId for the target object.
   virtual CORBA::OctetSeq * object_id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the AdapterId for the POA handling the current request.
   virtual CORBA::OctetSeq * adapter_id (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the server_id of the server. The value is passed to
   /// the ORB via -ORBServerId parameter.
-  virtual char * server_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * server_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the ORBId value that is passed to the ORB::Init call.
-  virtual char * orb_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * orb_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the name of the object adapter that services requests for
   /// the invoked object.
   virtual PortableInterceptor::AdapterName * adapter_name (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
+
   /// Return the most derived interface of the target object.
   virtual char * target_most_derived_interface (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the policy of the given type in effect for the current
   /// request.
   virtual CORBA::Policy_ptr get_server_policy (
       CORBA::PolicyType type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Insert data into the "request scope" PICurrent object.
   virtual void set_slot (
       PortableInterceptor::SlotId id,
       const CORBA::Any & data
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::InvalidSlot));
 
@@ -216,7 +216,7 @@ public:
   /// RepositoryId.
   virtual CORBA::Boolean target_is_a (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Add the IOP::ServiceContext to the reply (outgoing)
@@ -224,7 +224,7 @@ public:
   virtual void add_reply_service_context (
       const IOP::ServiceContext & service_context,
       CORBA::Boolean replace
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 public:
@@ -262,7 +262,7 @@ protected:
   IOP::ServiceContext *get_service_context_i (
     TAO_Service_Context &service_context_list,
     IOP::ServiceId id
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp
index 971f0e6cf42..46779d234b7 100644
--- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.cpp
@@ -36,16 +36,16 @@ TAO_Strategized_Object_Proxy_Broker::~TAO_Strategized_Object_Proxy_Broker (void)
 
 TAO_Object_Proxy_Impl &
 TAO_Strategized_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr object
-                                                   TAO_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL)
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
+    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
+  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -53,7 +53,7 @@ TAO_Strategized_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr object
 
 void
 TAO_Strategized_Object_Proxy_Broker::create_proxy (int strategy
-                                                   TAO_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL)
 {
   ACE_GUARD (TAO_SYNCH_MUTEX,
              guard,
diff --git a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h
index 94e90a7dc65..bcd2e1133cc 100644
--- a/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h
+++ b/TAO/tao/PortableServer/Strategized_Object_Proxy_Broker.h
@@ -44,12 +44,12 @@ public:
   ~TAO_Strategized_Object_Proxy_Broker (void);
 
   virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object
-                                               TAO_ENV_ARG_DECL);
+                                               ACE_ENV_ARG_DECL);
 
 private:
 
   void create_proxy (int collocation_strategy
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
index c7de619af4e..8a0aec21337 100644
--- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
+++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.cpp
@@ -23,7 +23,7 @@ TAO_ThruPOA_Object_Proxy_Impl::~TAO_ThruPOA_Object_Proxy_Impl (void)
 CORBA::Boolean
 TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
                                       const CORBA::Char *logical_type_id
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   TAO_Object_Adapter::Servant_Upcall
     servant_upcall (target->_stubobj ()->servant_orb_var ()->orb_core ());
@@ -33,9 +33,9 @@ TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
     target->_object_key (),
     "_is_a",
     forward_to.out ()
-    TAO_ENV_ARG_PARAMETER);
+    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  return servant_upcall.servant ()->_is_a (logical_type_id TAO_ENV_ARG_PARAMETER);
+  return servant_upcall.servant ()->_is_a (logical_type_id ACE_ENV_ARG_PARAMETER);
 }
 
 
@@ -43,7 +43,7 @@ TAO_ThruPOA_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
 
 CORBA::Boolean
 TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean _tao_retval = 0;
 
@@ -59,10 +59,10 @@ TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
          target->_object_key (),
          "_non_existent",
          forward_to.out ()
-         TAO_ENV_ARG_PARAMETER);
+         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      return servant_upcall.servant ()->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return servant_upcall.servant ()->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
@@ -79,7 +79,7 @@ TAO_ThruPOA_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
 
 CORBA_InterfaceDef_ptr
 TAO_ThruPOA_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -93,10 +93,10 @@ TAO_ThruPOA_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target
          target->_object_key (),
          "_get_interface",
          forward_to.out ()
-         TAO_ENV_ARG_PARAMETER);
+         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      return servant_upcall.servant ()->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+      return servant_upcall.servant ()->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
diff --git a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h
index fdb1cf2225d..4bfa5073345 100644
--- a/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h
+++ b/TAO/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h
@@ -49,16 +49,16 @@ public:
 
   virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,
                                 const CORBA::Char *logical_type_id
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
   virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target
-                                        TAO_ENV_ARG_DECL);
+                                        ACE_ENV_ARG_DECL);
 
   virtual CORBA_InterfaceDef_ptr _get_interface (
       const CORBA::Object_ptr target
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h
index bbe4bbbdfe6..c121d52b57b 100644
--- a/TAO/tao/PortableServer/poa_macros.h
+++ b/TAO/tao/PortableServer/poa_macros.h
@@ -25,12 +25,12 @@
   ACE_CHECK_RETURN (RETURN)
 
 #define TAO_POA_GUARD \
-  TAO_POA_Guard poa_guard (*this TAO_ENV_ARG_PARAMETER); \
+  TAO_POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \
   ACE_UNUSED_ARG (poa_guard); \
   ACE_CHECK
 
 #define TAO_POA_GUARD_RETURN(RETURN) \
-  TAO_POA_Guard poa_guard (*this TAO_ENV_ARG_PARAMETER); \
+  TAO_POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \
   ACE_UNUSED_ARG (poa_guard); \
   ACE_CHECK_RETURN (RETURN)
 
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 5b08ea1692d..e93edd40a4a 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -24,13 +24,13 @@ TAO_Profile::~TAO_Profile (void)
 
 void
 TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   // Sanity checks.
-  this->verify_orb_configuration (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->verify_orb_configuration (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->verify_profile_version (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->verify_profile_version (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ----------------------------------------------------------------
@@ -41,7 +41,7 @@ TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component
 
 void
 TAO_Profile::policies (CORBA::PolicyList *policy_list
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -67,7 +67,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
     {
       TAO_OutputCDR out_CDR;
       policy_value_seq[i].ptype =
-        (*policy_list)[i]->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+        (*policy_list)[i]->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       out_CDR << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER);
@@ -122,14 +122,14 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list
 #else /* TAO_HAS_CORBA_MESSAGING == 1 */
 
   ACE_UNUSED_ARG (policy_list);
-  TAO_ENV_ARG_NOT_USED;  // FUZZ: ignore check_for_ace_check
+  ACE_ENV_ARG_NOT_USED;  // FUZZ: ignore check_for_ace_check
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 }
 
 
 CORBA::PolicyList&
-TAO_Profile::policies (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Profile::policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -189,7 +189,7 @@ TAO_Profile::policies (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
                     this->orb_core_->orb ()->create_policy (
                       policy_value_seq[i].ptype,
                       dummy_any
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   if (!CORBA::is_nil (policy.in ()))
@@ -255,7 +255,7 @@ TAO_Profile::the_stub (void)
 }
 
 void
-TAO_Profile::verify_orb_configuration (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Profile::verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL)
 {
   // If the ORB isn't configured to support tagged components, then
   // throw an exception.
@@ -286,7 +286,7 @@ TAO_Profile::verify_orb_configuration (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Profile::verify_profile_version (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Profile::verify_profile_version (ACE_ENV_SINGLE_ARG_DECL)
 {
   // GIOP 1.0 does not support tagged components.  Throw an exception
   // if the profile is a GIOP 1.0 profile.
@@ -324,10 +324,10 @@ TAO_Profile::supports_multicast (void) const
 
 void
 TAO_Profile::addressing_mode (CORBA::Short addr
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   // ** See race condition note about addressing mode in Profile.h **
-  switch (addr) 
+  switch (addr)
     {
     case TAO_Target_Specification::Key_Addr:
     case TAO_Target_Specification::Profile_Addr:
@@ -370,7 +370,7 @@ TAO_Unknown_Profile::endpoint_count (void)
 
 void
 TAO_Unknown_Profile::parse_string (const char *
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
 {
   // @@ THROW something????
 }
@@ -382,7 +382,7 @@ TAO_Unknown_Profile::object_key_delimiter (void) const
 }
 
 char *
-TAO_Unknown_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Unknown_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // @@ THROW something?
   return 0;
@@ -437,7 +437,7 @@ TAO_Unknown_Profile::is_equivalent (const TAO_Profile* other_profile)
 
 CORBA::ULong
 TAO_Unknown_Profile::hash (CORBA::ULong max
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
 {
   return (ACE::hash_pjw (ACE_reinterpret_cast (const char*,
                                                this->body_.get_buffer ()),
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index df49d2cbf79..a1fb45772ba 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -79,7 +79,7 @@ public:
 
   /// Add the given tagged component to the profile.
   void add_tagged_component (const IOP::TaggedComponent &component
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /// The object key delimiter.
   virtual char object_key_delimiter (void) const = 0;
@@ -87,11 +87,11 @@ public:
   /// Initialize this object using the given input string.
   /// Supports URL style of object references
   virtual void parse_string (const char *string
-                             TAO_ENV_ARG_DECL) = 0;
+                             ACE_ENV_ARG_DECL) = 0;
 
   /// Return a string representation for this profile.  client must
   /// deallocate memory.
-  virtual char* to_string (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual char* to_string (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
   /// Initialize this object using the given CDR octet string.
   virtual int decode (TAO_InputCDR& cdr) = 0;
@@ -132,7 +132,7 @@ public:
 
   /// Return a hash value for this object.
   virtual CORBA::ULong hash (CORBA::ULong max
-                             TAO_ENV_ARG_DECL) = 0;
+                             ACE_ENV_ARG_DECL) = 0;
 
   /**
    * This method is used to get the IOP::TaggedProfile. The profile
@@ -147,10 +147,10 @@ public:
   /// This method sets the client exposed policies, i.e., the ones
   /// propagated in the IOR, for this profile.
   virtual void policies (CORBA::PolicyList *policy_list
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
 
   /// Accessor for the client exposed policies of this profile.
-  virtual CORBA::PolicyList&  policies (TAO_ENV_SINGLE_ARG_DECL);
+  virtual CORBA::PolicyList&  policies (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Sets the TAO_Stub to which this profile is associated.
   virtual void the_stub (TAO_Stub *stub);
@@ -163,33 +163,33 @@ public:
 
   /**
    * Set the addressing mode if a remote servant replies with
-   * an addressing mode exception.  If this profile doesn't 
+   * an addressing mode exception.  If this profile doesn't
    * support a particular addressing mode, this method needs to
    * be overridden signal the appropriate error.
    *
    * ** RACE CONDITION NOTE **
-   * 
+   *
    * Currently, getting and setting the addressing mode is not
    * protected by a mutex.  Theoretically, this could cause a race
    * condition if one thread sends a request, then gets an exception
    * from the remote servant to change the addressing mode, and then
-   * another thread sends a different request to the same servant 
-   * using the wrong addressing mode.  The result of this is that 
+   * another thread sends a different request to the same servant
+   * using the wrong addressing mode.  The result of this is that
    * we'll get another address change exception.  (Annoying, but not
    * that bad.)
    *
-   * In practice at the current time, the above theoretical case 
+   * In practice at the current time, the above theoretical case
    * never happens since the target specification always uses the
    * object key except for MIOP requests.  Remote ORBs can't respond
    * to MIOP requests even to send exceptions, so even in this case,
    * the race condition can't happen.
    *
    * Therefore, for the time being, there is no lock to protect the
-   * addressing mode.  Given that the addressing mode is checked in 
+   * addressing mode.  Given that the addressing mode is checked in
    * the critical path, this decision seems like a good thing.
    */
   virtual void addressing_mode (CORBA::Short addr_mode
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
   /**
    * Return the current addressing mode for this profile.
@@ -204,11 +204,11 @@ private:
 
   /// Verify that the current ORB's configuration supports tagged
   /// components in IORs.
-  void verify_orb_configuration (TAO_ENV_SINGLE_ARG_DECL);
+  void verify_orb_configuration (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Verify that the given profile supports tagged components,
   /// i.e. is not a GIOP 1.0 profile.
-  void verify_profile_version (TAO_ENV_SINGLE_ARG_DECL);
+  void verify_profile_version (ACE_ENV_SINGLE_ARG_DECL);
 
   // Profiles should not be copied!
   ACE_UNIMPLEMENTED_FUNC (TAO_Profile (const TAO_Profile&))
@@ -285,9 +285,9 @@ public:
 
   // = The TAO_Profile methods look above
   virtual void parse_string (const char *string
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   virtual char object_key_delimiter (void) const;
-  virtual char* to_string (TAO_ENV_SINGLE_ARG_DECL);
+  virtual char* to_string (ACE_ENV_SINGLE_ARG_DECL);
   virtual int decode (TAO_InputCDR& cdr);
   virtual int encode (TAO_OutputCDR &stream) const;
   virtual int encode_endpoints (void);
@@ -297,7 +297,7 @@ public:
   virtual size_t endpoint_count (void);
   virtual CORBA::Boolean is_equivalent (const TAO_Profile* other_profile);
   virtual CORBA::ULong hash (CORBA::ULong max
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
   virtual IOP::TaggedProfile &create_tagged_profile (void);
 
 private:
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index 26ec85f7fd9..c722caf2875 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -36,7 +36,7 @@ public:
 
   /// Initialize the protocols hooks instance.
   virtual void init_hooks (TAO_ORB_Core *orb_core
-                           TAO_ENV_ARG_DECL) = 0;
+                           ACE_ENV_ARG_DECL) = 0;
 
   virtual int call_client_protocols_hook (int &send_buffer_size,
                                           int &recv_buffer_size,
@@ -52,12 +52,12 @@ public:
   virtual void rt_service_context (TAO_Stub *stub,
                                    TAO_Service_Context &service_context,
                                    CORBA::Boolean restart
-                                   TAO_ENV_ARG_DECL) = 0;
+                                   ACE_ENV_ARG_DECL) = 0;
 
   virtual void add_rt_service_context_hook (TAO_Service_Context &service_context,
                                             CORBA::Policy *model_policy,
                                             CORBA::Short &client_priority
-                                            TAO_ENV_ARG_DECL) = 0;
+                                            ACE_ENV_ARG_DECL) = 0;
 
   virtual void get_selector_hook (CORBA::Policy *model_policy,
                                   CORBA::Boolean
@@ -78,31 +78,31 @@ public:
    */
   //@{
   virtual int get_thread_CORBA_priority (CORBA::Short &
-                                         TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                                         ACE_ENV_ARG_DECL_NOT_USED) = 0;
 
   virtual int get_thread_native_priority (CORBA::Short &
-                                          TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                                          ACE_ENV_ARG_DECL_NOT_USED) = 0;
 
   virtual int get_thread_CORBA_and_native_priority (CORBA::Short &,
                                                     CORBA::Short &
-                                                    TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                                                    ACE_ENV_ARG_DECL_NOT_USED) = 0;
 
   virtual int set_thread_CORBA_priority (CORBA::Short
-                                         TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                                         ACE_ENV_ARG_DECL_NOT_USED) = 0;
 
   virtual int set_thread_native_priority (CORBA::Short
-                                          TAO_ENV_ARG_DECL_NOT_USED) = 0;
+                                          ACE_ENV_ARG_DECL_NOT_USED) = 0;
 
   //@}
 
   /// Sets the default_policies for ORB.
   /// 1. Sets ORB-level policy defaults for this ORB.  Currently sets
   /// default RTCORBA policies: ClientProtocolPolicy.
-  virtual int set_default_policies (TAO_ENV_SINGLE_ARG_DECL) = 0;
+  virtual int set_default_policies (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
   /// Sets the default ServerProtocolPolicy.
   virtual int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry
-                                                  TAO_ENV_ARG_DECL) = 0;
+                                                  ACE_ENV_ARG_DECL) = 0;
 
 };
 
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
index 9cba7514220..0550a51140b 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
@@ -15,14 +15,14 @@ TAO_Priority_Mapping_Manager::~TAO_Priority_Mapping_Manager (void)
 
 TAO_Priority_Mapping_Manager_ptr
 TAO_Priority_Mapping_Manager::_narrow (CORBA::Object_ptr obj
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
-  return TAO_Priority_Mapping_Manager::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return TAO_Priority_Mapping_Manager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_Priority_Mapping_Manager_ptr
 TAO_Priority_Mapping_Manager::_unchecked_narrow (CORBA::Object_ptr obj
-                                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     return TAO_Priority_Mapping_Manager::_nil ();
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
index 3fa4907dd04..039e62c8e87 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
@@ -67,11 +67,11 @@ public:
   static TAO_Priority_Mapping_Manager_ptr _duplicate (TAO_Priority_Mapping_Manager_ptr obj);
   static TAO_Priority_Mapping_Manager_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static TAO_Priority_Mapping_Manager_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static TAO_Priority_Mapping_Manager_ptr _nil (void)
     {
@@ -124,7 +124,7 @@ public:
   static TAO_Priority_Mapping_Manager_ptr duplicate (TAO_Priority_Mapping_Manager_ptr);
   static void release (TAO_Priority_Mapping_Manager_ptr);
   static TAO_Priority_Mapping_Manager_ptr nil (void);
-  static TAO_Priority_Mapping_Manager_ptr narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+  static TAO_Priority_Mapping_Manager_ptr narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * upcast (void *);
 
 private:
diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i
index 145ef13c934..718af03a334 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i
@@ -119,10 +119,10 @@ TAO_Priority_Mapping_Manager_var::nil (void)
 ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr
 TAO_Priority_Mapping_Manager_var::narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::TAO_Priority_Mapping_Manager::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::TAO_Priority_Mapping_Manager::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index c17161d2278..90c2865f8a8 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -507,10 +507,10 @@ tao_RTCORBA_PriorityModelPolicy_nil (
 RTCORBA::PriorityModelPolicy_ptr
 tao_RTCORBA_PriorityModelPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::PriorityModelPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::PriorityModelPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -634,10 +634,10 @@ RTCORBA::PriorityModelPolicy_var::tao_nil (void)
 ::RTCORBA::PriorityModelPolicy_ptr
 RTCORBA::PriorityModelPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::PriorityModelPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::PriorityModelPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -719,15 +719,15 @@ RTCORBA::PriorityModelPolicy::~PriorityModelPolicy (void)
 
 RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PriorityModelPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return PriorityModelPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::PriorityModelPolicy_ptr RTCORBA::PriorityModelPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -819,10 +819,10 @@ tao_RTCORBA_ThreadpoolPolicy_nil (
 RTCORBA::ThreadpoolPolicy_ptr
 tao_RTCORBA_ThreadpoolPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::ThreadpoolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::ThreadpoolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -946,10 +946,10 @@ RTCORBA::ThreadpoolPolicy_var::tao_nil (void)
 ::RTCORBA::ThreadpoolPolicy_ptr
 RTCORBA::ThreadpoolPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::ThreadpoolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::ThreadpoolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1031,15 +1031,15 @@ RTCORBA::ThreadpoolPolicy::~ThreadpoolPolicy (void)
 
 RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ThreadpoolPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ThreadpoolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ThreadpoolPolicy_ptr RTCORBA::ThreadpoolPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1127,10 +1127,10 @@ tao_RTCORBA_ProtocolProperties_nil (
 RTCORBA::ProtocolProperties_ptr
 tao_RTCORBA_ProtocolProperties_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::ProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::ProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1254,10 +1254,10 @@ RTCORBA::ProtocolProperties_var::tao_nil (void)
 ::RTCORBA::ProtocolProperties_ptr
 RTCORBA::ProtocolProperties_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::ProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::ProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1339,15 +1339,15 @@ RTCORBA::ProtocolProperties::~ProtocolProperties (void)
 
 RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1523,10 +1523,10 @@ tao_RTCORBA_ServerProtocolPolicy_nil (
 RTCORBA::ServerProtocolPolicy_ptr
 tao_RTCORBA_ServerProtocolPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::ServerProtocolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::ServerProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1650,10 +1650,10 @@ RTCORBA::ServerProtocolPolicy_var::tao_nil (void)
 ::RTCORBA::ServerProtocolPolicy_ptr
 RTCORBA::ServerProtocolPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::ServerProtocolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::ServerProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1735,15 +1735,15 @@ RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void)
 
 RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ServerProtocolPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ServerProtocolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -1835,10 +1835,10 @@ tao_RTCORBA_ClientProtocolPolicy_nil (
 RTCORBA::ClientProtocolPolicy_ptr
 tao_RTCORBA_ClientProtocolPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::ClientProtocolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::ClientProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -1962,10 +1962,10 @@ RTCORBA::ClientProtocolPolicy_var::tao_nil (void)
 ::RTCORBA::ClientProtocolPolicy_ptr
 RTCORBA::ClientProtocolPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::ClientProtocolPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::ClientProtocolPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2047,15 +2047,15 @@ RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void)
 
 RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ClientProtocolPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return ClientProtocolPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2147,10 +2147,10 @@ tao_RTCORBA_PrivateConnectionPolicy_nil (
 RTCORBA::PrivateConnectionPolicy_ptr
 tao_RTCORBA_PrivateConnectionPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::PrivateConnectionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::PrivateConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2274,10 +2274,10 @@ RTCORBA::PrivateConnectionPolicy_var::tao_nil (void)
 ::RTCORBA::PrivateConnectionPolicy_ptr
 RTCORBA::PrivateConnectionPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::PrivateConnectionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::PrivateConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2359,15 +2359,15 @@ RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void)
 
 RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PrivateConnectionPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return PrivateConnectionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2455,10 +2455,10 @@ tao_RTCORBA_TCPProtocolProperties_nil (
 RTCORBA::TCPProtocolProperties_ptr
 tao_RTCORBA_TCPProtocolProperties_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::TCPProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::TCPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2582,10 +2582,10 @@ RTCORBA::TCPProtocolProperties_var::tao_nil (void)
 ::RTCORBA::TCPProtocolProperties_ptr
 RTCORBA::TCPProtocolProperties_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::TCPProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::TCPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2682,15 +2682,15 @@ RTCORBA::TCPProtocolProperties::~TCPProtocolProperties (void)
 
 RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return TCPProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return TCPProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -2778,10 +2778,10 @@ tao_RTCORBA_GIOPProtocolProperties_nil (
 RTCORBA::GIOPProtocolProperties_ptr
 tao_RTCORBA_GIOPProtocolProperties_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::GIOPProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::GIOPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2905,10 +2905,10 @@ RTCORBA::GIOPProtocolProperties_var::tao_nil (void)
 ::RTCORBA::GIOPProtocolProperties_ptr
 RTCORBA::GIOPProtocolProperties_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::GIOPProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::GIOPProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -2990,15 +2990,15 @@ RTCORBA::GIOPProtocolProperties::~GIOPProtocolProperties (void)
 
 RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return GIOPProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return GIOPProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3086,10 +3086,10 @@ tao_RTCORBA_UnixDomainProtocolProperties_nil (
 RTCORBA::UnixDomainProtocolProperties_ptr
 tao_RTCORBA_UnixDomainProtocolProperties_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::UnixDomainProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::UnixDomainProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3213,10 +3213,10 @@ RTCORBA::UnixDomainProtocolProperties_var::tao_nil (void)
 ::RTCORBA::UnixDomainProtocolProperties_ptr
 RTCORBA::UnixDomainProtocolProperties_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::UnixDomainProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::UnixDomainProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3298,15 +3298,15 @@ RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void)
 
 RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return UnixDomainProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return UnixDomainProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3394,10 +3394,10 @@ tao_RTCORBA_SharedMemoryProtocolProperties_nil (
 RTCORBA::SharedMemoryProtocolProperties_ptr
 tao_RTCORBA_SharedMemoryProtocolProperties_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::SharedMemoryProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::SharedMemoryProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3521,10 +3521,10 @@ RTCORBA::SharedMemoryProtocolProperties_var::tao_nil (void)
 ::RTCORBA::SharedMemoryProtocolProperties_ptr
 RTCORBA::SharedMemoryProtocolProperties_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::SharedMemoryProtocolProperties::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::SharedMemoryProtocolProperties::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -3606,15 +3606,15 @@ RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void)
 
 RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return SharedMemoryProtocolProperties::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return SharedMemoryProtocolProperties::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -3993,10 +3993,10 @@ tao_RTCORBA_PriorityBandedConnectionPolicy_nil (
 RTCORBA::PriorityBandedConnectionPolicy_ptr
 tao_RTCORBA_PriorityBandedConnectionPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::PriorityBandedConnectionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::PriorityBandedConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4120,10 +4120,10 @@ RTCORBA::PriorityBandedConnectionPolicy_var::tao_nil (void)
 ::RTCORBA::PriorityBandedConnectionPolicy_ptr
 RTCORBA::PriorityBandedConnectionPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::PriorityBandedConnectionPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::PriorityBandedConnectionPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4205,15 +4205,15 @@ RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void)
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return PriorityBandedConnectionPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return PriorityBandedConnectionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4301,10 +4301,10 @@ tao_RTCORBA_Current_nil (
 RTCORBA::Current_ptr
 tao_RTCORBA_Current_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::Current::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4428,10 +4428,10 @@ RTCORBA::Current_var::tao_nil (void)
 ::RTCORBA::Current_ptr
 RTCORBA::Current_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::Current::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::Current::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4513,15 +4513,15 @@ RTCORBA::Current::~Current (void)
 
 RTCORBA::Current_ptr RTCORBA::Current::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Current::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::Current_ptr RTCORBA::Current::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4609,10 +4609,10 @@ tao_RTCORBA_Mutex_nil (
 RTCORBA::Mutex_ptr
 tao_RTCORBA_Mutex_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::Mutex::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::Mutex::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4736,10 +4736,10 @@ RTCORBA::Mutex_var::tao_nil (void)
 ::RTCORBA::Mutex_ptr
 RTCORBA::Mutex_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::Mutex::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::Mutex::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -4821,15 +4821,15 @@ RTCORBA::Mutex::~Mutex (void)
 
 RTCORBA::Mutex_ptr RTCORBA::Mutex::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return Mutex::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return Mutex::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::Mutex_ptr RTCORBA::Mutex::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -4905,10 +4905,10 @@ tao_RTCORBA_RTORB_nil (
 RTCORBA::RTORB_ptr
 tao_RTCORBA_RTORB_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTCORBA::RTORB::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTCORBA::RTORB::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5032,10 +5032,10 @@ RTCORBA::RTORB_var::tao_nil (void)
 ::RTCORBA::RTORB_ptr
 RTCORBA::RTORB_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTCORBA::RTORB::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTCORBA::RTORB::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -5117,15 +5117,15 @@ RTCORBA::RTORB::~RTORB (void)
 
 RTCORBA::RTORB_ptr RTCORBA::RTORB::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTORB::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return RTORB::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::RTORB_ptr RTCORBA::RTORB::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -5220,7 +5220,7 @@ void RTCORBA::RTORB::MutexNotFound::_raise ()
 
 void RTCORBA::RTORB::MutexNotFound::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5228,7 +5228,7 @@ void RTCORBA::RTORB::MutexNotFound::_tao_encode (
 
 void RTCORBA::RTORB::MutexNotFound::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5288,7 +5288,7 @@ void RTCORBA::RTORB::InvalidThreadpool::_raise ()
 
 void RTCORBA::RTORB::InvalidThreadpool::_tao_encode (
     TAO_OutputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5296,7 +5296,7 @@ void RTCORBA::RTORB::InvalidThreadpool::_tao_encode (
 
 void RTCORBA::RTORB::InvalidThreadpool::_tao_decode (
     TAO_InputCDR &
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
@@ -5347,7 +5347,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::Threadpoo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLane TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLane ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5438,7 +5438,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::Threadpoo
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLanes TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_ThreadpoolLanes ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5501,7 +5501,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, RTCORBA::PriorityModel &
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityModel TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityModel ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5631,7 +5631,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::PriorityB
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBand TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBand ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -5722,7 +5722,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::PriorityB
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBands TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (RTCORBA::_tc_PriorityBands ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index f7ff8be6f89..77c8a3cbd10 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -367,7 +367,7 @@ TAO_NAMESPACE  RTCORBA
     static PriorityModelPolicy_ptr tao_nil (void);
     static PriorityModelPolicy_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -425,12 +425,12 @@ TAO_NAMESPACE  RTCORBA
 
     static PriorityModelPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static PriorityModelPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static PriorityModelPolicy_ptr _nil (void)
@@ -439,14 +439,14 @@ TAO_NAMESPACE  RTCORBA
       }
 
     virtual RTCORBA::PriorityModel priority_model (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual RTCORBA::Priority server_priority (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -512,7 +512,7 @@ TAO_NAMESPACE  RTCORBA
     static ThreadpoolPolicy_ptr tao_nil (void);
     static ThreadpoolPolicy_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -570,12 +570,12 @@ TAO_NAMESPACE  RTCORBA
 
     static ThreadpoolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ThreadpoolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ThreadpoolPolicy_ptr _nil (void)
@@ -584,7 +584,7 @@ TAO_NAMESPACE  RTCORBA
       }
 
     virtual RTCORBA::ThreadpoolId threadpool (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -648,7 +648,7 @@ TAO_NAMESPACE  RTCORBA
     static ProtocolProperties_ptr tao_nil (void);
     static ProtocolProperties_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -707,12 +707,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     static ProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ProtocolProperties_ptr _nil (void)
@@ -1010,7 +1010,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     static ServerProtocolPolicy_ptr tao_nil (void);
     static ServerProtocolPolicy_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1068,12 +1068,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     static ServerProtocolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ServerProtocolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ServerProtocolPolicy_ptr _nil (void)
@@ -1082,7 +1082,7 @@ class TAO_RTCORBA_Export ProtocolProperties
       }
 
     virtual RTCORBA::ProtocolList * protocols (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1148,7 +1148,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     static ClientProtocolPolicy_ptr tao_nil (void);
     static ClientProtocolPolicy_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1206,12 +1206,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     static ClientProtocolPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ClientProtocolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static ClientProtocolPolicy_ptr _nil (void)
@@ -1220,7 +1220,7 @@ class TAO_RTCORBA_Export ProtocolProperties
       }
 
     virtual RTCORBA::ProtocolList * protocols (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1286,7 +1286,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     static PrivateConnectionPolicy_ptr tao_nil (void);
     static PrivateConnectionPolicy_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1344,12 +1344,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     static PrivateConnectionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static PrivateConnectionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static PrivateConnectionPolicy_ptr _nil (void)
@@ -1415,7 +1415,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     static TCPProtocolProperties_ptr tao_nil (void);
     static TCPProtocolProperties_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1473,12 +1473,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     static TCPProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static TCPProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static TCPProtocolProperties_ptr _nil (void)
@@ -1487,7 +1487,7 @@ class TAO_RTCORBA_Export ProtocolProperties
       }
 
     virtual CORBA::Long send_buffer_size (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1495,14 +1495,14 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual void send_buffer_size (
         CORBA::Long send_buffer_size
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Long recv_buffer_size (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1510,14 +1510,14 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual void recv_buffer_size (
         CORBA::Long recv_buffer_size
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Boolean keep_alive (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1525,14 +1525,14 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual void keep_alive (
         CORBA::Boolean keep_alive
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Boolean dont_route (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1540,14 +1540,14 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual void dont_route (
         CORBA::Boolean dont_route
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Boolean no_delay (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1555,7 +1555,7 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual void no_delay (
         CORBA::Boolean no_delay
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1619,7 +1619,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     static GIOPProtocolProperties_ptr tao_nil (void);
     static GIOPProtocolProperties_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1677,12 +1677,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     static GIOPProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static GIOPProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static GIOPProtocolProperties_ptr _nil (void)
@@ -1748,7 +1748,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     static UnixDomainProtocolProperties_ptr tao_nil (void);
     static UnixDomainProtocolProperties_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1806,12 +1806,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     static UnixDomainProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static UnixDomainProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static UnixDomainProtocolProperties_ptr _nil (void)
@@ -1820,7 +1820,7 @@ class TAO_RTCORBA_Export ProtocolProperties
       }
 
     virtual CORBA::Long send_buffer_size (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1828,14 +1828,14 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual void send_buffer_size (
         CORBA::Long send_buffer_size
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::Long recv_buffer_size (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1843,7 +1843,7 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual void recv_buffer_size (
         CORBA::Long recv_buffer_size
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1907,7 +1907,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     static SharedMemoryProtocolProperties_ptr tao_nil (void);
     static SharedMemoryProtocolProperties_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -1965,12 +1965,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     static SharedMemoryProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static SharedMemoryProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static SharedMemoryProtocolProperties_ptr _nil (void)
@@ -1979,7 +1979,7 @@ class TAO_RTCORBA_Export ProtocolProperties
       }
 
     virtual CORBA::Long preallocate_buffer_size (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1987,14 +1987,14 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual void preallocate_buffer_size (
         CORBA::Long preallocate_buffer_size
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual char * mmap_filename (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2002,14 +2002,14 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual void mmap_filename (
         const char * mmap_filename
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual char * mmap_lockname (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2017,7 +2017,7 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual void mmap_lockname (
         const char * mmap_lockname
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2302,7 +2302,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     static PriorityBandedConnectionPolicy_ptr tao_nil (void);
     static PriorityBandedConnectionPolicy_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -2360,12 +2360,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     static PriorityBandedConnectionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static PriorityBandedConnectionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static PriorityBandedConnectionPolicy_ptr _nil (void)
@@ -2374,7 +2374,7 @@ class TAO_RTCORBA_Export ProtocolProperties
       }
 
     virtual RTCORBA::PriorityBands * priority_bands (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2438,7 +2438,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     static Current_ptr tao_nil (void);
     static Current_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -2496,12 +2496,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static Current_ptr _nil (void)
@@ -2510,7 +2510,7 @@ class TAO_RTCORBA_Export ProtocolProperties
       }
 
     virtual RTCORBA::Priority the_priority (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2518,7 +2518,7 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual void the_priority (
         RTCORBA::Priority the_priority
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2582,7 +2582,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     static Mutex_ptr tao_nil (void);
     static Mutex_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -2640,12 +2640,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     static Mutex_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static Mutex_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static Mutex_ptr _nil (void)
@@ -2654,14 +2654,14 @@ class TAO_RTCORBA_Export ProtocolProperties
       }
 
     virtual void lock (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual void unlock (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2669,7 +2669,7 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual CORBA::Boolean try_lock (
         TimeBase::TimeT max_wait
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2733,7 +2733,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     static RTORB_ptr tao_nil (void);
     static RTORB_ptr tao_narrow (
         CORBA::Object *
-        TAO_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL_NOT_USED
       );
     static CORBA::Object * tao_upcast (void *);
 
@@ -2791,12 +2791,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     static RTORB_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static RTORB_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
     static RTORB_ptr _nil (void)
@@ -2805,7 +2805,7 @@ class TAO_RTCORBA_Export ProtocolProperties
       }
 
     virtual RTCORBA::Mutex_ptr create_mutex (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2813,7 +2813,7 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual void destroy_mutex (
         RTCORBA::Mutex_ptr the_mutex
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2842,12 +2842,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static MutexNotFound *_downcast (CORBA::Exception *);
@@ -2863,7 +2863,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     virtual RTCORBA::Mutex_ptr create_named_mutex (
         const char * name,
         CORBA::Boolean_out created_flag
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2871,7 +2871,7 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual RTCORBA::Mutex_ptr open_named_mutex (
         const char * name
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2884,7 +2884,7 @@ class TAO_RTCORBA_Export ProtocolProperties
         CORBA::Boolean keep_alive,
         CORBA::Boolean dont_route,
         CORBA::Boolean no_delay
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2913,12 +2913,12 @@ class TAO_RTCORBA_Export ProtocolProperties
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         ) const;
 
       virtual void _tao_decode (
           TAO_InputCDR &
-          TAO_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL_NOT_USED
         );
 
       static InvalidThreadpool *_narrow (CORBA::Exception *);
@@ -2939,7 +2939,7 @@ class TAO_RTCORBA_Export ProtocolProperties
         CORBA::Boolean allow_request_buffering,
         CORBA::ULong max_buffered_requests,
         CORBA::ULong max_request_buffer_size
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2952,7 +2952,7 @@ class TAO_RTCORBA_Export ProtocolProperties
         CORBA::Boolean allow_request_buffering,
         CORBA::ULong max_buffered_requests,
         CORBA::ULong max_request_buffer_size
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2960,7 +2960,7 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual void destroy_threadpool (
         RTCORBA::ThreadpoolId threadpool
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -2970,7 +2970,7 @@ class TAO_RTCORBA_Export ProtocolProperties
     virtual RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy (
         RTCORBA::PriorityModel priority_model,
         RTCORBA::Priority server_priority
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2978,7 +2978,7 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy (
         RTCORBA::ThreadpoolId threadpool
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2986,7 +2986,7 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (
         const RTCORBA::PriorityBands & priority_bands
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -2994,7 +2994,7 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (
         const RTCORBA::ProtocolList & protocols
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -3002,14 +3002,14 @@ class TAO_RTCORBA_Export ProtocolProperties
 
     virtual RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (
         const RTCORBA::ProtocolList & protocols
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/RTCORBA/RT_Current.cpp b/TAO/tao/RTCORBA/RT_Current.cpp
index f49b60d835a..006e3847de7 100644
--- a/TAO/tao/RTCORBA/RT_Current.cpp
+++ b/TAO/tao/RTCORBA/RT_Current.cpp
@@ -28,16 +28,16 @@ TAO_RT_Current::~TAO_RT_Current (void)
 }
 
 RTCORBA::Priority
-TAO_RT_Current::the_priority (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_Current::the_priority (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::Priority priority;
 
-  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   int result = tph->get_thread_CORBA_priority (priority
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result == -1)
@@ -48,15 +48,15 @@ TAO_RT_Current::the_priority (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 TAO_RT_Current::the_priority (RTCORBA::Priority the_priority
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   int result = tph->set_thread_CORBA_priority (the_priority
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (result == -1)
diff --git a/TAO/tao/RTCORBA/RT_Current.h b/TAO/tao/RTCORBA/RT_Current.h
index 074c77428da..464a679b49c 100644
--- a/TAO/tao/RTCORBA/RT_Current.h
+++ b/TAO/tao/RTCORBA/RT_Current.h
@@ -50,11 +50,11 @@ public:
   /// Default constructor.
   TAO_RT_Current (TAO_ORB_Core *orb_core);
 
-  virtual RTCORBA::Priority the_priority (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual RTCORBA::Priority the_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void the_priority (RTCORBA::Priority the_priority
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
index 515421473a5..494c432ae3e 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
@@ -43,7 +43,7 @@ RT_Endpoint_Selector_Factory::~RT_Endpoint_Selector_Factory (void)
 
 TAO_Invocation_Endpoint_Selector *
 RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
 {
   // Initialize selection state with all RTCORBA policies affecting
   // endpoint selection.
@@ -64,17 +64,17 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation
     }
 
   CORBA::Policy_var priority_model_policy =
-    rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+    rt_stub->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   //  state.private_connection_ =
   //   rt_stub->private_connection ();
 
   CORBA::Policy_var client_protocol_policy =
-    TAO_RT_Endpoint_Utils::client_protocol_policy (invocation TAO_ENV_ARG_PARAMETER);
+    TAO_RT_Endpoint_Utils::client_protocol_policy (invocation ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Policy_var bands_policy = TAO_RT_Endpoint_Utils::priority_bands_policy (invocation TAO_ENV_ARG_PARAMETER);
+  CORBA::Policy_var bands_policy = TAO_RT_Endpoint_Utils::priority_bands_policy (invocation ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   //
@@ -106,7 +106,7 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation
   CORBA::Short server_priority = 0;
   CORBA::Boolean is_client_propagated = 0;
 
-  TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   tph->get_selector_hook (priority_model_policy.in (),
@@ -145,7 +145,7 @@ RT_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation *invocation
 void
 RT_Endpoint_Selector_Factory::
 init_client_protocol (TAO_GIOP_Invocation *
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RT_Endpoint_Selector_Factory:init_client_protocol - Is deprecated!")));
   /*
@@ -155,7 +155,7 @@ init_client_protocol (TAO_GIOP_Invocation *
   ACE_TRY
     {
       invocation->endpoint_selection_state_.client_protocol_policy_ =
-        rt_stub->effective_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER);
+        rt_stub->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::INV_POLICY, ex)
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
index 1efa78fc1d7..d0d36a772c4 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
@@ -65,7 +65,7 @@ public:
   /// initialize the endpoint selection state instance.
   virtual TAO_Invocation_Endpoint_Selector *get_selector (
                              TAO_GIOP_Invocation *invocation
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
 protected:
 
@@ -74,12 +74,12 @@ protected:
   /// Initializes RTCORBA::ClientProtocolPolicy in the endpoint
   /// selection state.
   void init_client_protocol (TAO_GIOP_Invocation *invocation
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /// Initializes RTCORBA::PriorityBandsPolicy in the endpoint
   /// selection state.
   //  void init_bands (TAO_GIOP_Invocation *invocation,
-  //                 TAO_ENV_SINGLE_ARG_DECL);
+  //                 ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The possible endpoint selector strategies that can be
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
index a40e7fa42b6..0bebf0d6146 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
@@ -11,7 +11,7 @@ ACE_RCSID(tao, RT_Endpoint_Utils, "$Id$")
 
 CORBA::Policy *
 TAO_RT_Endpoint_Utils::priority_bands_policy (TAO_GIOP_Invocation *invocation
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
 {
   CORBA::Policy *bands_policy = CORBA::Policy::_nil ();
   TAO_RT_Stub *rt_stub =
@@ -20,7 +20,7 @@ TAO_RT_Endpoint_Utils::priority_bands_policy (TAO_GIOP_Invocation *invocation
   ACE_TRY
     {
       bands_policy =
-        rt_stub->effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
+        rt_stub->effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::INV_POLICY, ex)
@@ -41,7 +41,7 @@ TAO_RT_Endpoint_Utils::priority_bands_policy (TAO_GIOP_Invocation *invocation
 
 CORBA::Policy *
 TAO_RT_Endpoint_Utils::client_protocol_policy (TAO_GIOP_Invocation *invocation
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
 {
   TAO_RT_Stub *rt_stub =
     ACE_dynamic_cast (TAO_RT_Stub *, invocation->stub ());
@@ -49,7 +49,7 @@ TAO_RT_Endpoint_Utils::client_protocol_policy (TAO_GIOP_Invocation *invocation
   CORBA::Policy *retval = 0;
   ACE_TRY
     {
-      retval = rt_stub->effective_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER);
+      retval = rt_stub->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::INV_POLICY, ex)
diff --git a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
index 26f39e1d7d8..6f3cf0d5c87 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
@@ -37,10 +37,10 @@ class TAO_RTCORBA_Export TAO_RT_Endpoint_Utils
 {
 public:
   static CORBA::Policy *priority_bands_policy (TAO_GIOP_Invocation *invocation
-                                               TAO_ENV_ARG_DECL);
+                                               ACE_ENV_ARG_DECL);
 
   static CORBA::Policy *client_protocol_policy (TAO_GIOP_Invocation *invocation
-                                                TAO_ENV_ARG_DECL);
+                                                ACE_ENV_ARG_DECL);
 
 private:
   /// ctor.
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
index 707bc3fe74e..34a3236e2d8 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -24,7 +24,7 @@ ACE_RCSID(tao, RT_Invocation_Endpoint_Selectors, "$Id$")
 
 void
 TAO_RT_Default_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation
-                                                   TAO_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL)
 {
   TAO_RT_Stub *rt_stub =
     ACE_dynamic_cast (TAO_RT_Stub *,
@@ -44,14 +44,14 @@ TAO_RT_Default_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocati
               TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (),
                                                              ACE_reinterpret_cast (long, invocation->stub ()));
 
-              status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER);
+              status = invocation->perform_call (private_desc ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
           else
             {
               TAO_Base_Transport_Property default_desc (invocation->endpoint ());
 
-              status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER);
+              status = invocation->perform_call (default_desc ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
 
@@ -76,18 +76,18 @@ TAO_Priority_Endpoint_Selector::~TAO_Priority_Endpoint_Selector (void)
 
 void
 TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation
-                                                 TAO_ENV_ARG_DECL)
+                                                 ACE_ENV_ARG_DECL)
 {
   TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *,
                                            invocation->stub ());
   CORBA::Short client_priority;
 
   // Get client priority.
-  TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Protocols_Hooks *tph = invocation->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (tph->get_thread_CORBA_priority (client_priority
-                                      TAO_ENV_ARG_PARAMETER)
+                                      ACE_ENV_ARG_PARAMETER)
       == -1)
     ACE_THROW (CORBA::DATA_CONVERSION (1,
                CORBA::COMPLETED_NO));
@@ -158,7 +158,7 @@ TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation
                 {
                   if (invocation->inconsistent_policies ().ptr ())
                     {
-                      CORBA::Policy_var priority_model_policy = rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+                      CORBA::Policy_var priority_model_policy = rt_stub->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
                       ACE_CHECK;
 
                       invocation->inconsistent_policies ()->length (1);
@@ -177,14 +177,14 @@ TAO_Priority_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation
           TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (),
                                                          ACE_reinterpret_cast (long, invocation->stub ()));
 
-          status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER);
+          status = invocation->perform_call (private_desc ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
         {
           TAO_Base_Transport_Property default_desc (invocation->endpoint ());
 
-          status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER);
+          status = invocation->perform_call (default_desc ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -223,21 +223,21 @@ TAO_Bands_Endpoint_Selector::~TAO_Bands_Endpoint_Selector (void)
 
 void
 TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
 {
   TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *,
                                            invocation->stub ());
   TAO_Protocols_Hooks *protocol_hooks =
-    invocation->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
+    invocation->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Policy_var bands_policy = TAO_RT_Endpoint_Utils::priority_bands_policy (invocation
-                                                                              TAO_ENV_ARG_PARAMETER);
+                                                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Figure out target priority.
   CORBA::Policy_var priority_model_policy =
-    rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+    rt_stub->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Short server_priority = 0;
@@ -255,7 +255,7 @@ TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation
 
       int status =
         protocol_hooks->get_thread_CORBA_priority (p  // side effect
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       if (status == -1)
         {
@@ -366,14 +366,14 @@ TAO_Bands_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation *invocation
           TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (),
                                                          ACE_reinterpret_cast (long, invocation->stub ()));
 
-          status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER);
+          status = invocation->perform_call (private_desc ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
         {
           TAO_Base_Transport_Property default_desc (invocation->endpoint ());
 
-          status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER);
+          status = invocation->perform_call (default_desc ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -400,15 +400,15 @@ TAO_Protocol_Endpoint_Selector::~TAO_Protocol_Endpoint_Selector (void)
 void
 TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation
                                                  *invocation
-                                                 TAO_ENV_ARG_DECL)
+                                                 ACE_ENV_ARG_DECL)
 {
   /// Narrow down to the right policy.
   CORBA::Policy_var cp =
-    TAO_RT_Endpoint_Utils::client_protocol_policy (invocation TAO_ENV_ARG_PARAMETER);
+    TAO_RT_Endpoint_Utils::client_protocol_policy (invocation ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTCORBA::ClientProtocolPolicy_var cp_policy =
-    RTCORBA::ClientProtocolPolicy::_narrow (cp.in () TAO_ENV_ARG_PARAMETER);
+    RTCORBA::ClientProtocolPolicy::_narrow (cp.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   /// Cast to TAO_ClientProtocolPolicy
@@ -454,14 +454,14 @@ TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation
                   TAO_Private_Transport_Descriptor private_desc (invocation->endpoint (),
                                                                  ACE_reinterpret_cast (long, invocation->stub ()));
 
-                  status = invocation->perform_call (private_desc TAO_ENV_ARG_PARAMETER);
+                  status = invocation->perform_call (private_desc ACE_ENV_ARG_PARAMETER);
                   ACE_CHECK;
                 }
               else
                 {
                   TAO_Base_Transport_Property default_desc (invocation->endpoint ());
 
-                  status = invocation->perform_call (default_desc TAO_ENV_ARG_PARAMETER);
+                  status = invocation->perform_call (default_desc ACE_ENV_ARG_PARAMETER);
                   ACE_CHECK;
                 }
 
@@ -498,7 +498,7 @@ TAO_Protocol_Endpoint_Selector::select_endpoint (TAO_GIOP_Invocation
 void
 TAO_Protocol_Endpoint_Selector::next (TAO_GIOP_Invocation
                                      *
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("You Are not Suppesed to call: TAO_Protocol_Endpoint_Selector::next!!!\n")));
   //  invocation->profile_index ()++;
@@ -510,7 +510,7 @@ void
 TAO_Protocol_Endpoint_Selector::forward (TAO_GIOP_Invocation
                                         *invocation,
                                          const TAO_MProfile& /* mprofile */
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   // Location forwarding is currently not supported when using
   // RTCORBA::ClientProtocolPolicy.  With the current profile
@@ -522,7 +522,7 @@ TAO_Protocol_Endpoint_Selector::forward (TAO_GIOP_Invocation
   // a location forward reply, we act as if the profile we used
   // didn't work, and we try the next one.  Should we throw not
   // supported exception instead?
-  this->next (invocation TAO_ENV_ARG_PARAMETER);
+  this->next (invocation ACE_ENV_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
index af531a3c749..9b1d43a673f 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
@@ -43,7 +43,7 @@ class TAO_RTCORBA_Export TAO_RT_Default_Endpoint_Selector :
 {
 public:
   virtual void select_endpoint (TAO_GIOP_Invocation *invocation
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 };
 
 // ****************************************************************
@@ -68,7 +68,7 @@ public:
   virtual ~TAO_Priority_Endpoint_Selector (void);
 
   virtual void select_endpoint (TAO_GIOP_Invocation *invocation
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 private:
   /// Helper for <select_endpoint>.
   int is_multihomed (TAO_Endpoint *endpoint);
@@ -96,7 +96,7 @@ public:
   virtual ~TAO_Bands_Endpoint_Selector (void);
 
   virtual void select_endpoint (TAO_GIOP_Invocation *invocation
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 };
 
 // ****************************************************************
@@ -122,12 +122,12 @@ public:
   virtual ~TAO_Protocol_Endpoint_Selector (void);
 
   virtual void select_endpoint (TAO_GIOP_Invocation *invocation
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
   virtual void next (TAO_GIOP_Invocation *invocation
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
   virtual void forward (TAO_GIOP_Invocation *invocation,
                         const TAO_MProfile &mprofile
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   virtual void success (TAO_GIOP_Invocation *invocation);
   virtual void close_connection (TAO_GIOP_Invocation *invocation);
 };
diff --git a/TAO/tao/RTCORBA/RT_Mutex.cpp b/TAO/tao/RTCORBA/RT_Mutex.cpp
index 48c3e5c36d4..8470e3bf6f8 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ b/TAO/tao/RTCORBA/RT_Mutex.cpp
@@ -13,7 +13,7 @@ TAO_RT_Mutex::~TAO_RT_Mutex (void)
 }
 
 void
-TAO_RT_Mutex::lock (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_Mutex::lock (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->mu_.acquire () != 0)
@@ -21,7 +21,7 @@ TAO_RT_Mutex::lock (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_RT_Mutex::unlock (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_Mutex::unlock (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->mu_.release () != 0)
@@ -30,7 +30,7 @@ TAO_RT_Mutex::unlock (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Boolean
 TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int result;
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index e045ad430a6..bc5e5cb1ab9 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -56,11 +56,11 @@ public:
   virtual ~TAO_RT_Mutex (void);
 
   /// Acquire the lock.
-  virtual void lock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void lock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Release the lock.
-  virtual void unlock (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void unlock (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -70,7 +70,7 @@ public:
    * using this operation in your program designs.
    */
   virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the name of the mutex.
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index 410cdedadfd..d3ca63fd5fb 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -34,41 +34,41 @@ TAO_RT_ORB::~TAO_RT_ORB (void)
 }
 
 RTCORBA::Mutex_ptr
-TAO_RT_ORB::create_mutex (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_ORB::create_mutex (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->mutex_mgr_.create_mutex (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->mutex_mgr_.create_mutex (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
 TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->mutex_mgr_.destroy_mutex (mutex
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 
 RTCORBA::Mutex_ptr
 TAO_RT_ORB::create_named_mutex (const char *name,
                                 CORBA::Boolean_out created_flag
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->mutex_mgr_.create_named_mutex (name,
                                               created_flag
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::Mutex_ptr
 TAO_RT_ORB::open_named_mutex (const char *name
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::MutexNotFound))
 {
   return this->mutex_mgr_.open_named_mutex (name
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -82,7 +82,7 @@ TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void)
 }
 
 RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::create_mutex (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Named_RT_Mutex_Manager::create_mutex (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RT_Mutex *mutex = 0;
@@ -103,7 +103,7 @@ TAO_Named_RT_Mutex_Manager::create_mutex (TAO_ENV_SINGLE_ARG_DECL)
 #if (TAO_HAS_NAMED_RT_MUTEXES == 1)
 void
 TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_RT_Mutex *tao_mutex =
@@ -132,7 +132,7 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex
 #else /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 void
 TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -141,7 +141,7 @@ TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr
 RTCORBA::Mutex_ptr
 TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
                                                 CORBA::Boolean_out created_flag
-                                                TAO_ENV_ARG_DECL)
+                                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 #if (TAO_HAS_NAMED_RT_MUTEXES == 1)
@@ -199,7 +199,7 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
 
 RTCORBA::Mutex_ptr
 TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::MutexNotFound))
 {
@@ -235,7 +235,7 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size,
                                             CORBA::Boolean keep_alive,
                                             CORBA::Boolean dont_route,
                                             CORBA::Boolean no_delay
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException ))
 {
   TAO_TCP_Properties *tmp;
@@ -260,7 +260,7 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
                                CORBA::Boolean allow_request_buffering,
                                CORBA::ULong max_buffered_requests,
                                CORBA::ULong max_request_buffer_size
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->tp_manager_->create_threadpool (stacksize,
@@ -270,7 +270,7 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
                                                allow_request_buffering,
                                                max_buffered_requests,
                                                max_request_buffer_size
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ThreadpoolId
@@ -280,7 +280,7 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                           CORBA::Boolean allow_request_buffering,
                                           CORBA::ULong max_buffered_requests,
                                           CORBA::ULong max_request_buffer_size
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->tp_manager_->create_threadpool_with_lanes (stacksize,
@@ -289,23 +289,23 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                           allow_request_buffering,
                                                           max_buffered_requests,
                                                           max_request_buffer_size
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_RT_ORB::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::InvalidThreadpool))
 {
   this->tp_manager_->destroy_threadpool (threadpool
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::PriorityModelPolicy_ptr
 TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model,
                                           RTCORBA::Priority server_priority
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityModelPolicy *tmp;
@@ -320,7 +320,7 @@ TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model,
 
 RTCORBA::ThreadpoolPolicy_ptr
 TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ThreadpoolPolicy *tmp;
@@ -336,7 +336,7 @@ TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
 RTCORBA::PriorityBandedConnectionPolicy_ptr
 TAO_RT_ORB::create_priority_banded_connection_policy (const
                                                       RTCORBA::PriorityBands & priority_bands
-                                                      TAO_ENV_ARG_DECL)
+                                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityBandedConnectionPolicy *tmp;
@@ -350,7 +350,7 @@ TAO_RT_ORB::create_priority_banded_connection_policy (const
 }
 
 RTCORBA::PrivateConnectionPolicy_ptr
-TAO_RT_ORB::create_private_connection_policy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_ORB::create_private_connection_policy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PrivateConnectionPolicy *tmp;
@@ -365,7 +365,7 @@ TAO_RT_ORB::create_private_connection_policy (TAO_ENV_SINGLE_ARG_DECL)
 
 RTCORBA::ServerProtocolPolicy_ptr
 TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ServerProtocolPolicy *tmp;
@@ -380,7 +380,7 @@ TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protoco
 
 RTCORBA::ClientProtocolPolicy_ptr
 TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ClientProtocolPolicy *tmp;
diff --git a/TAO/tao/RTCORBA/RT_ORB.h b/TAO/tao/RTCORBA/RT_ORB.h
index c9f7ddd89ab..fee075c7569 100644
--- a/TAO/tao/RTCORBA/RT_ORB.h
+++ b/TAO/tao/RTCORBA/RT_ORB.h
@@ -54,20 +54,20 @@ public:
   /// Destructor.
   ~TAO_Named_RT_Mutex_Manager (void);
 
-  RTCORBA::Mutex_ptr create_mutex (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  RTCORBA::Mutex_ptr create_mutex (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void destroy_mutex (RTCORBA::Mutex_ptr the_mutex
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RTCORBA::Mutex_ptr create_named_mutex (const char *name,
                                          CORBA::Boolean_out created_flag
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RTCORBA::Mutex_ptr open_named_mutex (const char * name
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTCORBA::RTORB::MutexNotFound
                      ));
@@ -110,7 +110,7 @@ public:
    * consistant priority inheritance/piority ceiling semantics
    * can be guaranteed.
    */
-  virtual RTCORBA::Mutex_ptr create_mutex (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual RTCORBA::Mutex_ptr create_mutex (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -119,7 +119,7 @@ public:
    * 0.
    */
   virtual void destroy_mutex (RTCORBA::Mutex_ptr the_mutex
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -129,12 +129,12 @@ public:
    */
   virtual RTCORBA::Mutex_ptr create_named_mutex (const char *name,
                                                  CORBA::Boolean_out created_flag
-                                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Retrieve a previously created mutex.
   virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name
-                                                TAO_ENV_ARG_DECL_WITH_DEFAULTS )
+                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS )
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RTCORBA::RTORB::MutexNotFound
                       ));
@@ -150,7 +150,7 @@ public:
                                   CORBA::Boolean keep_alive,
                                   CORBA::Boolean dont_route,
                                   CORBA::Boolean no_delay
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException ));
 
   /// Create a RTCORBA threadpool to manage a set of threads without lanes.
@@ -162,7 +162,7 @@ public:
                      CORBA::Boolean allow_request_buffering,
                      CORBA::ULong max_buffered_requests,
                      CORBA::ULong max_request_buffer_size
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -176,12 +176,12 @@ public:
                                 CORBA::Boolean allow_request_buffering,
                                 CORBA::ULong max_buffered_requests,
                                 CORBA::ULong max_request_buffer_size
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Free the resources associated with the specified threadpool.
   virtual void destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTCORBA::RTORB::InvalidThreadpool));
 
@@ -190,13 +190,13 @@ public:
   create_priority_model_policy (
                                 RTCORBA::PriorityModel priority_model,
                                 RTCORBA::Priority server_priority
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Create a ThreadpoolPolicy instance for POA creation
   virtual RTCORBA::ThreadpoolPolicy_ptr
   create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -206,7 +206,7 @@ public:
   virtual RTCORBA::PriorityBandedConnectionPolicy_ptr
   create_priority_banded_connection_policy (const RTCORBA::PriorityBands &
                                             priority_bands
-                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -215,7 +215,7 @@ public:
    * to the server.
    */
   virtual RTCORBA::PrivateConnectionPolicy_ptr
-  create_private_connection_policy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  create_private_connection_policy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -224,7 +224,7 @@ public:
    */
   virtual RTCORBA::ServerProtocolPolicy_ptr
   create_server_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -233,7 +233,7 @@ public:
    */
   virtual RTCORBA::ClientProtocolPolicy_ptr
   create_client_protocol_policy (const RTCORBA::ProtocolList & protocols
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the Thread Pool Manager.
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index 72112c0bfba..02660a31634 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -44,7 +44,7 @@ TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type,
 void
 TAO_RT_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //
@@ -121,7 +121,7 @@ TAO_RT_ORBInitializer::pre_init (
 
   info->register_initial_reference ("PriorityMappingManager",
                                     manager
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ This is busted.  TAO_ORBInitInfo should do proper reference
@@ -129,7 +129,7 @@ TAO_RT_ORBInitializer::pre_init (
   // Narrow to a TAO_ORBInitInfo object to get access to the
   // orb_core() TAO extension.
   TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (tao_info.in ()))
@@ -158,7 +158,7 @@ TAO_RT_ORBInitializer::pre_init (
 
   info->register_initial_reference (TAO_OBJID_RTORB,
                                     rt_orb
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the RT_Current.
@@ -175,7 +175,7 @@ TAO_RT_ORBInitializer::pre_init (
 
   info->register_initial_reference (TAO_OBJID_RTCURRENT,
                                     current
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   tao_info->orb_core ()->orb_params ()->scope_policy (this->scope_policy_);
@@ -185,11 +185,11 @@ TAO_RT_ORBInitializer::pre_init (
 void
 TAO_RT_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->register_policy_factories (info
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 }
@@ -197,7 +197,7 @@ TAO_RT_ORBInitializer::post_init (
 void
 TAO_RT_ORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
   // Register the RTCORBA policy factories.
 
@@ -213,18 +213,18 @@ TAO_RT_ORBInitializer::register_policy_factories (
   CORBA::PolicyType type = RTCORBA::PRIORITY_MODEL_POLICY_TYPE;
   info->register_policy_factory (type,
                                  policy_factory
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
   info->register_policy_factory (type,
                                  policy_factory
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE;
   info->register_policy_factory (type,
                                  policy_factory
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index b36cd5f78a0..344edd06fa9 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -55,11 +55,11 @@ public:
                          long scope_policy);
 
   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));
 
 private:
@@ -67,7 +67,7 @@ private:
   /// Register RTCORBA policy factories.
   void register_policy_factories (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index 3a0b8f2a0a3..cbf84917ad9 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -137,7 +137,7 @@ TAO_RT_ORB_Loader::init (int argc,
       orb_initializer = temp_orb_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
index 03055fd71e9..a312808d23a 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
@@ -13,7 +13,7 @@ CORBA::Policy_ptr
 TAO_RT_PolicyFactory::create_policy (
     CORBA::PolicyType type,
     const CORBA::Any &
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    CORBA::PolicyError))
 {
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.h b/TAO/tao/RTCORBA/RT_PolicyFactory.h
index ef5adece152..ba25cc18c1e 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.h
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.h
@@ -45,7 +45,7 @@ public:
 
   virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                            const CORBA::Any &value
-                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
 
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index 807c128cd02..d0104fcfb73 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -36,28 +36,28 @@ TAO_PriorityModelPolicy::~TAO_PriorityModelPolicy (void)
 }
 
 RTCORBA::PriorityModel
-TAO_PriorityModelPolicy::priority_model (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PriorityModelPolicy::priority_model (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->priority_model_;
 }
 
 RTCORBA::Priority
-TAO_PriorityModelPolicy::server_priority (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PriorityModelPolicy::server_priority (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->server_priority_;
 }
 
 CORBA::PolicyType
-TAO_PriorityModelPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PriorityModelPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::PRIORITY_MODEL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PriorityModelPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PriorityModelPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityModelPolicy* tmp;
@@ -70,7 +70,7 @@ TAO_PriorityModelPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
   return tmp;
 }
 
-void TAO_PriorityModelPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+void TAO_PriorityModelPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -135,21 +135,21 @@ TAO_ThreadpoolPolicy::~TAO_ThreadpoolPolicy (void)
 }
 
 RTCORBA::ThreadpoolId
-TAO_ThreadpoolPolicy::threadpool (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ThreadpoolPolicy::threadpool (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->id_;
 }
 
 CORBA::PolicyType
-TAO_ThreadpoolPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ThreadpoolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::THREADPOOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ThreadpoolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ThreadpoolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ThreadpoolPolicy* tmp;
@@ -162,7 +162,7 @@ TAO_ThreadpoolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
   return tmp;
 }
 
-void TAO_ThreadpoolPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+void TAO_ThreadpoolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -198,14 +198,14 @@ TAO_PrivateConnectionPolicy::~TAO_PrivateConnectionPolicy (void)
 }
 
 CORBA::PolicyType
-TAO_PrivateConnectionPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrivateConnectionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::PRIVATE_CONNECTION_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PrivateConnectionPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PrivateConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PrivateConnectionPolicy* tmp;
@@ -219,7 +219,7 @@ TAO_PrivateConnectionPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_PrivateConnectionPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PrivateConnectionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -253,7 +253,7 @@ TAO_PriorityBandedConnectionPolicy::~TAO_PriorityBandedConnectionPolicy (void)
 
 RTCORBA::PriorityBands *
 TAO_PriorityBandedConnectionPolicy::priority_bands (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::PriorityBands *tmp;
@@ -267,14 +267,14 @@ TAO_PriorityBandedConnectionPolicy::priority_bands (
 }
 
 CORBA::PolicyType
-TAO_PriorityBandedConnectionPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_PriorityBandedConnectionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_PriorityBandedConnectionPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_PriorityBandedConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_PriorityBandedConnectionPolicy *tmp;
@@ -287,7 +287,7 @@ TAO_PriorityBandedConnectionPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
   return tmp;
 }
 
-void TAO_PriorityBandedConnectionPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+void TAO_PriorityBandedConnectionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -345,7 +345,7 @@ TAO_TCP_Properties::~TAO_TCP_Properties (void)
 }
 
 CORBA::Long
-TAO_TCP_Properties::send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
@@ -353,14 +353,14 @@ TAO_TCP_Properties::send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_TCP_Properties::send_buffer_size (CORBA::Long send_buffer_size
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
-TAO_TCP_Properties::recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
@@ -368,14 +368,14 @@ TAO_TCP_Properties::recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_TCP_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
 }
 
 CORBA::Boolean
-TAO_TCP_Properties::keep_alive (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Properties::keep_alive (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->keep_alive_;
@@ -383,14 +383,14 @@ TAO_TCP_Properties::keep_alive (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_TCP_Properties::keep_alive (CORBA::Boolean keep_alive
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->keep_alive_ = keep_alive;
 }
 
 CORBA::Boolean
-TAO_TCP_Properties::dont_route (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_TCP_Properties::dont_route (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->dont_route_;
@@ -398,13 +398,13 @@ TAO_TCP_Properties::dont_route (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_TCP_Properties::dont_route (CORBA::Boolean dont_route
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->dont_route_ = dont_route;
 }
 
-CORBA::Boolean TAO_TCP_Properties::no_delay (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+CORBA::Boolean TAO_TCP_Properties::no_delay (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->no_delay_;
@@ -412,7 +412,7 @@ CORBA::Boolean TAO_TCP_Properties::no_delay (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_TCP_Properties::no_delay (CORBA::Boolean no_delay
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->no_delay_ = no_delay;
@@ -464,7 +464,7 @@ TAO_Unix_Domain_Properties::~TAO_Unix_Domain_Properties (void)
 }
 
 CORBA::Long
-TAO_Unix_Domain_Properties::send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Unix_Domain_Properties::send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->send_buffer_size_;
@@ -472,14 +472,14 @@ TAO_Unix_Domain_Properties::send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_Unix_Domain_Properties::send_buffer_size (CORBA::Long send_buffer_size
-                                              TAO_ENV_ARG_DECL_NOT_USED)
+                                              ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->send_buffer_size_ = send_buffer_size;
 }
 
 CORBA::Long
-TAO_Unix_Domain_Properties::recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Unix_Domain_Properties::recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->recv_buffer_size_;
@@ -487,7 +487,7 @@ TAO_Unix_Domain_Properties::recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_Unix_Domain_Properties::recv_buffer_size (CORBA::Long recv_buffer_size
-                                              TAO_ENV_ARG_DECL_NOT_USED)
+                                              ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->recv_buffer_size_ = recv_buffer_size;
@@ -523,7 +523,7 @@ TAO_SMEM_Properties::~TAO_SMEM_Properties (void)
 
 
 CORBA::Long
-TAO_SMEM_Properties::preallocate_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SMEM_Properties::preallocate_buffer_size (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->preallocate_buffer_size_;
@@ -531,14 +531,14 @@ TAO_SMEM_Properties::preallocate_buffer_size (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_SMEM_Properties::preallocate_buffer_size (CORBA::Long preallocate_buffer_size
-                                              TAO_ENV_ARG_DECL_NOT_USED)
+                                              ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->preallocate_buffer_size_ = preallocate_buffer_size;
 }
 
 char *
-TAO_SMEM_Properties::mmap_filename (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SMEM_Properties::mmap_filename (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->mmap_filename_.rep ();
@@ -546,14 +546,14 @@ TAO_SMEM_Properties::mmap_filename (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_SMEM_Properties::mmap_filename (const char * mmap_filename
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->mmap_filename_.set (mmap_filename);
 }
 
 char *
-TAO_SMEM_Properties::mmap_lockname (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SMEM_Properties::mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->mmap_lockname_.rep ();
@@ -561,7 +561,7 @@ TAO_SMEM_Properties::mmap_lockname (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_SMEM_Properties::mmap_lockname (const char * mmap_lockname
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->mmap_lockname_.set (mmap_lockname);
@@ -609,7 +609,7 @@ TAO_ServerProtocolPolicy::~TAO_ServerProtocolPolicy (void)
 }
 
 RTCORBA::ProtocolList *
-TAO_ServerProtocolPolicy::protocols (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::ProtocolList *tmp;
@@ -623,14 +623,14 @@ TAO_ServerProtocolPolicy::protocols (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::PolicyType
-TAO_ServerProtocolPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServerProtocolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::SERVER_PROTOCOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ServerProtocolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ServerProtocolPolicy* tmp;
@@ -644,7 +644,7 @@ TAO_ServerProtocolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_ServerProtocolPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServerProtocolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -664,7 +664,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
   CORBA::Policy_var policy =
     orb_core->get_cached_policy (TAO_CACHED_POLICY_RT_SERVER_PROTOCOL);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       RTCORBA::ServerProtocolPolicy_var server_protocols_policy;
@@ -674,7 +674,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
         {
           server_protocols_policy =
             RTCORBA::ServerProtocolPolicy::_narrow (policy.in ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           server_protocols =
@@ -694,7 +694,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                       properties =
                         RTCORBA::ProtocolProperties::_narrow (
                           protocols[j].transport_protocol_properties.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
 
                       if (ACE_OS::strcmp (protocol_type,
@@ -706,7 +706,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                       properties =
                         RTCORBA::ProtocolProperties::_narrow (
                           protocols[j].transport_protocol_properties.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
 
                         if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
@@ -727,7 +727,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
             {
               server_protocols_policy =
                 RTCORBA::ServerProtocolPolicy::_narrow (policy.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               server_protocols =
@@ -747,7 +747,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                           properties =
                             RTCORBA::ProtocolProperties::_narrow (
                               protocols[j].transport_protocol_properties.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK;
 
                           if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
@@ -759,7 +759,7 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                           properties =
                             RTCORBA::ProtocolProperties::_narrow (
                               protocols[j].transport_protocol_properties.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK;
 
                           if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
@@ -774,16 +774,16 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
         {
           RTCORBA::TCPProtocolProperties_var tcp_properties =
             RTCORBA::TCPProtocolProperties::_narrow (properties.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           send_buffer_size =
-            tcp_properties->send_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
+            tcp_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           recv_buffer_size =
-            tcp_properties->recv_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
+            tcp_properties->recv_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          no_delay = tcp_properties->no_delay (TAO_ENV_SINGLE_ARG_PARAMETER);
+          no_delay = tcp_properties->no_delay (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -791,17 +791,17 @@ TAO_ServerProtocolPolicy::hook (TAO_ORB_Core *orb_core,
         {
           RTCORBA::UnixDomainProtocolProperties_var uiop_properties =
             RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in ()
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (uiop_properties.in ()))
             {
               // Extract and locally store properties of interest.
               send_buffer_size =
-                uiop_properties->send_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
+                uiop_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
               recv_buffer_size =
-                uiop_properties->recv_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
+                uiop_properties->recv_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -854,7 +854,7 @@ TAO_ClientProtocolPolicy::~TAO_ClientProtocolPolicy ()
 }
 
 RTCORBA::ProtocolList *
-TAO_ClientProtocolPolicy::protocols (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::ProtocolList *tmp;
@@ -868,14 +868,14 @@ TAO_ClientProtocolPolicy::protocols (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::PolicyType
-TAO_ClientProtocolPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ClientProtocolPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE;
 }
 
 CORBA::Policy_ptr
-TAO_ClientProtocolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ClientProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ClientProtocolPolicy* tmp;
@@ -889,7 +889,7 @@ TAO_ClientProtocolPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_ClientProtocolPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ClientProtocolPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -908,7 +908,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
   CORBA::Policy_var policy =
     orb_core->policy_manager ()->get_cached_policy (TAO_CACHED_POLICY_RT_CLIENT_PROTOCOL);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       RTCORBA::ClientProtocolPolicy_var client_protocols_policy;
@@ -918,7 +918,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
         {
           client_protocols_policy =
             RTCORBA::ClientProtocolPolicy::_narrow (policy.in ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           client_protocols =
@@ -938,7 +938,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                       properties =
                         RTCORBA::ProtocolProperties::_narrow (
                           protocols[j].transport_protocol_properties.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
 
                       if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
@@ -949,7 +949,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                       properties =
                         RTCORBA::ProtocolProperties::_narrow (
                           protocols[j].transport_protocol_properties.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK;
 
                       if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
@@ -971,7 +971,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
             {
               client_protocols_policy =
                 RTCORBA::ClientProtocolPolicy::_narrow (policy.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               client_protocols =
@@ -990,7 +990,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                           properties =
                             RTCORBA::ProtocolProperties::_narrow (
                               protocols[j].transport_protocol_properties.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK;
 
                           if (ACE_OS::strcmp (protocol_type, "iiop") == 0)
@@ -1002,7 +1002,7 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
                           properties =
                             RTCORBA::ProtocolProperties::_narrow (
                               protocols[j].transport_protocol_properties.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
                           ACE_TRY_CHECK;
 
                           if (ACE_OS::strcmp (protocol_type, "uiop") == 0)
@@ -1017,16 +1017,16 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
         {
           RTCORBA::TCPProtocolProperties_var tcp_properties =
             RTCORBA::TCPProtocolProperties::_narrow (properties.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           send_buffer_size =
-            tcp_properties->send_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
+            tcp_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           recv_buffer_size =
-            tcp_properties->recv_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
+            tcp_properties->recv_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
-          no_delay = tcp_properties->no_delay (TAO_ENV_SINGLE_ARG_PARAMETER);
+          no_delay = tcp_properties->no_delay (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -1034,14 +1034,14 @@ TAO_ClientProtocolPolicy::hook (TAO_ORB_Core *orb_core,
         {
           RTCORBA::UnixDomainProtocolProperties_var uiop_properties =
             RTCORBA::UnixDomainProtocolProperties::_narrow (properties.in ()
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!CORBA::is_nil (uiop_properties.in ()))
             {
               // Extract and locally store properties of interest.
               send_buffer_size =
-                uiop_properties->send_buffer_size (TAO_ENV_SINGLE_ARG_PARAMETER);
+                uiop_properties->send_buffer_size (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
               recv_buffer_size =
                 uiop_properties->recv_buffer_size ();
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.h b/TAO/tao/RTCORBA/RT_Policy_i.h
index fb5ff0db0ad..bafe86a0ca5 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.h
+++ b/TAO/tao/RTCORBA/RT_Policy_i.h
@@ -64,19 +64,19 @@ public:
    */
   RTCORBA::PriorityModel get_priority_model (void);
 
-  virtual RTCORBA::PriorityModel priority_model (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual RTCORBA::PriorityModel priority_model (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual RTCORBA::Priority server_priority (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual RTCORBA::Priority server_priority (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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));
 
   /// This method writes a CDR representation of the object state.
@@ -129,16 +129,16 @@ public:
   /// Copy constructor.
   TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs);
 
-  virtual RTCORBA::ThreadpoolId threadpool (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual RTCORBA::ThreadpoolId threadpool (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
         ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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));
 
   // Return the cached policy type for this policy.
@@ -181,13 +181,13 @@ public:
   /// Copy constructor.
   TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &rhs);
 
-  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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));
 
   // Return the cached policy type for this policy.
@@ -234,16 +234,16 @@ public:
   RTCORBA::PriorityBands &priority_bands_rep (void);
 
   virtual RTCORBA::PriorityBands * priority_bands
-                                    (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                    (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
   ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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));
 
   /// This method writes a CDR representation of the current object.
@@ -304,16 +304,16 @@ public:
   RTCORBA::ProtocolList & protocols_rep (void);
 
   virtual RTCORBA::ProtocolList * protocols
-                                     (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                     (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  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));
 
   static int hook (TAO_ORB_Core *orb_core,
@@ -369,13 +369,13 @@ public:
   RTCORBA::ProtocolList & protocols_rep (void);
 
   virtual RTCORBA::ProtocolList * protocols
-                                   (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                   (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   static int hook (TAO_ORB_Core *orb_core,
@@ -384,7 +384,7 @@ public:
                    int &no_delay,
                    const char* protocol_type);
 
-  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));
 
   // = CDR Encoder/Decoder.
@@ -440,39 +440,39 @@ public:
                       CORBA::Boolean dont_route = 0,
                       CORBA::Boolean no_delay = 1);
 
-  virtual CORBA::Long send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_buffer_size (CORBA::Long send_buffer_size
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Long recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void recv_buffer_size (CORBA::Long recv_buffer_size
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean keep_alive (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean keep_alive (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void keep_alive (CORBA::Boolean keep_alive
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean dont_route (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean dont_route (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void dont_route (CORBA::Boolean dont_route
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean no_delay (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Boolean no_delay (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void no_delay (CORBA::Boolean no_delay
-                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -520,18 +520,18 @@ public:
                               CORBA::Long recv_buffer_size =
                               ACE_DEFAULT_MAX_SOCKET_BUFSIZ);
 
-  virtual CORBA::Long send_buffer_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Long send_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_buffer_size (CORBA::Long send_buffer_size
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Long recv_buffer_size (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Long recv_buffer_size (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void recv_buffer_size (CORBA::Long recv_buffer_size
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -587,25 +587,25 @@ public:
   // = IDL interface methods.
 
   virtual CORBA::Long preallocate_buffer_size
-                                   (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                                   (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void preallocate_buffer_size (CORBA::Long preallocate_buffer_size
-                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * mmap_filename (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * mmap_filename (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void mmap_filename (const char * mmap_filename
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual char * mmap_lockname (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual char * mmap_lockname (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void mmap_lockname (const char * mmap_lockname
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
index 5fc01232ee9..1bbcb2199a2 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -32,19 +32,19 @@ TAO_RT_Protocols_Hooks::~TAO_RT_Protocols_Hooks (void)
 
 void
 TAO_RT_Protocols_Hooks::init_hooks (TAO_ORB_Core *orb_core
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   this->orb_core_ = orb_core;
 
   // Save a reference to the priority mapping manager.
   CORBA::Object_var obj =
     orb_core->object_ref_table ().resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->mapping_manager_ =
     TAO_Priority_Mapping_Manager::_narrow (obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -106,7 +106,7 @@ void
 TAO_RT_Protocols_Hooks::rt_service_context (TAO_Stub *stub,
                                             TAO_Service_Context &service_context,
                                             CORBA::Boolean restart
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
 {
   // If the restart flag is true, then this call for a
   // reinvocation. We need not prepare the Service Context List once
@@ -116,18 +116,18 @@ TAO_RT_Protocols_Hooks::rt_service_context (TAO_Stub *stub,
       TAO_RT_Stub *rt_stub = ACE_dynamic_cast (TAO_RT_Stub *,
                                                stub);
       CORBA::Policy *priority_model_policy =
-        rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+        rt_stub->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       if (priority_model_policy)
         {
 
           CORBA::Policy *priority_model_policy =
-            rt_stub->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+            rt_stub->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           CORBA::Short client_priority;
           int status = this->get_thread_CORBA_priority (client_priority
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
           if (status == -1)
             ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
 
@@ -135,7 +135,7 @@ TAO_RT_Protocols_Hooks::rt_service_context (TAO_Stub *stub,
           this->add_rt_service_context_hook (service_context,
                                              priority_model_policy,
                                              client_priority
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
@@ -150,12 +150,12 @@ void
 TAO_RT_Protocols_Hooks::add_rt_service_context_hook (TAO_Service_Context &service_context,
                                                      CORBA::Policy *model_policy,
                                                      CORBA::Short &client_priority
-                                                     TAO_ENV_ARG_DECL)
+                                                     ACE_ENV_ARG_DECL)
 {
 
   RTCORBA::PriorityModelPolicy_var model_policy_ptr =
     RTCORBA::PriorityModelPolicy::_narrow (model_policy
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_PriorityModelPolicy *priority_model =
@@ -233,13 +233,13 @@ TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook (
 
 int
 TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority
-                                                   TAO_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL)
 {
   CORBA::Short native_priority = 0;
   int result =
     this->get_thread_CORBA_and_native_priority (priority,
                                                 native_priority
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result == -1)
@@ -250,7 +250,7 @@ TAO_RT_Protocols_Hooks::get_thread_CORBA_priority (CORBA::Short &priority
 
 int
 TAO_RT_Protocols_Hooks::get_thread_native_priority (CORBA::Short &native_priority
-                                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                                    ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
@@ -274,11 +274,11 @@ TAO_RT_Protocols_Hooks::get_thread_native_priority (CORBA::Short &native_priorit
 int
 TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority (CORBA::Short &priority,
                                                               CORBA::Short &native_priority
-                                                              TAO_ENV_ARG_DECL)
+                                                              ACE_ENV_ARG_DECL)
 {
   int result =
     this->get_thread_native_priority (native_priority
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   if (result == -1)
     return result;
 
@@ -299,7 +299,7 @@ TAO_RT_Protocols_Hooks::get_thread_CORBA_and_native_priority (CORBA::Short &prio
 
 int
 TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority
-                                                   TAO_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL)
 {
   TAO_Priority_Mapping *priority_mapping =
     this->mapping_manager_.in ()->mapping ();
@@ -309,12 +309,12 @@ TAO_RT_Protocols_Hooks::set_thread_CORBA_priority (CORBA::Short priority
     return -1;
 
   return this->set_thread_native_priority (native_priority
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 }
 
 int
 TAO_RT_Protocols_Hooks::set_thread_native_priority (CORBA::Short native_priority
-                                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                                    ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_hthread_t current;
   ACE_Thread::self (current);
@@ -326,7 +326,7 @@ TAO_RT_Protocols_Hooks::set_thread_native_priority (CORBA::Short native_priority
 }
 
 int
-TAO_RT_Protocols_Hooks::set_default_policies (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_Protocols_Hooks::set_default_policies (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Set RTCORBA policy defaults.
   // Set RTCORBA::ServerProtocolPolicy and
@@ -368,7 +368,7 @@ TAO_RT_Protocols_Hooks::set_default_policies (TAO_ENV_SINGLE_ARG_DECL)
     server_protocol_policy;
 
   this->orb_core_->get_default_policies ()->set_policy (server_protocol_policy
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Set ClientProtocolPolicy.
@@ -385,7 +385,7 @@ TAO_RT_Protocols_Hooks::set_default_policies (TAO_ENV_SINGLE_ARG_DECL)
     client_protocol_policy;
 
   this->orb_core_->get_default_policies ()->set_policy (client_protocol_policy
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -393,7 +393,7 @@ TAO_RT_Protocols_Hooks::set_default_policies (TAO_ENV_SINGLE_ARG_DECL)
 
 int
 TAO_RT_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry
-                                                            TAO_ENV_ARG_DECL)
+                                                            ACE_ENV_ARG_DECL)
 {
   RTCORBA::ProtocolList protocols;
 
@@ -438,7 +438,7 @@ TAO_RT_Protocols_Hooks::set_default_server_protocol_policy (TAO_Acceptor_Registr
     server_protocol_policy;
 
   this->orb_core_->get_default_policies ()->set_policy (server_protocol_policy
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
index b4a585f9ec5..ffcdd065c30 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
@@ -36,7 +36,7 @@ public:
 
   /// Initialize the protocols hooks instance.
   virtual void init_hooks (TAO_ORB_Core *orb_core
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
 
   /// Invoke the client_protocols hook if present.
   /**
@@ -92,12 +92,12 @@ public:
   virtual void rt_service_context (TAO_Stub *stub,
                                    TAO_Service_Context &service_context,
                                    CORBA::Boolean restart
-                                   TAO_ENV_ARG_DECL);
+                                   ACE_ENV_ARG_DECL);
 
   virtual void add_rt_service_context_hook (TAO_Service_Context &service_context,
                                             CORBA::Policy *model_policy,
                                             CORBA::Short &client_priority
-                                            TAO_ENV_ARG_DECL);
+                                            ACE_ENV_ARG_DECL);
 
   virtual void get_selector_hook (CORBA::Policy *model_policy,
                                   CORBA::Boolean
@@ -118,29 +118,29 @@ public:
    */
   //@{
   virtual int get_thread_CORBA_priority (CORBA::Short &
-                                         TAO_ENV_ARG_DECL_NOT_USED);
+                                         ACE_ENV_ARG_DECL_NOT_USED);
 
   virtual int get_thread_native_priority (CORBA::Short &
-                                          TAO_ENV_ARG_DECL_NOT_USED);
+                                          ACE_ENV_ARG_DECL_NOT_USED);
 
   virtual int get_thread_CORBA_and_native_priority (CORBA::Short &,
                                                     CORBA::Short &
-                                                    TAO_ENV_ARG_DECL_NOT_USED);
+                                                    ACE_ENV_ARG_DECL_NOT_USED);
 
   virtual int set_thread_CORBA_priority (CORBA::Short
-                                         TAO_ENV_ARG_DECL_NOT_USED);
+                                         ACE_ENV_ARG_DECL_NOT_USED);
 
   virtual int set_thread_native_priority (CORBA::Short
-                                          TAO_ENV_ARG_DECL_NOT_USED);
+                                          ACE_ENV_ARG_DECL_NOT_USED);
 
   //@}
 
   /// 1. Sets ORB-level policy defaults for this ORB.  Currently sets
   /// default RTCORBA policies: ClientProtocolPolicy.
-  virtual int set_default_policies (TAO_ENV_SINGLE_ARG_DECL);
+  virtual int set_default_policies (ACE_ENV_SINGLE_ARG_DECL);
 
   int set_default_server_protocol_policy (TAO_Acceptor_Registry &acceptor_registry
-                                          TAO_ENV_ARG_DECL);
+                                          ACE_ENV_ARG_DECL);
 
 protected:
   TAO_ORB_Core *orb_core_;
diff --git a/TAO/tao/RTCORBA/RT_Stub.cpp b/TAO/tao/RTCORBA/RT_Stub.cpp
index 283edf28bd9..90f833ec3f5 100644
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub.cpp
@@ -32,10 +32,10 @@ TAO_RT_Stub::~TAO_RT_Stub (void)
 }
 
 void
-TAO_RT_Stub::parse_policies (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_Stub::parse_policies (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::PolicyList_var policy_list
-    = this->base_profiles_.policy_list (TAO_ENV_SINGLE_ARG_PARAMETER);
+    = this->base_profiles_.policy_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong length = policy_list->length ();
@@ -60,11 +60,11 @@ TAO_RT_Stub::parse_policies (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_priority_model (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_Stub::exposed_priority_model (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!this->are_policies_parsed_)
     {
-      this->parse_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -78,11 +78,11 @@ TAO_RT_Stub::exposed_priority_model (CORBA::Policy_ptr policy)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_Stub::exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!this->are_policies_parsed_)
     {
-      this->parse_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -97,11 +97,11 @@ TAO_RT_Stub::exposed_priority_banded_connection (CORBA::Policy_ptr policy)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::exposed_client_protocol (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_Stub::exposed_client_protocol (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (!this->are_policies_parsed_)
     {
-      this->parse_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->parse_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -120,44 +120,44 @@ TAO_RT_Stub::exposed_client_protocol (CORBA::Policy_ptr policy)
 
 CORBA::Policy_ptr
 TAO_RT_Stub::get_policy (CORBA::PolicyType type
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   // If we are dealing with a client exposed policy, check if any
   // value came in the IOR/reconcile IOR value and overrides.
   if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
-    return this->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
-    return this->effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)
-    return this->effective_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-  return this->TAO_Stub::get_policy (type TAO_ENV_ARG_PARAMETER);
+  return this->TAO_Stub::get_policy (type ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Policy_ptr
 TAO_RT_Stub::get_client_policy (CORBA::PolicyType type
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   // If we are dealing with a client exposed policy, check if any
   // value came in the IOR/reconcile IOR value and overrides.
   if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
-    return this->exposed_priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->exposed_priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   if (type == RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
-    return this->effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   if (type == RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)
-    return this->effective_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->effective_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-  return this->TAO_Stub::get_client_policy (type TAO_ENV_ARG_PARAMETER);
+  return this->TAO_Stub::get_client_policy (type ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_Stub *
 TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
                                    CORBA::SetOverrideType set_add
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   // Validity check.  Make sure requested policies are allowed to be
   // set at this scope.
@@ -167,7 +167,7 @@ TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
       if (CORBA::is_nil (policy))
         continue;
 
-      CORBA::PolicyType type = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::PolicyType type = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (type == RTCORBA::PRIORITY_MODEL_POLICY_TYPE ||
@@ -179,7 +179,7 @@ TAO_RT_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 
   // We are not required to check for consistency of <policies> with
   // overrides at other levels or with policies exported in the IOR.
-  return this->TAO_Stub::set_policy_overrides(policies, set_add TAO_ENV_ARG_PARAMETER);
+  return this->TAO_Stub::set_policy_overrides(policies, set_add ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
@@ -291,7 +291,7 @@ TAO_RT_Stub::priority_banded_connection (void)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_Stub::effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get effective override.
   CORBA::Policy_var override =
@@ -299,7 +299,7 @@ TAO_RT_Stub::effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL)
 
   // Get the value from the ior.
   CORBA::Policy_var exposed =
-    this->exposed_priority_banded_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   // Reconcile client-exposed and locally set values.
@@ -311,7 +311,7 @@ TAO_RT_Stub::effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL)
 
   RTCORBA::PriorityBandedConnectionPolicy_var override_policy_var =
     RTCORBA::PriorityBandedConnectionPolicy::_narrow (override.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   TAO_PriorityBandedConnectionPolicy *override_policy =
@@ -320,7 +320,7 @@ TAO_RT_Stub::effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL)
 
   RTCORBA::PriorityBandedConnectionPolicy_var exposed_policy_var =
     RTCORBA::PriorityBandedConnectionPolicy::_narrow (exposed.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   TAO_PriorityBandedConnectionPolicy *exposed_policy =
@@ -342,7 +342,7 @@ TAO_RT_Stub::effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 CORBA::Policy *
-TAO_RT_Stub::effective_client_protocol (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_Stub::effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Get effective override.
   CORBA::Policy_var override =
@@ -350,7 +350,7 @@ TAO_RT_Stub::effective_client_protocol (TAO_ENV_SINGLE_ARG_DECL)
 
   // Get the value from the ior.
   CORBA::Policy_var exposed =
-    this->exposed_client_protocol (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->exposed_client_protocol (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   // Reconcile client-exposed and locally set values.
@@ -362,7 +362,7 @@ TAO_RT_Stub::effective_client_protocol (TAO_ENV_SINGLE_ARG_DECL)
 
   RTCORBA::ClientProtocolPolicy_var override_policy_var =
     RTCORBA::ClientProtocolPolicy::_narrow (override.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   TAO_ClientProtocolPolicy *override_policy =
@@ -371,7 +371,7 @@ TAO_RT_Stub::effective_client_protocol (TAO_ENV_SINGLE_ARG_DECL)
 
   RTCORBA::ClientProtocolPolicy_var exposed_policy_var =
     RTCORBA::ClientProtocolPolicy::_narrow (exposed.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   TAO_ClientProtocolPolicy *exposed_policy =
diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h
index 96403604062..9c5e0fe4ee6 100644
--- a/TAO/tao/RTCORBA/RT_Stub.h
+++ b/TAO/tao/RTCORBA/RT_Stub.h
@@ -57,17 +57,17 @@ public:
    * types.
    */
   CORBA::Policy_ptr get_policy (CORBA::PolicyType type
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
 
   CORBA::Policy_ptr get_client_policy (CORBA::PolicyType type
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies,
                                              CORBA::SetOverrideType set_add
-                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
 
@@ -76,17 +76,17 @@ public:
   /// Returns the CORBA::Policy (which will be narrowed to be
   /// used as RTCORBA::PriorityModelPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_model (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Policy_ptr exposed_priority_model (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Returns the CORBA::Policy (which will be narrowed and used
   /// as RTCORBA::PriorityBandedConnectionPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Policy_ptr exposed_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Returns the CORBA::Policy (which will be narrowed and used
   /// as RTCORBA::ClientProtocolPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_client_protocol (TAO_ENV_SINGLE_ARG_DECL);
+  CORBA::Policy_ptr exposed_client_protocol (ACE_ENV_SINGLE_ARG_DECL);
 
 
   CORBA::Policy *private_connection (void);
@@ -103,16 +103,16 @@ public:
   //   the policy value exported in the Object's IOR.
 
   CORBA::Policy *
-  effective_priority_banded_connection (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  effective_priority_banded_connection (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   CORBA::Policy *
-  effective_client_protocol (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  effective_client_protocol (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 
 
 private:
 
   /// Helper method used to parse the policies.
-  void parse_policies (TAO_ENV_SINGLE_ARG_DECL);
+  void parse_policies (ACE_ENV_SINGLE_ARG_DECL);
 
   void exposed_priority_model (CORBA::Policy_ptr policy);
 
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
index 3eb67cc1b34..0b3beafe280 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
@@ -13,7 +13,7 @@ TAO_Stub *
 TAO_RT_Stub_Factory::create_stub (const char *repository_id,
                                   const TAO_MProfile &profiles,
                                   TAO_ORB_Core *orb_core
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   // @@ TODO: As soon as the RT_STUB is done change this to
   // create an RT_STUB
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.h b/TAO/tao/RTCORBA/RT_Stub_Factory.h
index 7f5cf343c28..7938f9a9544 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h
@@ -46,7 +46,7 @@ public:
   virtual TAO_Stub *create_stub (const char *repository_id,
                                  const TAO_MProfile &profiles,
                                  TAO_ORB_Core *orb_core
-                                 TAO_ENV_ARG_DECL);
+                                 ACE_ENV_ARG_DECL);
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTCORBA, TAO_RT_Stub_Factory)
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index 249471330ae..46713f34cb0 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -39,11 +39,11 @@ TAO_RT_Thread_Lane_Resources_Manager::~TAO_RT_Thread_Lane_Resources_Manager (voi
 }
 
 int
-TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_Thread_Lane_Resources_Manager::open_default_resources (ACE_ENV_SINGLE_ARG_DECL)
 {
   int result =
     this->default_lane_resources_->open_acceptor_registry (0
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
index aa13c96f4ef..5301a0550f6 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
@@ -47,7 +47,7 @@ public:
   void finalize (void);
 
   /// Open default resources.
-  int open_default_resources (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int open_default_resources (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /// Shutdown reactor.
   void shutdown_reactor (void);
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index 032de681bf3..10010ebd177 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -101,7 +101,7 @@ TAO_Thread_Pool_Threads::svc (void)
   ACE_TRY_NEW_ENV
     {
       // Run the ORB.
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -135,7 +135,7 @@ TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool,
                                   CORBA::Short lane_priority,
                                   CORBA::ULong static_threads,
                                   CORBA::ULong dynamic_threads
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
   : pool_ (pool),
     id_ (id),
     lane_priority_ (lane_priority),
@@ -151,7 +151,7 @@ TAO_Thread_Lane::TAO_Thread_Lane (TAO_Thread_Pool &pool,
 }
 
 void
-TAO_Thread_Lane::validate_and_map_priority (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Check that the priority is in bounds.
   if (this->lane_priority_ < RTCORBA::minPriority ||
@@ -164,12 +164,12 @@ TAO_Thread_Lane::validate_and_map_priority (TAO_ENV_SINGLE_ARG_DECL)
   // Get the priority mapping manager.
   CORBA::Object_var obj =
     orb->resolve_initial_references (TAO_OBJID_PRIORITYMAPPINGMANAGER
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_Priority_Mapping_Manager_var mapping_manager =
     TAO_Priority_Mapping_Manager::_narrow (obj.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   RTCORBA::PriorityMapping *pm =
@@ -192,17 +192,17 @@ TAO_Thread_Lane::validate_and_map_priority (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_Thread_Lane::open (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Thread_Lane::open (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Validate and map priority.
-  this->validate_and_map_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->validate_and_map_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Open the acceptor registry.
   int result = 0;
   result =
     this->resources_.open_acceptor_registry (1
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (result == -1)
@@ -377,7 +377,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                                   CORBA::Boolean allow_request_buffering,
                                   CORBA::ULong max_buffered_requests,
                                   CORBA::ULong max_request_buffer_size
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   : manager_ (manager),
     id_ (id),
     stack_size_ (stack_size),
@@ -401,7 +401,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                          default_priority,
                          static_threads,
                          dynamic_threads
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
@@ -412,7 +412,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                                   CORBA::Boolean allow_request_buffering,
                                   CORBA::ULong max_buffered_requests,
                                   CORBA::ULong max_request_buffer_size
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   : manager_ (manager),
     id_ (id),
     stack_size_ (stack_size),
@@ -440,18 +440,18 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                            lanes[i].lane_priority,
                            lanes[i].static_threads,
                            lanes[i].dynamic_threads
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Thread_Pool::open (TAO_ENV_SINGLE_ARG_DECL)
+TAO_Thread_Pool::open (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Open all the lanes.
   for (CORBA::ULong i = 0;
        i != this->number_of_lanes_;
        ++i)
     {
-      this->lanes_[i]->open (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->lanes_[i]->open (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -678,7 +678,7 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize,
                                             CORBA::Boolean allow_request_buffering,
                                             CORBA::ULong max_buffered_requests,
                                             CORBA::ULong max_request_buffer_size
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_THREAD_POOL_MANAGER_GUARD;
@@ -691,7 +691,7 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize,
                                     allow_request_buffering,
                                     max_buffered_requests,
                                     max_request_buffer_size
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ThreadpoolId
@@ -701,7 +701,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                        CORBA::Boolean allow_request_buffering,
                                                        CORBA::ULong max_buffered_requests,
                                                        CORBA::ULong max_request_buffer_size
-                                                       TAO_ENV_ARG_DECL)
+                                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_THREAD_POOL_MANAGER_GUARD;
@@ -713,12 +713,12 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                allow_request_buffering,
                                                max_buffered_requests,
                                                max_request_buffer_size
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
 }
 
 void
 TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::InvalidThreadpool))
 {
@@ -726,7 +726,7 @@ TAO_Thread_Pool_Manager::destroy_threadpool (RTCORBA::ThreadpoolId threadpool
   ACE_CHECK;
 
   this->destroy_threadpool_i (threadpool
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ThreadpoolId
@@ -737,7 +737,7 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
                                               CORBA::Boolean allow_request_buffering,
                                               CORBA::ULong max_buffered_requests,
                                               CORBA::ULong max_request_buffer_size
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create the thread pool.
@@ -753,12 +753,12 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
                                      allow_request_buffering,
                                      max_buffered_requests,
                                      max_request_buffer_size
-                                     TAO_ENV_ARG_PARAMETER),
+                                     ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
   return this->create_threadpool_helper (thread_pool
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ThreadpoolId
@@ -768,7 +768,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
                                                          CORBA::Boolean allow_request_buffering,
                                                          CORBA::ULong max_buffered_requests,
                                                          CORBA::ULong max_request_buffer_size
-                                                         TAO_ENV_ARG_DECL)
+                                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Create the thread pool.
@@ -783,24 +783,24 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
                                      allow_request_buffering,
                                      max_buffered_requests,
                                      max_request_buffer_size
-                                     TAO_ENV_ARG_PARAMETER),
+                                     ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
   return this->create_threadpool_helper (thread_pool
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 }
 
 RTCORBA::ThreadpoolId
 TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool
-                                                   TAO_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Make sure of safe deletion in case of errors.
   auto_ptr<TAO_Thread_Pool> safe_thread_pool (thread_pool);
 
   // Open the pool.
-  thread_pool->open (TAO_ENV_SINGLE_ARG_PARAMETER);
+  thread_pool->open (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Create the static threads.
@@ -835,7 +835,7 @@ TAO_Thread_Pool_Manager::create_threadpool_helper (TAO_Thread_Pool *thread_pool
 
 void
 TAO_Thread_Pool_Manager::destroy_threadpool_i (RTCORBA::ThreadpoolId thread_pool_id
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::InvalidThreadpool))
 {
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index e231b22a34b..9e18d09619f 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -106,13 +106,13 @@ public:
                    CORBA::Short lane_priority,
                    CORBA::ULong static_threads,
                    CORBA::ULong dynamic_threads
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 
   /// Destructor.
   ~TAO_Thread_Lane (void);
 
   /// Open the lane.
-  void open (TAO_ENV_SINGLE_ARG_DECL);
+  void open (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Finalize the resources.
   void finalize (void);
@@ -157,7 +157,7 @@ public:
 private:
 
   /// Validate lane's priority and map it to a native value.
-  void validate_and_map_priority (TAO_ENV_SINGLE_ARG_DECL);
+  void validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL);
 
   TAO_Thread_Pool &pool_;
   CORBA::ULong id_;
@@ -204,7 +204,7 @@ public:
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
                    CORBA::ULong max_request_buffer_size
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 
   /// Constructor (for pools with lanes).
   TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
@@ -215,13 +215,13 @@ public:
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
                    CORBA::ULong max_request_buffer_size
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 
   /// Destructor.
   ~TAO_Thread_Pool (void);
 
   /// Open the pool.
-  void open (TAO_ENV_SINGLE_ARG_DECL);
+  void open (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Finalize the resources.
   void finalize (void);
@@ -315,7 +315,7 @@ public:
                      CORBA::Boolean allow_request_buffering,
                      CORBA::ULong max_buffered_requests,
                      CORBA::ULong max_request_buffer_size
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Create a threadpool with lanes.
@@ -326,12 +326,12 @@ public:
                                 CORBA::Boolean allow_request_buffering,
                                 CORBA::ULong max_buffered_requests,
                                 CORBA::ULong max_request_buffer_size
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Destroy a threadpool.
   void destroy_threadpool (RTCORBA::ThreadpoolId threadpool
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTCORBA::RTORB::InvalidThreadpool));
 
@@ -362,7 +362,7 @@ private:
                        CORBA::Boolean allow_request_buffering,
                        CORBA::ULong max_buffered_requests,
                        CORBA::ULong max_request_buffer_size
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   RTCORBA::ThreadpoolId
@@ -372,17 +372,17 @@ private:
                                   CORBA::Boolean allow_request_buffering,
                                   CORBA::ULong max_buffered_requests,
                                   CORBA::ULong max_request_buffer_size
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void destroy_threadpool_i (RTCORBA::ThreadpoolId threadpool
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      RTCORBA::RTORB::InvalidThreadpool));
 
   RTCORBA::ThreadpoolId
   create_threadpool_helper (TAO_Thread_Pool *thread_pool
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // @}
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index c4069c6cb16..12730fb9dfb 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -140,10 +140,10 @@ RTPortableServer::POA_var::tao_nil (void)
 ::RTPortableServer::POA_ptr
 RTPortableServer::POA_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::RTPortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::RTPortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -225,15 +225,15 @@ RTPortableServer::POA::~POA (void)
 
 RTPortableServer::POA_ptr RTPortableServer::POA::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return POA::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return POA::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 RTPortableServer::POA_ptr RTPortableServer::POA::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index 8b5a9cc1b75..8d932f76938 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -98,7 +98,7 @@ TAO_NAMESPACE  RTPortableServer
     static POA_ptr tao_duplicate (POA_ptr);
     static void tao_release (POA_ptr);
     static POA_ptr tao_nil (void);
-    static POA_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static POA_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -153,11 +153,11 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
     static POA_ptr _duplicate (POA_ptr obj);
     static POA_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static POA_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static POA_ptr _nil (void)
       {
@@ -167,7 +167,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
     virtual CORBA::Object_ptr create_reference_with_priority (
         const char * intf,
         RTCORBA::Priority priority
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -178,7 +178,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
         const PortableServer::ObjectId & oid,
         const char * intf,
         RTCORBA::Priority priority
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -188,7 +188,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
     virtual PortableServer::ObjectId * activate_object_with_priority (
         PortableServer::Servant p_servant,
         RTCORBA::Priority priority
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -200,7 +200,7 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA
         const PortableServer::ObjectId & oid,
         PortableServer::Servant p_servant,
         RTCORBA::Priority priority
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException,
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.i b/TAO/tao/RTPortableServer/RTPortableServerC.i
index 1272b5b0b97..f36831389a4 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.i
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.i
@@ -50,10 +50,10 @@ tao_RTPortableServer_POA_nil (
 ACE_INLINE RTPortableServer::POA_ptr
 tao_RTPortableServer_POA_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return RTPortableServer::POA::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return RTPortableServer::POA::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
index 31c3f6c82f6..669baf5ea01 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
@@ -17,7 +17,7 @@ ACE_RCSID(RTCORBA, RT_Collocation_Resolver, "$Id$")
 
 CORBA::Boolean
 TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
-                                            TAO_ENV_ARG_DECL) const
+                                            ACE_ENV_ARG_DECL) const
 {
   // Make sure that the servant is in the same ORB that created this
   // object.
@@ -33,7 +33,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
   TAO_Object_Adapter::Servant_Upcall servant_upcall (orb_core);
   TAO_POA *poa =
     servant_upcall.lookup_POA (object->_object_key ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Get the thread pool associated with this POA.
@@ -96,7 +96,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
                          servant_upcall.system_id_,
                          servant_upcall,
                          servant_upcall.current_context_
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Get the priority that the servant will run at.
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
index 6439b5a7aaa..e8ce8277d2f 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
@@ -38,7 +38,7 @@ public:
 
   /// Is <object> collocated?
   virtual CORBA::Boolean is_collocated (CORBA::Object_ptr object
-                                        TAO_ENV_ARG_DECL) const;
+                                        ACE_ENV_ARG_DECL) const;
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_RTPortableServer, TAO_RT_Collocation_Resolver)
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 816edeb04ec..bb73f5a0c6e 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -36,7 +36,7 @@ TAO_RT_POA::TAO_RT_POA (const TAO_POA::String &name,
                         TAO_SYNCH_MUTEX &thread_lock,
                         TAO_ORB_Core &orb_core,
                         TAO_Object_Adapter *object_adapter
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   : TAO_POA (name,
              poa_manager,
              policies,
@@ -45,14 +45,14 @@ TAO_RT_POA::TAO_RT_POA (const TAO_POA::String &name,
              thread_lock,
              orb_core,
              object_adapter
-             TAO_ENV_ARG_PARAMETER),
+             ACE_ENV_ARG_PARAMETER),
   thread_pool_ (0)
 {
   ACE_CHECK;
 
   // Parse the RT policies and update our policy cache.
   this->parse_rt_policies (this->policies ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -69,7 +69,7 @@ TAO_RT_POA::new_POA (const String &name,
                      TAO_SYNCH_MUTEX &thread_lock,
                      TAO_ORB_Core &orb_core,
                      TAO_Object_Adapter *object_adapter
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   TAO_RT_POA *poa;
 
@@ -82,7 +82,7 @@ TAO_RT_POA::new_POA (const String &name,
                                 thread_lock,
                                 orb_core,
                                 object_adapter
-                                TAO_ENV_ARG_PARAMETER),
+                                ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
@@ -91,7 +91,7 @@ TAO_RT_POA::new_POA (const String &name,
 
 void
 TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   {
     CORBA::Policy_var policy =
@@ -99,20 +99,20 @@ TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies
 
     RTCORBA::PriorityModelPolicy_var priority_model =
       RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (!CORBA::is_nil (priority_model.in ()))
       {
         RTCORBA::PriorityModel rt_priority_model =
-          priority_model->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER);
+          priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
 
         this->cached_policies ().priority_model (
           TAO_POA_Cached_Policies::PriorityModel (rt_priority_model));
 
         RTCORBA::Priority priority =
-          priority_model->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+          priority_model->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
 
         this->cached_policies ().server_priority (priority);
@@ -122,13 +122,13 @@ TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies
   this->thread_pool_ =
     TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_,
                                                       policies.policies ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_RT_POA::validate_priority (RTCORBA::Priority priority
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   if (priority < RTCORBA::minPriority ||
       priority > RTCORBA::maxPriority)
@@ -164,7 +164,7 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority
 
       RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
         = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ()
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       TAO_PriorityBandedConnectionPolicy *priority_bands_i =
@@ -193,7 +193,7 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority
 }
 
 void
-TAO_RT_POA::validate_policies (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::validate_policies (ACE_ENV_SINGLE_ARG_DECL)
 {
   // For each of the above operations, if the POA supports the
   // IMPLICIT_ACTIVATION option for the ImplicitActivationPolicy then
@@ -226,12 +226,12 @@ TAO_Stub *
 TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
                            const char *type_id,
                            CORBA::Short priority
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   // Client exposed policies.
   CORBA::PolicyList_var client_exposed_policies =
     this->client_exposed_policies (priority
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Server protocol policy.
@@ -240,7 +240,7 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
 
   RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
     RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_ServerProtocolPolicy *server_protocol =
@@ -266,7 +266,7 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
                                            client_exposed_policies._retn (),
                                            &filter,
                                            *acceptor_registry
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
     }
 
   // If this POA has the SERVER_DECLARED policy, create the IOR with
@@ -288,7 +288,7 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
                                                       client_exposed_policies._retn (),
                                                       &filter,
                                                       lanes[i]->resources ().acceptor_registry ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
         }
 
       ACE_ASSERT (0);
@@ -302,7 +302,7 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
 
   RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
     = RTCORBA::PriorityBandedConnectionPolicy::_narrow (bands.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_PriorityBandedConnectionPolicy *priority_bands_i =
@@ -314,7 +314,7 @@ TAO_RT_POA::key_to_stub_i (const TAO_ObjectKey &object_key,
                                    client_exposed_policies._retn (),
                                    &filter,
                                    priority_bands_i
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 TAO_Stub *
@@ -323,7 +323,7 @@ TAO_RT_POA::create_stub_object (const TAO_ObjectKey &object_key,
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
                                 TAO_PriorityBandedConnectionPolicy *priority_bands
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   int error = 0;
 
@@ -398,7 +398,7 @@ TAO_RT_POA::create_stub_object (const TAO_ObjectKey &object_key,
     this->orb_core_.create_stub_object (mprofile,
                                         type_id,
                                         policy_list
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
 }
 
 size_t
@@ -442,7 +442,7 @@ TAO_RT_POA::lane_required (TAO_Thread_Lane *lane,
 
 CORBA::PolicyList *
 TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   CORBA::PolicyList *client_exposed_policies = 0;
   ACE_NEW_THROW_EX (client_exposed_policies,
@@ -453,7 +453,7 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
 
   // Add in all of the client exposed policies.
   this->policies_.add_client_exposed_fixed_policies (client_exposed_policies
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Check if the priority model policy has been set, and if so, let
@@ -498,7 +498,7 @@ PortableServer::POA_ptr
 TAO_RT_POA::create_POA (const char *adapter_name,
                         PortableServer::POAManager_ptr poa_manager,
                         const CORBA::PolicyList &policies
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
@@ -506,7 +506,7 @@ TAO_RT_POA::create_POA (const char *adapter_name,
   PortableServer::POA_ptr poa = this->TAO_POA::create_POA (adapter_name,
                                                            poa_manager,
                                                            policies
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (poa);
   return poa;
 }
@@ -514,13 +514,13 @@ TAO_RT_POA::create_POA (const char *adapter_name,
 PortableServer::POA_ptr
 TAO_RT_POA::find_POA (const char *adapter_name,
                       CORBA::Boolean activate_it
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterNonExistent))
 {
   PortableServer::POA_ptr poa = this->TAO_POA::find_POA (adapter_name,
                                                          activate_it
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (poa);
   return poa;
 }
@@ -528,12 +528,12 @@ TAO_RT_POA::find_POA (const char *adapter_name,
 void
 TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects,
                      CORBA::Boolean wait_for_completion
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->TAO_POA::destroy (etherealize_objects,
                           wait_for_completion
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -542,12 +542,12 @@ TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects,
 
 PortableServer::ThreadPolicy_ptr
 TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ThreadPolicy_ptr policy =
     this->TAO_POA::create_thread_policy (value
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
@@ -556,24 +556,24 @@ TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
 
 PortableServer::LifespanPolicy_ptr
 TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::LifespanPolicy_ptr policy =
     this->TAO_POA::create_lifespan_policy (value
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
 
 PortableServer::IdUniquenessPolicy_ptr
 TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdUniquenessPolicy_ptr policy =
     this->TAO_POA::create_id_uniqueness_policy (value
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
@@ -581,12 +581,12 @@ TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue
 
 PortableServer::IdAssignmentPolicy_ptr
 TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                         TAO_ENV_ARG_DECL)
+                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdAssignmentPolicy_ptr policy =
     this->TAO_POA::create_id_assignment_policy (value
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
@@ -596,24 +596,24 @@ TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue
 
 PortableServer::ImplicitActivationPolicy_ptr
 TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ImplicitActivationPolicy_ptr policy =
     this->TAO_POA::create_implicit_activation_policy (value
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
 
 PortableServer::ServantRetentionPolicy_ptr
 TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ServantRetentionPolicy_ptr policy =
     this->TAO_POA::create_servant_retention_policy (value
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
@@ -621,12 +621,12 @@ TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPol
 
 PortableServer::RequestProcessingPolicy_ptr
 TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::RequestProcessingPolicy_ptr policy =
     this->TAO_POA::create_request_processing_policy (value
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
 }
@@ -635,41 +635,41 @@ TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingP
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 char *
-TAO_RT_POA::the_name (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::the_name (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char * name =
-    this->TAO_POA::the_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_POA::the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (name);
   return name;
 }
 
 PortableServer::POA_ptr
-TAO_RT_POA::the_parent (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_ptr parent =
-    this->TAO_POA::the_parent (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_POA::the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (parent);
   return parent;
 }
 
 PortableServer::POAList *
-TAO_RT_POA::the_children (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::the_children (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAList *children =
-    this->TAO_POA::the_children (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_POA::the_children (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (children);
   return children;
 }
 
 PortableServer::POAManager_ptr
-TAO_RT_POA::the_POAManager (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAManager_ptr poa_manager =
-    this->TAO_POA::the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_POA::the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (poa_manager);
   return poa_manager;
 }
@@ -678,67 +678,67 @@ TAO_RT_POA::the_POAManager (TAO_ENV_SINGLE_ARG_DECL)
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 PortableServer::AdapterActivator_ptr
-TAO_RT_POA::the_activator (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::AdapterActivator_ptr activator =
-    this->TAO_POA::the_activator (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_POA::the_activator (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (activator);
   return activator;
 }
 
 void
 TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->TAO_POA::the_activator (adapter_activator
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::ServantManager_ptr
-TAO_RT_POA::get_servant_manager (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ServantManager_ptr servant_manager =
-    this->TAO_POA::get_servant_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (servant_manager);
   return servant_manager;
 }
 
 void
 TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   this->TAO_POA::set_servant_manager (imgr
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 PortableServer::Servant
-TAO_RT_POA::get_servant (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::NoServant,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
-    this->TAO_POA::get_servant (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_POA::get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (servant);
   return servant;
 }
 
 void
 TAO_RT_POA::set_servant (PortableServer::Servant servant
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   this->TAO_POA::set_servant (servant
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -746,14 +746,14 @@ TAO_RT_POA::set_servant (PortableServer::Servant servant
 
 PortableServer::ObjectId *
 TAO_RT_POA::activate_object (PortableServer::Servant p_servant
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
     this->TAO_POA::activate_object (p_servant
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (object_id);
   return object_id;
 }
@@ -761,7 +761,7 @@ TAO_RT_POA::activate_object (PortableServer::Servant p_servant
 void
 TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id,
                                      PortableServer::Servant p_servant
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
@@ -769,31 +769,31 @@ TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id,
 {
   this->TAO_POA::activate_object_with_id (id,
                                           p_servant
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   this->TAO_POA::deactivate_object (oid
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::Object_ptr
 TAO_RT_POA::create_reference (const char *intf
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
     this->TAO_POA::create_reference (intf
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (obj);
   return obj;
 }
@@ -801,42 +801,42 @@ TAO_RT_POA::create_reference (const char *intf
 CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid,
                                       const char *intf
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
     this->TAO_POA::create_reference_with_id (oid,
                                              intf
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (obj);
   return obj;
 }
 
 PortableServer::ObjectId *
 TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
     this->TAO_POA::servant_to_id (p_servant
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (object_id);
   return object_id;
 }
 
 CORBA::Object_ptr
 TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
     this->TAO_POA::servant_to_reference (p_servant
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (obj);
   return obj;
 }
@@ -844,7 +844,7 @@ TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant
 
 PortableServer::Servant
 TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongAdapter,
@@ -852,58 +852,58 @@ TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference
 {
   PortableServer::Servant servant =
     this->TAO_POA::reference_to_servant (reference
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (servant);
   return servant;
 }
 
 PortableServer::ObjectId *
 TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongAdapter,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
     this->TAO_POA::reference_to_id (reference
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (object_id);
   return object_id;
 }
 
 PortableServer::Servant
 TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
     this->TAO_POA::id_to_servant (oid
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (servant);
   return servant;
 }
 
 CORBA::Object_ptr
 TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
     this->TAO_POA::id_to_reference (oid
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (obj);
   return obj;
 }
 
 CORBA::OctetSeq *
-TAO_RT_POA::id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RT_POA::id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->TAO_POA::id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index e77404726e1..b39a0f553bf 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -54,20 +54,20 @@ public:
   // RTCORBA specific methods
   CORBA::Object_ptr create_reference_with_priority (const char * intf,
                                                     RTCORBA::Priority priority
-                                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference_with_id_and_priority (const PortableServer::ObjectId & oid,
                                                            const char * intf,
                                                            RTCORBA::Priority priority
-                                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId * activate_object_with_priority (PortableServer::Servant p_servant,
                                                             RTCORBA::Priority priority
-                                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
@@ -75,7 +75,7 @@ public:
   void activate_object_with_id_and_priority (const PortableServer::ObjectId & oid,
                                              PortableServer::Servant p_servant,
                                              RTCORBA::Priority priority
-                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
@@ -86,175 +86,175 @@ public:
   PortableServer::POA_ptr create_POA (const char *adapter_name,
                                       PortableServer::POAManager_ptr poa_manager,
                                       const CORBA::PolicyList &policies
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
 
   PortableServer::POA_ptr find_POA (const char *adapter_name,
                                     CORBA::Boolean activate_it
-                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::AdapterNonExistent));
 
   void destroy (CORBA::Boolean etherealize_objects,
                 CORBA::Boolean wait_for_completion
-                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value
-                                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                                                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                                                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                                                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  char * the_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr the_parent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAList *the_children (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POAList *the_children (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POAManager_ptr the_POAManager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::POAManager_ptr the_POAManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  PortableServer::AdapterActivator_ptr the_activator (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::AdapterActivator_ptr the_activator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::ServantManager_ptr get_servant_manager (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   void set_servant_manager (PortableServer::ServantManager_ptr imgr
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
-  PortableServer::Servant get_servant (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::NoServant,
                      PortableServer::POA::WrongPolicy));
 
   void set_servant (PortableServer::Servant servant
-                    TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant
-                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
   void activate_object_with_id (const PortableServer::ObjectId &id,
                                 PortableServer::Servant p_servant
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::ObjectAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
   void deactivate_object (const PortableServer::ObjectId &oid
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference (const char *intf
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
                                               const char *intf
-                                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
-                                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference
-                                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference
-                                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::WrongAdapter,
                      PortableServer::POA::WrongPolicy));
 
   PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
   CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid
-                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::OctetSeq *id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // End standard POA interface methods.
 
   virtual CORBA::PolicyList *client_exposed_policies (CORBA::Short object_priority
-                                                      TAO_ENV_ARG_DECL);
+                                                      ACE_ENV_ARG_DECL);
 
   TAO_RT_POA (const String &name,
               TAO_POA_Manager &poa_manager,
@@ -264,7 +264,7 @@ public:
               TAO_SYNCH_MUTEX &thread_lock,
               TAO_ORB_Core &orb_core,
               TAO_Object_Adapter *object_adapter
-              TAO_ENV_ARG_DECL);
+              ACE_ENV_ARG_DECL);
 
   virtual ~TAO_RT_POA (void);
 
@@ -281,22 +281,22 @@ protected:
                             TAO_SYNCH_MUTEX &thread_lock,
                             TAO_ORB_Core &orb_core,
                             TAO_Object_Adapter *object_adapter
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
   virtual TAO_Stub *key_to_stub_i (const TAO_ObjectKey &key,
                                    const char *type_id,
                                    CORBA::Short priority
-                                   TAO_ENV_ARG_DECL);
+                                   ACE_ENV_ARG_DECL);
 
   void validate_priority (RTCORBA::Priority priority
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
 
-  void validate_policies (TAO_ENV_SINGLE_ARG_DECL);
+  void validate_policies (ACE_ENV_SINGLE_ARG_DECL);
 
   // Parse the policy list for RT policies and update our
   // cached policy instance.
   void parse_rt_policies (TAO_POA_Policy_Set &policies
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
 
   size_t endpoint_count (void);
 
@@ -305,7 +305,7 @@ protected:
                                 CORBA::PolicyList *policy_list,
                                 TAO_Acceptor_Filter *filter,
                                 TAO_PriorityBandedConnectionPolicy *priority_bands
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
   int lane_required (TAO_Thread_Lane *lane,
                      TAO_PriorityBandedConnectionPolicy *priority_bands);
diff --git a/TAO/tao/RTPortableServer/RT_POA.i b/TAO/tao/RTPortableServer/RT_POA.i
index 30cbbb17de3..2a1dc09cde9 100644
--- a/TAO/tao/RTPortableServer/RT_POA.i
+++ b/TAO/tao/RTPortableServer/RT_POA.i
@@ -7,37 +7,37 @@
 ACE_INLINE CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_priority (const char * intf,
                                             RTCORBA::Priority priority
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   // Check that this method can be used based on this POA's policies.
-  this->validate_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  this->validate_priority (priority TAO_ENV_ARG_PARAMETER);
+  this->validate_priority (priority ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Lock access for the duration of this transaction.
   TAO_POA_GUARD_RETURN (0);
 
   return this->create_reference_i (intf
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectId & oid,
                                                    const char * intf,
                                                    RTCORBA::Priority priority
-                                                   TAO_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
   // Check that this method can be used based on this POA's policies.
-  this->validate_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  this->validate_priority (priority TAO_ENV_ARG_PARAMETER);
+  this->validate_priority (priority ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Lock access for the duration of this transaction.
@@ -45,22 +45,22 @@ TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectI
 
   return this->create_reference_with_id_i (oid,
                                            intf
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE PortableServer::ObjectId *
 TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
                                            RTCORBA::Priority priority
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   // Check that this method can be used based on this POA's policies.
-  this->validate_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  this->validate_priority (priority TAO_ENV_ARG_PARAMETER);
+  this->validate_priority (priority ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Lock access for the duration of this transaction.
@@ -68,24 +68,24 @@ TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
 
   return this->activate_object_i (servant,
                                   priority
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void
 TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId & oid,
                                                   PortableServer::Servant servant,
                                                   RTCORBA::Priority priority
-                                                  TAO_ENV_ARG_DECL)
+                                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::ServantAlreadyActive,
                    PortableServer::POA::ObjectAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
   // Check that this method can be used based on this POA's policies.
-  this->validate_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->validate_priority (priority TAO_ENV_ARG_PARAMETER);
+  this->validate_priority (priority ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Lock access for the duration of this transaction.
@@ -94,7 +94,7 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId
   this->activate_object_with_id_i (oid,
                                    servant,
                                    priority
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE void *
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
index 5134dbdeffb..df8c3609239 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -38,18 +38,18 @@ TAO_POA_RT_Policy_Validator::acceptor_registry (void)
 
 void
 TAO_POA_RT_Policy_Validator::validate_impl (TAO_Policy_Set &policies
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
 {
-  this->validate_thread_pool (policies TAO_ENV_ARG_PARAMETER);
+  this->validate_thread_pool (policies ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->validate_lifespan (policies TAO_ENV_ARG_PARAMETER);
+  this->validate_lifespan (policies ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->validate_server_protocol (policies TAO_ENV_ARG_PARAMETER);
+  this->validate_server_protocol (policies ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->validate_priorities (policies TAO_ENV_ARG_PARAMETER);
+  this->validate_priorities (policies ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -65,7 +65,7 @@ TAO_POA_RT_Policy_Validator::legal_policy_impl (CORBA::PolicyType type)
 
 void
 TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
-                                                       TAO_ENV_ARG_DECL)
+                                                       ACE_ENV_ARG_DECL)
 {
   // Make sure we have an endpoint for at least one of the protocols
   // specified in the RTCORBA::ServerProtocolPolicy.  This ensure we
@@ -75,7 +75,7 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
 
   RTCORBA::ServerProtocolPolicy_var server_protocol_policy =
     RTCORBA::ServerProtocolPolicy::_narrow (protocol.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_ServerProtocolPolicy *server_protocol =
@@ -111,7 +111,7 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
 
 void
 TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
-                                                  TAO_ENV_ARG_DECL)
+                                                  ACE_ENV_ARG_DECL)
 {
   // Initialize to the default priority/priority model.
   CORBA::Short priority =
@@ -124,17 +124,17 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
 
   RTCORBA::PriorityModelPolicy_var priority_model =
     RTCORBA::PriorityModelPolicy::_narrow (policy.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (priority_model.in ()))
     {
-      priority = priority_model->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+      priority = priority_model->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       rt_priority_model =
         TAO_POA_Cached_Policies::PriorityModel (
-          priority_model->priority_model (TAO_ENV_SINGLE_ARG_PARAMETER));
+          priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
 
       // Check that the priority is in bounds.
@@ -156,7 +156,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
 
   RTCORBA::PriorityBandedConnectionPolicy_var priority_bands
     = RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_PriorityBandedConnectionPolicy *bands_policy =
@@ -300,18 +300,18 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
 
 void
 TAO_POA_RT_Policy_Validator::validate_thread_pool (TAO_Policy_Set &policies
-                                                   TAO_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL)
 {
   this->thread_pool_ =
     TAO_POA_RT_Policy_Validator::extract_thread_pool (this->orb_core_,
                                                       policies
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_POA_RT_Policy_Validator::validate_lifespan (TAO_Policy_Set &policies
-                                                TAO_ENV_ARG_DECL)
+                                                ACE_ENV_ARG_DECL)
 {
   // If this POA is using a RTCORBA thread pool, make sure the
   // lifespan policy is not persistent since we cannot support it
@@ -322,11 +322,11 @@ TAO_POA_RT_Policy_Validator::validate_lifespan (TAO_Policy_Set &policies
         policies.get_cached_policy (TAO_CACHED_POLICY_LIFESPAN);
       PortableServer::LifespanPolicy_var lifespan_policy =
         PortableServer::LifespanPolicy::_narrow (policy.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       PortableServer::LifespanPolicyValue lifespan =
-        lifespan_policy->value (TAO_ENV_SINGLE_ARG_PARAMETER);
+        lifespan_policy->value (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (lifespan == PortableServer::PERSISTENT)
@@ -338,7 +338,7 @@ TAO_POA_RT_Policy_Validator::validate_lifespan (TAO_Policy_Set &policies
 
 void
 TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
-                                                  TAO_ENV_ARG_DECL)
+                                                  ACE_ENV_ARG_DECL)
 {
   // Check if the user has specified the priority model policy.
   CORBA::Policy_var priority_model =
@@ -353,7 +353,7 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
       if (!CORBA::is_nil (priority_model.in ()))
         {
           // If so, we'll use that policy.
-          policies.set_policy (priority_model.in () TAO_ENV_ARG_PARAMETER);
+          policies.set_policy (priority_model.in () ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -371,7 +371,7 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
       if (!CORBA::is_nil (server_protocol.in ()))
         {
           // If so, we'll use that policy.
-          policies.set_policy (server_protocol.in () TAO_ENV_ARG_PARAMETER);
+          policies.set_policy (server_protocol.in () ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -389,7 +389,7 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
       if (!CORBA::is_nil (thread_pool.in ()))
         {
           // If so, we'll use that policy.
-          policies.set_policy (thread_pool.in () TAO_ENV_ARG_PARAMETER);
+          policies.set_policy (thread_pool.in () ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -399,31 +399,31 @@ TAO_POA_RT_Policy_Validator::merge_policies_impl (TAO_Policy_Set &policies
 TAO_Thread_Pool *
 TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core,
                                                   TAO_Policy_Set &policies
-                                                  TAO_ENV_ARG_DECL)
+                                                  ACE_ENV_ARG_DECL)
 {
   CORBA::Policy_var policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_THREADPOOL);
 
   RTCORBA::ThreadpoolPolicy_var thread_pool_policy =
     RTCORBA::ThreadpoolPolicy::_narrow (policy.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (CORBA::is_nil (thread_pool_policy.in ()))
     return 0;
 
   RTCORBA::ThreadpoolId thread_pool_id =
-    thread_pool_policy->threadpool (TAO_ENV_SINGLE_ARG_PARAMETER);
+    thread_pool_policy->threadpool (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Get the RTORB.
   CORBA::Object_var object =
-    orb_core.resolve_rt_orb (TAO_ENV_SINGLE_ARG_PARAMETER);
+    orb_core.resolve_rt_orb (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   RTCORBA::RTORB_var rt_orb =
     RTCORBA::RTORB::_narrow (object.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_RT_ORB *tao_rt_orb =
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.h b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
index 593132f89f6..4c5227fa427 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
@@ -40,7 +40,7 @@ public:
 
   static TAO_Thread_Pool *extract_thread_pool (TAO_ORB_Core &orb_core,
                                                TAO_Policy_Set &policies
-                                               TAO_ENV_ARG_DECL);
+                                               ACE_ENV_ARG_DECL);
 
   static TAO_Acceptor_Registry *extract_acceptor_registry (TAO_ORB_Core &orb_core,
                                                            TAO_Thread_Pool *thread_pool);
@@ -53,11 +53,11 @@ protected:
    * if that is not the case.
    */
   void validate_impl (TAO_Policy_Set &policies
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
   /// Add/merge policies.
   void merge_policies_impl (TAO_Policy_Set &policies
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
   /**
    * Return whether the specified policy type is legal for the
@@ -69,16 +69,16 @@ protected:
 
 private:
   void validate_server_protocol (TAO_Policy_Set &policies
-                                 TAO_ENV_ARG_DECL);
+                                 ACE_ENV_ARG_DECL);
 
   void validate_priorities (TAO_Policy_Set &policies
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
   void validate_thread_pool (TAO_Policy_Set &policies
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   void validate_lifespan (TAO_Policy_Set &policies
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
 
   TAO_Acceptor_Registry *acceptor_registry (void);
 
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 27106dc1cec..d8ec4a0e834 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -24,11 +24,11 @@ RT_Priority_Model_Processing::~RT_Priority_Model_Processing (void)
 {
   if (this->state_ == PRIORITY_RESET_REQUIRED)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
 
       ACE_TRY
         {
-          this->post_invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->post_invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -45,7 +45,7 @@ void
 RT_Priority_Model_Processing::pre_invoke (
    TAO_Service_Context &request_service_context,
    TAO_Service_Context &reply_service_context
-   TAO_ENV_ARG_DECL)
+   ACE_ENV_ARG_DECL)
 {
   TAO_Thread_Pool *thread_pool =
     (TAO_Thread_Pool *) this->poa_.thread_pool ();
@@ -84,12 +84,12 @@ RT_Priority_Model_Processing::pre_invoke (
 
   // Remember current thread's priority.
   TAO_Protocols_Hooks *tph =
-    this->poa_.orb_core ().get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->poa_.orb_core ().get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (tph->get_thread_CORBA_and_native_priority (this->original_CORBA_priority_,
                                                  this->original_native_priority_
-                                                 TAO_ENV_ARG_PARAMETER)
+                                                 ACE_ENV_ARG_PARAMETER)
       == -1)
     ACE_THROW (CORBA::DATA_CONVERSION (1,
                                        CORBA::COMPLETED_NO));
@@ -171,7 +171,7 @@ RT_Priority_Model_Processing::pre_invoke (
       target_priority != this->original_CORBA_priority_)
     {
       if (tph->set_thread_CORBA_priority (target_priority
-                                          TAO_ENV_ARG_PARAMETER)
+                                          ACE_ENV_ARG_PARAMETER)
           == -1)
         ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
 
@@ -181,7 +181,7 @@ RT_Priority_Model_Processing::pre_invoke (
         {
           CORBA::Short native_priority;
           tph->get_thread_native_priority (native_priority
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("%s processing using %s ")
@@ -230,7 +230,7 @@ RT_Priority_Model_Processing::pre_invoke (
 
 void
 RT_Priority_Model_Processing::post_invoke (
-    TAO_ENV_SINGLE_ARG_DECL)
+    ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->state_ == PRIORITY_RESET_REQUIRED)
     {
@@ -239,11 +239,11 @@ RT_Priority_Model_Processing::post_invoke (
       // Reset the priority of the current thread back to its original
       // value.
       TAO_Protocols_Hooks *tph =
-        this->poa_.orb_core ().get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->poa_.orb_core ().get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (tph->set_thread_native_priority (this->original_native_priority_
-                                           TAO_ENV_ARG_PARAMETER)
+                                           ACE_ENV_ARG_PARAMETER)
           == -1)
         ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
     }
@@ -258,7 +258,7 @@ TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void)
 void
 TAO_RT_Servant_Dispatcher::dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
                                      TAO_ServerRequest &req
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   // RTCORBA PriorityModelPolicy processing (may need to be
   // moved/adjusted when POA threadpools are added).  This is the
@@ -270,19 +270,19 @@ TAO_RT_Servant_Dispatcher::dispatch (TAO_Object_Adapter::Servant_Upcall &servant
   // Set thread's priority.
   priority_processing.pre_invoke (req.request_service_context (),
                                   req.reply_service_context ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Servant dispatch.
   servant_upcall.servant ()->_dispatch (req,
                                         &servant_upcall
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Reset thread's priority to its original value.  If this method
   // isn't reached, i.e., because of an exception, the reset takes
   // place in Priority_Model_Processing destructor.
-  priority_processing.post_invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  priority_processing.post_invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -295,7 +295,7 @@ TAO_RT_Servant_Dispatcher::create_POA (const ACE_CString &name,
                                        TAO_SYNCH_MUTEX &thread_lock,
                                        TAO_ORB_Core &orb_core,
                                        TAO_Object_Adapter *object_adapter
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   TAO_RT_POA *poa;
 
@@ -308,7 +308,7 @@ TAO_RT_Servant_Dispatcher::create_POA (const ACE_CString &name,
                                 thread_lock,
                                 orb_core,
                                 object_adapter
-                                TAO_ENV_ARG_PARAMETER),
+                                ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
index d0f0c5edb1e..5ef3f563923 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
@@ -45,7 +45,7 @@ public:
   /// Dispatch the request to the servant.
   virtual void dispatch (TAO_Object_Adapter::Servant_Upcall &servant_upcall,
                          TAO_ServerRequest &req
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
 
    /// Factory method for creating new POA's.
   virtual TAO_POA *create_POA (const ACE_CString &name,
@@ -56,7 +56,7 @@ public:
                                TAO_SYNCH_MUTEX &thread_lock,
                                TAO_ORB_Core &orb_core,
                                TAO_Object_Adapter *object_adapter
-                               TAO_ENV_ARG_DECL);
+                               ACE_ENV_ARG_DECL);
 };
 
 /**
@@ -94,11 +94,11 @@ public:
   // priority.
   void pre_invoke (TAO_Service_Context &request_service_context,
                    TAO_Service_Context &reply_service_context
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 
   // Resets the priority of the current thread back to its original
   // value, if necessary.
-  void post_invoke (TAO_ENV_SINGLE_ARG_DECL);
+  void post_invoke (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
 
diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp
index e5897583de0..931ed08662e 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.cpp
+++ b/TAO/tao/Reactive_Flushing_Strategy.cpp
@@ -29,14 +29,14 @@ TAO_Reactive_Flushing_Strategy::flush_message (TAO_Transport *transport,
   int result = 0;
 
   // @@ Should we pass this down?  Can we?
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       TAO_ORB_Core *orb_core = transport->orb_core ();
 
       while (!msg->all_data_sent () && result >= 0)
         {
-          result = orb_core->run (max_wait_time, 1 TAO_ENV_ARG_PARAMETER);
+          result = orb_core->run (max_wait_time, 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -53,14 +53,14 @@ int
 TAO_Reactive_Flushing_Strategy::flush_transport (TAO_Transport *transport)
 {
   // @@ Should we pass this down?  Can we?
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       TAO_ORB_Core *orb_core = transport->orb_core ();
 
       while (!transport->queue_is_empty ())
         {
-          int result = orb_core->run (0, 1 TAO_ENV_ARG_PARAMETER);
+          int result = orb_core->run (0, 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (result == -1)
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp
index b4ba0c82dd3..f386547bec5 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp
@@ -23,7 +23,7 @@ TAO_Remote_Object_Proxy_Broker::~TAO_Remote_Object_Proxy_Broker (void)
 
 TAO_Object_Proxy_Impl &
 TAO_Remote_Object_Proxy_Broker::select_proxy (CORBA::Object_ptr
-                                              TAO_ENV_ARG_DECL_NOT_USED)
+                                              ACE_ENV_ARG_DECL_NOT_USED)
 {
   return this->remote_proxy_impl_;
 }
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.h b/TAO/tao/Remote_Object_Proxy_Broker.h
index de68214b209..00753be7fc8 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.h
+++ b/TAO/tao/Remote_Object_Proxy_Broker.h
@@ -37,7 +37,7 @@ public:
   ~TAO_Remote_Object_Proxy_Broker (void);
 
   virtual TAO_Object_Proxy_Impl &select_proxy (CORBA::Object_ptr object
-                                               TAO_ENV_ARG_DECL);
+                                               ACE_ENV_ARG_DECL);
 
 private:
   TAO_Remote_Object_Proxy_Impl remote_proxy_impl_;
diff --git a/TAO/tao/Remote_Object_Proxy_Impl.cpp b/TAO/tao/Remote_Object_Proxy_Impl.cpp
index 91804983854..e6d7ef635ef 100644
--- a/TAO/tao/Remote_Object_Proxy_Impl.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Impl.cpp
@@ -25,7 +25,7 @@ TAO_Remote_Object_Proxy_Impl::~TAO_Remote_Object_Proxy_Impl (void)
 CORBA::Boolean
 TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
                                      const CORBA::Char *logical_type_id
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   // Here we go remote to answer the question.
   CORBA::Boolean _tao_retval = 0;
@@ -50,13 +50,13 @@ TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
   //  ACE_TRY_ENV.clear ();
   for (;;)
     {
-      _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+      _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
 
       CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
 
       _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag)
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
 
       TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
@@ -66,7 +66,7 @@ TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
         ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
 
       int _invoke_status =
-        _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+        _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (_tao_retval);
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -95,7 +95,7 @@ TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target,
 
 CORBA::Boolean
 TAO_Remote_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean _tao_retval = 0;
 
@@ -122,17 +122,17 @@ TAO_Remote_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
       // ACE_TRY_ENV.clear ();
       for (;;)
         {
-          _tao_call.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
 
           _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag)
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           int _invoke_status =
-            _tao_call.invoke (0, 0 TAO_ENV_ARG_PARAMETER);
+            _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (_invoke_status == TAO_INVOKE_RESTART)
@@ -166,7 +166,7 @@ TAO_Remote_Object_Proxy_Impl::_non_existent (const CORBA::Object_ptr target
 
 CORBA_InterfaceDef_ptr
 TAO_Remote_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
 {
   TAO_IFR_Client_Adapter *adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -180,7 +180,7 @@ TAO_Remote_Object_Proxy_Impl::_get_interface (const CORBA::Object_ptr target
     }
 
   return adapter->get_interface_remote (target
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/Remote_Object_Proxy_Impl.h b/TAO/tao/Remote_Object_Proxy_Impl.h
index b43bee455e1..0be4323cacb 100644
--- a/TAO/tao/Remote_Object_Proxy_Impl.h
+++ b/TAO/tao/Remote_Object_Proxy_Impl.h
@@ -39,16 +39,16 @@ public:
 
   virtual CORBA::Boolean _is_a (const CORBA::Object_ptr target,
                                 const CORBA::Char *logical_type_id
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
   virtual CORBA::Boolean _non_existent (const CORBA::Object_ptr target
-                                        TAO_ENV_ARG_DECL);
+                                        ACE_ENV_ARG_DECL);
 
   virtual CORBA_InterfaceDef_ptr _get_interface (
       const CORBA::Object_ptr target
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     );
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/RequestInfo_Util.cpp b/TAO/tao/RequestInfo_Util.cpp
index cf4a53ef73c..28c042faedb 100644
--- a/TAO/tao/RequestInfo_Util.cpp
+++ b/TAO/tao/RequestInfo_Util.cpp
@@ -9,7 +9,7 @@
 ACE_RCSID (tao, RequestInfo_Util, "$Id$")
 
 Dynamic::ParameterList *
-TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL)
 {
   Dynamic::ParameterList *parameter_list = 0;
   ACE_NEW_THROW_EX (parameter_list,
@@ -26,7 +26,7 @@ TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ExceptionList *
-TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_DECL)
 {
   Dynamic::ExceptionList *exception_list = 0;
   ACE_NEW_THROW_EX (exception_list,
@@ -43,7 +43,7 @@ TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::ContextList *
-TAO_RequestInfo_Util::make_context_list (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RequestInfo_Util::make_context_list (ACE_ENV_SINGLE_ARG_DECL)
 {
   Dynamic::ContextList *context_list = 0;
   ACE_NEW_THROW_EX (context_list,
@@ -60,7 +60,7 @@ TAO_RequestInfo_Util::make_context_list (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 Dynamic::RequestContext *
-TAO_RequestInfo_Util::make_request_context (TAO_ENV_SINGLE_ARG_DECL)
+TAO_RequestInfo_Util::make_request_context (ACE_ENV_SINGLE_ARG_DECL)
 {
   Dynamic::RequestContext *request_context = 0;
   ACE_NEW_THROW_EX (request_context,
@@ -78,7 +78,7 @@ TAO_RequestInfo_Util::make_request_context (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Any *
 TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   CORBA::Any *any = 0;
 
diff --git a/TAO/tao/RequestInfo_Util.h b/TAO/tao/RequestInfo_Util.h
index c757ec4025e..b2c854d1ed8 100644
--- a/TAO/tao/RequestInfo_Util.h
+++ b/TAO/tao/RequestInfo_Util.h
@@ -44,19 +44,19 @@ public:
    */
   //@{
   static Dynamic::ParameterList * make_parameter_list (
-    TAO_ENV_SINGLE_ARG_DECL);
+    ACE_ENV_SINGLE_ARG_DECL);
 
   static Dynamic::ExceptionList * make_exception_list (
-    TAO_ENV_SINGLE_ARG_DECL);
+    ACE_ENV_SINGLE_ARG_DECL);
 
   static Dynamic::ContextList * make_context_list (
-    TAO_ENV_SINGLE_ARG_DECL);
+    ACE_ENV_SINGLE_ARG_DECL);
 
   static Dynamic::RequestContext * make_request_context (
-    TAO_ENV_SINGLE_ARG_DECL);
+    ACE_ENV_SINGLE_ARG_DECL);
 
   static CORBA::Any * make_any (CORBA::Boolean tk_void_any
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
   //@}
 
 };
diff --git a/TAO/tao/Request_Dispatcher.cpp b/TAO/tao/Request_Dispatcher.cpp
index afd5eb958a6..586c2d5fd9a 100644
--- a/TAO/tao/Request_Dispatcher.cpp
+++ b/TAO/tao/Request_Dispatcher.cpp
@@ -14,13 +14,13 @@ void
 TAO_Request_Dispatcher::dispatch (TAO_ORB_Core *orb_core,
                                   TAO_ServerRequest &request,
                                   CORBA::Object_out forward_to
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Dispatch based on object key
   orb_core->adapter_registry ()->dispatch (request.object_key (),
                                            request,
                                            forward_to
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tao/Request_Dispatcher.h b/TAO/tao/Request_Dispatcher.h
index 4231dd684ef..b0f2d3a5b7b 100644
--- a/TAO/tao/Request_Dispatcher.h
+++ b/TAO/tao/Request_Dispatcher.h
@@ -39,7 +39,7 @@ public:
   virtual void dispatch (TAO_ORB_Core *orb_core,
                          TAO_ServerRequest &request,
                          CORBA::Object_out forward_to
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
index fc63264d7c5..c0414ca9eb6 100644
--- a/TAO/tao/Sequence.cpp
+++ b/TAO/tao/Sequence.cpp
@@ -24,7 +24,7 @@ void TAO_Base_Sequence::_shrink_buffer (CORBA::ULong, CORBA::ULong)
 void
 TAO_Base_Sequence::_downcast (void*,
                               CORBA_Object*
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
 {
   // default is no op.
   // @@ TODO Maybe throw an exception?
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
index 1e93f297116..d348bbdb710 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -73,7 +73,7 @@ public:
   /// object reference into the right type.
   virtual void _downcast (void *target,
                           CORBA_Object *src
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Used for sequences of object to convert from the derived type
   /// into the Object class.
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index 6f7bcefcf98..bd37ea592c0 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -608,11 +608,11 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
 template <class T, class T_var> void
 TAO_Unbounded_Object_Sequence<T,T_var>::_downcast (void* target,
                                                    CORBA_Object* src
-                                                   TAO_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL)
 {
   T **tmp = ACE_static_cast (T**, target);
 
-  *tmp = T_var::tao_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = T_var::tao_narrow (src ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 }
@@ -777,11 +777,11 @@ TAO_Bounded_Object_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl,
 template <class T, class T_var, size_t MAX> void
 TAO_Bounded_Object_Sequence<T, T_var,MAX>::_downcast (void* target,
                                                       CORBA_Object* src
-                                                      TAO_ENV_ARG_DECL)
+                                                      ACE_ENV_ARG_DECL)
 {
   T **tmp = ACE_static_cast (T**, target);
 
-  *tmp = T_var::tao_narrow (src TAO_ENV_ARG_PARAMETER);
+  *tmp = T_var::tao_narrow (src ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK;
 }
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index fe1ff095b0d..a6024391145 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -650,7 +650,7 @@ public:
                                CORBA::ULong old_length);
   virtual void _downcast (void* target,
                           CORBA_Object* src
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual CORBA_Object* _upcast (void* src) const;
 };
 
@@ -711,7 +711,7 @@ public:
                                CORBA::ULong old_length);
   virtual void _downcast (void* target,
                           CORBA_Object* src
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   virtual CORBA_Object* _upcast (void* src) const;
 };
 
diff --git a/TAO/tao/Service_Callbacks.cpp b/TAO/tao/Service_Callbacks.cpp
index b649fdf7a38..09a7467ef57 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -47,7 +47,7 @@ void
 TAO_Service_Callbacks::service_context_list (TAO_Stub *& /*stub*/ ,
                                              IOP::ServiceContextList & /*service_list*/,
                                              CORBA::Boolean
-                                             TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+                                             ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
 {
   return;
 }
@@ -56,7 +56,7 @@ int
 TAO_Service_Callbacks::raise_comm_failure (
     TAO_GIOP_Invocation * /*invoke*/,
     TAO_Profile * /*profile*/
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::COMM_FAILURE (
       CORBA_SystemException::_tao_minor_code (
@@ -70,7 +70,7 @@ int
 TAO_Service_Callbacks::raise_transient_failure (
     TAO_GIOP_Invocation * /*invoke*/,
     TAO_Profile * /*profile*/
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::TRANSIENT (
       CORBA_SystemException::_tao_minor_code (
diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h
index ec15ab0b0f4..dd8583a216c 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -70,19 +70,19 @@ public:
   virtual void service_context_list (TAO_Stub *&stub,
                                      IOP::ServiceContextList &service_list,
                                      CORBA::Boolean restart
-                                     TAO_ENV_ARG_DECL);
+                                     ACE_ENV_ARG_DECL);
 
   /// Allow the service layer to decide whether the COMM_FAILURE
   /// exception should be thrown or a reinvocation is needed
   virtual int raise_comm_failure (TAO_GIOP_Invocation *invoke,
                                   TAO_Profile *profile
-                                  TAO_ENV_ARG_DECL);
+                                  ACE_ENV_ARG_DECL);
 
   /// Allow the service layer to decide whether the TRANSIENT
   /// exception should be thrown or a reinvocation is needed
   virtual int raise_transient_failure (TAO_GIOP_Invocation *invoke,
                                        TAO_Profile *profile
-                                       TAO_ENV_ARG_DECL);
+                                       ACE_ENV_ARG_DECL);
 
 
   /**
diff --git a/TAO/tao/Services.cpp b/TAO/tao/Services.cpp
index 9aa4a1e5aa1..2878309c9f4 100644
--- a/TAO/tao/Services.cpp
+++ b/TAO/tao/Services.cpp
@@ -286,7 +286,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceDetail *&_
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ServiceDetail TAO_ENV_ARG_PARAMETER)) return 0; // not equal
+    if (!type->equal (CORBA::_tc_ServiceDetail ACE_ENV_ARG_PARAMETER)) return 0; // not equal
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
@@ -355,7 +355,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceInformatio
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ServiceInformation TAO_ENV_ARG_PARAMETER)) return 0; // not equal
+    if (!type->equal (CORBA::_tc_ServiceInformation ACE_ENV_ARG_PARAMETER)) return 0; // not equal
     ACE_TRY_CHECK;
     if (_tao_any.any_owns_data ())
     {
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index 25c13db8ed0..1f37cbdbc2e 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -95,7 +95,7 @@ TAO_DIOP_Connector::close (void)
 int
 TAO_DIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
                              TAO_Transport_Descriptor_Interface *desc
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
 {
   TAO_Transport *&transport = invocation->transport ();
   // ACE_Time_Value *max_wait_time = invocation->max_wait_time ();
@@ -190,7 +190,7 @@ TAO_DIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_DIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL)
+TAO_DIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The endpoint should be of the form:
   //    N.n@host:port/object_key
diff --git a/TAO/tao/Strategies/DIOP_Connector.h b/TAO/tao/Strategies/DIOP_Connector.h
index 7a946bbe269..f98c68b7ad2 100644
--- a/TAO/tao/Strategies/DIOP_Connector.h
+++ b/TAO/tao/Strategies/DIOP_Connector.h
@@ -54,7 +54,7 @@ public:
   int close (void);
   int connect (TAO_GIOP_Invocation *invocation,
                TAO_Transport_Descriptor_Interface *desc
-               TAO_ENV_ARG_DECL);
+               ACE_ENV_ARG_DECL);
   int preconnect (const char *preconnections);
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -66,7 +66,7 @@ protected:
 
   /// = More TAO_Connector methods, please check the documentation on
   ///   Pluggable.h
-  virtual TAO_Profile * make_profile (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Profile * make_profile (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Obtain tcp properties that must be used by this connector, i.e.,
   /// initialize <tcp_properties_>.
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index 25f4b6abaee..41401ee8b9c 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -163,7 +163,7 @@ TAO_DIOP_Profile::decode (TAO_InputCDR& cdr)
 
 void
 TAO_DIOP_Profile::parse_string (const char *ior
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   if (!ior || !*ior)
     {
@@ -329,7 +329,7 @@ TAO_DIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
 
 CORBA::ULong
 TAO_DIOP_Profile::hash (CORBA::ULong max
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
@@ -374,7 +374,7 @@ TAO_DIOP_Profile::add_endpoint (TAO_DIOP_Endpoint *endp)
 }
 
 char *
-TAO_DIOP_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
   TAO_ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/Strategies/DIOP_Profile.h b/TAO/tao/Strategies/DIOP_Profile.h
index 7891c0bbdde..1c270d87f0b 100644
--- a/TAO/tao/Strategies/DIOP_Profile.h
+++ b/TAO/tao/Strategies/DIOP_Profile.h
@@ -80,7 +80,7 @@ public:
   /// Initialize this object using the given input string.
   /// Url-style string contain only one endpoint.
   virtual void parse_string (const char *string
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /**
    * Return a string representation for this profile.
@@ -88,7 +88,7 @@ public:
    * This is used to create url-style reference.  Only one
    * endpoint is included into the string.
    */
-  virtual char * to_string (TAO_ENV_SINGLE_ARG_DECL);
+  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Initialize this object using the given CDR octet string.
   virtual int decode (TAO_InputCDR& cdr);
@@ -145,7 +145,7 @@ public:
 
   /// Return a hash value for this object.
   virtual CORBA::ULong hash (CORBA::ULong max
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /// Please refer to Profile.h for the documentation of this
   /// function.
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 74f4b4bcef4..0b1bb5aa53c 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -118,7 +118,7 @@ TAO_SHMIOP_Connector::close (void)
 int
 TAO_SHMIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
                                TAO_Transport_Descriptor_Interface *desc
-                               TAO_ENV_ARG_DECL_NOT_USED)
+                               ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
@@ -427,7 +427,7 @@ TAO_SHMIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_SHMIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SHMIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
 {
   // The endpoint should be of the form:
   //    N.n@port/object_key
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.h b/TAO/tao/Strategies/SHMIOP_Connector.h
index 608b4dce9f4..a98be96fdbe 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.h
+++ b/TAO/tao/Strategies/SHMIOP_Connector.h
@@ -60,7 +60,7 @@ public:
   int close (void);
   int connect (TAO_GIOP_Invocation *invocation,
                TAO_Transport_Descriptor_Interface *desc
-               TAO_ENV_ARG_DECL);
+               ACE_ENV_ARG_DECL);
   int preconnect (const char *preconnections);
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -72,7 +72,7 @@ protected:
 
   // = More TAO_Connector methods, please check the documentation on
   //   Pluggable.h
-  virtual TAO_Profile *make_profile (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
 
 public:
 
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index ff808afa49f..99bb7f2f3b8 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -176,7 +176,7 @@ TAO_SHMIOP_Profile::decode (TAO_InputCDR& cdr)
 
 void
 TAO_SHMIOP_Profile::parse_string (const char *string
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   if (!string || !*string)
     {
@@ -356,7 +356,7 @@ TAO_SHMIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
 
 CORBA::ULong
 TAO_SHMIOP_Profile::hash (CORBA::ULong max
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
@@ -389,7 +389,7 @@ TAO_SHMIOP_Profile::add_endpoint (TAO_SHMIOP_Endpoint *endp)
 }
 
 char *
-TAO_SHMIOP_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SHMIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
   TAO_ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index 2e5565d84b9..78262af04f9 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -78,11 +78,11 @@ public:
 
   /// Initialize this object using the given input string.
   virtual void parse_string (const char *string
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /// Return a string representation for this profile.
   /// client must deallocate memory.
-  char * to_string (TAO_ENV_SINGLE_ARG_DECL);
+  char * to_string (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Initialize this object using the given CDR octet string.
   int decode (TAO_InputCDR& cdr);
@@ -139,7 +139,7 @@ public:
 
   /// Return a hash value for this object.
   CORBA::ULong hash (CORBA::ULong max
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
   /// Please refer to Profile.h for the documentation of this method
   IOP::TaggedProfile &create_tagged_profile (void);
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index 69d0f11d632..c0ffb93c02f 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -551,7 +551,7 @@ TAO_UIOP_Acceptor::init_uiop_properties (void)
   int recv_buffer_size = this->orb_core_->orb_params ()->sock_rcvbuf_size ();
   int no_delay = 0;
 
-  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (tph != 0)
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index fd5615d9f11..8b60c725163 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -119,7 +119,7 @@ TAO_UIOP_Connector::close (void)
 int
 TAO_UIOP_Connector::connect (TAO_GIOP_Invocation *invocation,
                              TAO_Transport_Descriptor_Interface *desc
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (TAO_debug_level > 0)
       ACE_DEBUG ((LM_DEBUG,
@@ -396,7 +396,7 @@ TAO_UIOP_Connector::create_profile (TAO_InputCDR& cdr)
 }
 
 TAO_Profile *
-TAO_UIOP_Connector::make_profile (TAO_ENV_SINGLE_ARG_DECL)
+TAO_UIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Profile *profile = 0;
   ACE_NEW_THROW_EX (profile,
@@ -462,13 +462,13 @@ TAO_UIOP_Connector::init_uiop_properties (void)
   // lookup and caching are not done based on protocol
   // properties.
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   int send_buffer_size = this->orb_core ()->orb_params ()->sock_sndbuf_size ();
   int recv_buffer_size = this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
   int no_delay = 0;
 
-  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (TAO_ENV_SINGLE_ARG_PARAMETER);
+  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (tph != 0)
diff --git a/TAO/tao/Strategies/UIOP_Connector.h b/TAO/tao/Strategies/UIOP_Connector.h
index 96817b8545f..ab2c169ffc9 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -64,7 +64,7 @@ public:
   int close (void);
   int connect (TAO_GIOP_Invocation *invocation,
                TAO_Transport_Descriptor_Interface *desc
-               TAO_ENV_ARG_DECL);
+               ACE_ENV_ARG_DECL);
   int preconnect (const char *preconnections);
   TAO_Profile *create_profile (TAO_InputCDR& cdr);
 
@@ -81,7 +81,7 @@ protected:
    * Please check the documentation in Pluggable.h.
    */
   //@{
-  virtual TAO_Profile *make_profile (TAO_ENV_SINGLE_ARG_DECL);
+  virtual TAO_Profile *make_profile (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Obtains uiop properties that must be used by this connector, i.e.,
   /// initializes <uiop_properties_>.
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index 4db5801dca5..769dca3b406 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -98,7 +98,7 @@ TAO_UIOP_Profile::endpoint_count (void)
 
 void
 TAO_UIOP_Profile::parse_string (const char *string
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   if (!string || !*string)
     {
@@ -206,7 +206,7 @@ TAO_UIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
 
 CORBA::ULong
 TAO_UIOP_Profile::hash (CORBA::ULong max
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   // Get the hashvalue for all endpoints.
   CORBA::ULong hashval = 0;
@@ -240,7 +240,7 @@ TAO_UIOP_Profile::add_endpoint (TAO_UIOP_Endpoint *endp)
 
 
 char *
-TAO_UIOP_Profile::to_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_UIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   CORBA::String_var key;
   TAO_ObjectKey::encode_sequence_to_string (key.inout(),
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
index e88a037339a..ac792c9820e 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -77,11 +77,11 @@ public:
 
   /// Initialize this object using the given input string.
   virtual void parse_string (const char *string
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /// Return a string representation for this profile.
   /// client must deallocate memory.
-  virtual char * to_string (TAO_ENV_SINGLE_ARG_DECL);
+  virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Initialize this object using the given CDR octet string.
   virtual int decode (TAO_InputCDR& cdr);
@@ -138,7 +138,7 @@ public:
 
   /// Return a hash value for this object.
   virtual CORBA::ULong hash (CORBA::ULong max
-                             TAO_ENV_ARG_DECL);
+                             ACE_ENV_ARG_DECL);
 
   /// Please see the Profile.h for the documentation of this method
   virtual IOP::TaggedProfile &create_tagged_profile (void);
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 1f8cc76c277..2cbe38ae513 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -210,7 +210,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StringSeq *&
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CORBA::_tc_StringSeq TAO_ENV_ARG_PARAMETER);
+      type->equivalent (CORBA::_tc_StringSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -303,7 +303,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_WStringSeq *
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (CORBA::_tc_WStringSeq TAO_ENV_ARG_PARAMETER);
+      type->equivalent (CORBA::_tc_WStringSeq ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index cae38a4a02c..c49c57b0311 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -162,7 +162,7 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles)
 int
 TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
                            CORBA::ULong &index
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // We are creating the IOR info. Let us not be disturbed. So grab a
@@ -180,7 +180,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
         {
           this->get_profile_ior_info (*this->forward_profiles_,
                                       tmp_info
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           this->forwarded_ior_info_ = tmp_info;
@@ -207,7 +207,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
     {
       this->get_profile_ior_info (this->base_profiles_,
                                   tmp_info
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       this->ior_info_ = tmp_info;
@@ -235,7 +235,7 @@ TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
 int
 TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles,
                                 IOP::IOR *&ior_info
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -273,10 +273,10 @@ TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles,
 
 CORBA::ULong
 TAO_Stub::hash (CORBA::ULong max
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // we rely on the profile objects that its address info
-  return this->base_profiles_.hash (max TAO_ENV_ARG_PARAMETER);
+  return this->base_profiles_.hash (max ACE_ENV_ARG_PARAMETER);
 }
 
 // Expensive comparison of objref data, to see if two objrefs
@@ -398,7 +398,7 @@ private:
 
 CORBA::Policy_ptr
 TAO_Stub::get_policy (CORBA::PolicyType type
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
 
   if (this->policies_ == 0)
@@ -420,12 +420,12 @@ TAO_Stub::get_policy (CORBA::PolicyType type
   // e.g., to add methods for policy specific reconciliation, etc.
 
   return this->get_client_policy (type
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Policy_ptr
 TAO_Stub::get_client_policy (CORBA::PolicyType type
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   // No need to lock, the stub only changes its policies at
   // construction time...
@@ -435,7 +435,7 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type
   if (this->policies_ != 0)
     {
       result = this->policies_->get_policy (type
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -443,7 +443,7 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type
     {
       TAO_Policy_Current &policy_current = this->orb_core_->policy_current ();
       result = policy_current.get_policy (type
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -457,7 +457,7 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type
       if (policy_manager != 0)
         {
           result = policy_manager->get_policy (type
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::Policy::_nil ());
         }
     }
@@ -466,7 +466,7 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type
     {
       result = this->orb_core_->
               get_default_policies ()->get_policy (type
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
     }
 
@@ -476,7 +476,7 @@ TAO_Stub::get_client_policy (CORBA::PolicyType type
 TAO_Stub *
 TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
                                 CORBA::SetOverrideType set_add
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   // Notice the use of an explicit constructor....
   auto_ptr<TAO_Policy_Set> policy_manager (
@@ -486,31 +486,31 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
     {
       policy_manager->set_policy_overrides (policies,
                                             set_add
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   else if (this->policies_ == 0)
     {
       policy_manager->set_policy_overrides (policies,
                                             CORBA::SET_OVERRIDE
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   else
     {
       policy_manager->copy_from (this->policies_
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       policy_manager->set_policy_overrides (policies,
                                             set_add
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   TAO_Stub* stub = this->orb_core_->create_stub (this->type_id.in (),
                                                  this->base_profiles_
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   stub->policies_ = policy_manager.release ();
@@ -523,25 +523,25 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 
 CORBA::PolicyList *
 TAO_Stub::get_policy_overrides (const CORBA::PolicyTypeSeq &types
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   if (this->policies_ == 0)
     return 0;
 
   return this->policies_->get_policy_overrides (types
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 TAO_Stub::validate_connection (CORBA::PolicyList_out inconsistent_policies
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   // Use Locate Request to establish connection/make sure the object
   // is there ...
   TAO_GIOP_Locate_Request_Invocation locate_request (this,
                                                      this->orb_core_.get ());
 
-  locate_request.init_inconsistent_policies (TAO_ENV_SINGLE_ARG_PARAMETER);
+  locate_request.init_inconsistent_policies (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // @@ For some combinations of RTCORBA policies, location forwarding
@@ -552,10 +552,10 @@ TAO_Stub::validate_connection (CORBA::PolicyList_out inconsistent_policies
     {
       for (;;)
         {
-          locate_request.start (TAO_ENV_SINGLE_ARG_PARAMETER);
+          locate_request.start (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          int status = locate_request.invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+          int status = locate_request.invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // We'll get this only if the object was, in fact, forwarded.
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index 3726efd75ea..ad0fdb90550 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -107,21 +107,21 @@ public:
    * types.
    */
   virtual CORBA::Policy_ptr get_policy (CORBA::PolicyType type
-                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 
   virtual CORBA::Policy_ptr get_client_policy (CORBA::PolicyType type
-                                               TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual TAO_Stub* set_policy_overrides (const CORBA::PolicyList & policies,
                                           CORBA::SetOverrideType set_add
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual CORBA::PolicyList * get_policy_overrides (const CORBA::PolicyTypeSeq & types
-                                                    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::Boolean validate_connection (CORBA::PolicyList_out inconsistent_policies
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -161,7 +161,7 @@ public:
    * equivalent).
    */
   CORBA::ULong hash (CORBA::ULong maximum
-                     TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Implement the is_equivalent() method for the CORBA::Object
   CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj);
@@ -283,7 +283,7 @@ public:
    */
   int create_ior_info (IOP::IOR *&ior_info,
                        CORBA::ULong &index
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -313,7 +313,7 @@ private:
   /// THREAD-SAFE Create the IOR info
   int get_profile_ior_info (TAO_MProfile &profile,
                             IOP::IOR *&ior_info
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 
diff --git a/TAO/tao/Stub_Factory.h b/TAO/tao/Stub_Factory.h
index abe076c36df..5fa3dae9617 100644
--- a/TAO/tao/Stub_Factory.h
+++ b/TAO/tao/Stub_Factory.h
@@ -49,7 +49,7 @@ public:
   virtual TAO_Stub *create_stub (const char *repository_id,
                                  const TAO_MProfile &profiles,
                                  TAO_ORB_Core *orb_core
-                                 TAO_ENV_ARG_DECL) = 0;
+                                 ACE_ENV_ARG_DECL) = 0;
 };
 
 #include "ace/post.h"
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index b8f946f8763..185110e2394 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -300,10 +300,10 @@ TAO::BufferingConstraintPolicy_var::tao_nil (void)
 ::TAO::BufferingConstraintPolicy_ptr
 TAO::BufferingConstraintPolicy_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::TAO::BufferingConstraintPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::TAO::BufferingConstraintPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -384,15 +384,15 @@ TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void)
 
 TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return BufferingConstraintPolicy::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return BufferingConstraintPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
@@ -551,7 +551,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO::BufferingCons
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     CORBA::Boolean result =
-      type->equivalent (TAO::_tc_BufferingConstraint TAO_ENV_ARG_PARAMETER);
+      type->equivalent (TAO::_tc_BufferingConstraint ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index a7b10c3ff0c..18971c54055 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -176,7 +176,7 @@ TAO_NAMESPACE  TAO
     static BufferingConstraintPolicy_ptr tao_duplicate (BufferingConstraintPolicy_ptr);
     static void tao_release (BufferingConstraintPolicy_ptr);
     static BufferingConstraintPolicy_ptr tao_nil (void);
-    static BufferingConstraintPolicy_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+    static BufferingConstraintPolicy_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
     static CORBA::Object * tao_upcast (void *);
 
   private:
@@ -231,11 +231,11 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy
     static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj);
     static BufferingConstraintPolicy_ptr _narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static BufferingConstraintPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     static BufferingConstraintPolicy_ptr _nil (void)
       {
@@ -243,7 +243,7 @@ class TAO_Export BufferingConstraintPolicy: public virtual CORBA::Policy
       }
 
     virtual TAO::BufferingConstraint buffering_constraint (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
       ACE_THROW_SPEC ((
         CORBA::SystemException
diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i
index 72d73691ccf..b05d24f8ae2 100644
--- a/TAO/tao/TAOC.i
+++ b/TAO/tao/TAOC.i
@@ -200,10 +200,10 @@ tao_TAO_BufferingConstraintPolicy_nil (
 ACE_INLINE TAO::BufferingConstraintPolicy_ptr
 tao_TAO_BufferingConstraintPolicy_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return TAO::BufferingConstraintPolicy::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return TAO::BufferingConstraintPolicy::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/Thread_Lane_Resources.cpp b/TAO/tao/Thread_Lane_Resources.cpp
index c0be2f8005f..100b355798b 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -97,7 +97,7 @@ TAO_Thread_Lane_Resources::leader_follower (void)
 
 int
 TAO_Thread_Lane_Resources::open_acceptor_registry (int ignore_address
-                                                   TAO_ENV_ARG_DECL)
+                                                   ACE_ENV_ARG_DECL)
 {
   /// Access the acceptor registry.
   TAO_Acceptor_Registry &ar =
@@ -108,7 +108,7 @@ TAO_Thread_Lane_Resources::open_acceptor_registry (int ignore_address
     ar.open (&this->orb_core_,
              this->leader_follower ().reactor (),
              ignore_address
-              TAO_ENV_ARG_PARAMETER);
+              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return result;
diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h
index 7bf51b5e16f..bc038346759 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -50,7 +50,7 @@ public:
 
   /// Open the acceptor registry.
   int open_acceptor_registry (int ignore_address
-                              TAO_ENV_ARG_DECL);
+                              ACE_ENV_ARG_DECL);
 
   /// Finalize resources.
   void finalize (void);
diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h
index 54d5da90568..4c5270a1535 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Thread_Lane_Resources_Manager.h
@@ -48,7 +48,7 @@ public:
   virtual void finalize (void) = 0;
 
   /// Open default resources.
-  virtual int open_default_resources (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
+  virtual int open_default_resources (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
 
   /// Shutdown reactor.
   virtual void shutdown_reactor (void) = 0;
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
index d9067f95c14..dac0b617bad 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -359,7 +359,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TimeBase::UtcT *&_
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (TimeBase::_tc_UtcT TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (TimeBase::_tc_UtcT ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
@@ -442,7 +442,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TimeBase::Interval
   {
     CORBA::TypeCode_var type = _tao_any.type ();
 
-    CORBA::Boolean result = type->equivalent (TimeBase::_tc_IntervalT TAO_ENV_ARG_PARAMETER);
+    CORBA::Boolean result = type->equivalent (TimeBase::_tc_IntervalT ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     if (!result)
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
index 36ced983c1f..3513fb7342d 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
@@ -141,10 +141,10 @@ CORBA_TypeCodeFactory_var::tao_nil (void)
 ::CORBA_TypeCodeFactory_ptr
 CORBA_TypeCodeFactory_var::tao_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return ::CORBA_TypeCodeFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return ::CORBA_TypeCodeFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Object *
@@ -226,15 +226,15 @@ CORBA_TypeCodeFactory::~CORBA_TypeCodeFactory (void)
 
 CORBA_TypeCodeFactory_ptr CORBA_TypeCodeFactory::_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_TypeCodeFactory::_unchecked_narrow (obj TAO_ENV_ARG_PARAMETER);
+  return CORBA_TypeCodeFactory::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA_TypeCodeFactory_ptr CORBA_TypeCodeFactory::_unchecked_narrow (
     CORBA::Object_ptr obj
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   if (CORBA::is_nil (obj))
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
index 219e40e20e4..c12cd2ee338 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
@@ -97,7 +97,7 @@ public:
   static CORBA_TypeCodeFactory_ptr tao_duplicate (CORBA_TypeCodeFactory_ptr);
   static void tao_release (CORBA_TypeCodeFactory_ptr);
   static CORBA_TypeCodeFactory_ptr tao_nil (void);
-  static CORBA_TypeCodeFactory_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED);
+  static CORBA_TypeCodeFactory_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED);
   static CORBA::Object * tao_upcast (void *);
 
 private:
@@ -152,11 +152,11 @@ public:
   static CORBA_TypeCodeFactory_ptr _duplicate (CORBA_TypeCodeFactory_ptr obj);
   static CORBA_TypeCodeFactory_ptr _narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CORBA_TypeCodeFactory_ptr _unchecked_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   static CORBA_TypeCodeFactory_ptr _nil (void)
     {
@@ -167,7 +167,7 @@ public:
       const char * id,
       const char * name,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -178,7 +178,7 @@ public:
       const char * name,
       CORBA::TypeCode_ptr discriminator_type,
       const CORBA_UnionMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -188,7 +188,7 @@ public:
       const char * id,
       const char * name,
       const CORBA_EnumMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -198,7 +198,7 @@ public:
       const char * id,
       const char * name,
       CORBA::TypeCode_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -208,7 +208,7 @@ public:
       const char * id,
       const char * name,
       const CORBA_StructMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -217,7 +217,7 @@ public:
   virtual CORBA::TypeCode_ptr create_interface_tc (
       const char * id,
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -225,7 +225,7 @@ public:
 
   virtual CORBA::TypeCode_ptr create_string_tc (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -233,7 +233,7 @@ public:
 
   virtual CORBA::TypeCode_ptr create_wstring_tc (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -242,7 +242,7 @@ public:
   virtual CORBA::TypeCode_ptr create_fixed_tc (
       CORBA::UShort digits,
       CORBA::UShort scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -251,7 +251,7 @@ public:
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
       CORBA::TypeCode_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -260,7 +260,7 @@ public:
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
       CORBA::TypeCode_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -272,7 +272,7 @@ public:
       CORBA::Short type_modifier,
       CORBA::TypeCode_ptr concrete_base,
       const CORBA_ValueMemberSeq & members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -282,7 +282,7 @@ public:
       const char * id,
       const char * name,
       CORBA::TypeCode_ptr boxed_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -291,7 +291,7 @@ public:
   virtual CORBA::TypeCode_ptr create_native_tc (
       const char * id,
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -299,7 +299,7 @@ public:
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
       const char * id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -308,7 +308,7 @@ public:
   virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
       const char * id,
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -317,7 +317,7 @@ public:
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       const char * id,
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -326,7 +326,7 @@ public:
   virtual CORBA::TypeCode_ptr create_component_tc (
       const char * id,
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
@@ -335,7 +335,7 @@ public:
   virtual CORBA::TypeCode_ptr create_home_tc (
       const char * id,
       const char * name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
index bb6a7fe62f0..93d615564c7 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
@@ -50,10 +50,10 @@ tao_CORBA_TypeCodeFactory_nil (
 ACE_INLINE CORBA_TypeCodeFactory_ptr
 tao_CORBA_TypeCodeFactory_narrow (
     CORBA::Object *p
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
 {
-  return CORBA_TypeCodeFactory::_narrow (p TAO_ENV_ARG_PARAMETER);
+  return CORBA_TypeCodeFactory::_narrow (p ACE_ENV_ARG_PARAMETER);
 }
 
 ACE_INLINE CORBA::Object *
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
index 2461a250150..f3b9aa51a7c 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.cpp
@@ -15,7 +15,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc (
     const char * id,
     const char * name,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -24,7 +24,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_struct_tc (
   return tcf.create_struct_tc (id,
                                name,
                                members
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -33,7 +33,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc (
     const char * name,
     CORBA::TypeCode_ptr discriminator_type,
     const CORBA_UnionMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -43,7 +43,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_union_tc (
                               name,
                               discriminator_type,
                               members
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -51,7 +51,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc (
     const char * id,
     const char * name,
     const CORBA_EnumMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -60,7 +60,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_enum_tc (
   return tcf.create_enum_tc (id,
                              name,
                              members
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -68,7 +68,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc (
     const char * id,
     const char * name,
     CORBA::TypeCode_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -77,7 +77,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_alias_tc (
   return tcf.create_alias_tc (id,
                               name,
                               original_type
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -85,7 +85,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc (
     const char * id,
     const char * name,
     const CORBA_StructMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -94,14 +94,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_exception_tc (
   return tcf.create_exception_tc (id,
                                   name,
                                   members
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc (
     const char * id,
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -109,40 +109,40 @@ TAO_TypeCodeFactory_Adapter_Impl::create_interface_tc (
 
   return tcf.create_interface_tc (id,
                                   name
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_string_tc (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
   return tcf.create_string_tc (bound
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_wstring_tc (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
   return tcf.create_wstring_tc (bound
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc (
     CORBA::UShort digits,
     CORBA::UShort scale
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -150,14 +150,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_fixed_tc (
 
   return tcf.create_fixed_tc (digits,
                               scale
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc (
     CORBA::ULong bound,
     CORBA::TypeCode_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -165,14 +165,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_sequence_tc (
 
   return tcf.create_sequence_tc (bound,
                                  element_type
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_array_tc (
     CORBA::ULong length,
     CORBA::TypeCode_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -180,7 +180,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_array_tc (
 
   return tcf.create_array_tc (length,
                               element_type
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -190,7 +190,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc (
     CORBA::ValueModifier type_modifier,
     CORBA::TypeCode_ptr concrete_base,
     const CORBA_ValueMemberSeq & members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -201,7 +201,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_tc (
                               type_modifier,
                               concrete_base,
                               members
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -209,7 +209,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc (
     const char * id,
     const char * name,
     CORBA::TypeCode_ptr boxed_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -218,14 +218,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_value_box_tc (
   return tcf.create_value_box_tc (id,
                                   name,
                                   boxed_type
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_native_tc (
     const char * id,
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -233,27 +233,27 @@ TAO_TypeCodeFactory_Adapter_Impl::create_native_tc (
 
   return tcf.create_native_tc (id,
                                name
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_recursive_tc (
     const char * id
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_TypeCodeFactory_i tcf;
 
   return tcf.create_recursive_tc (id
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc (
     const char * id,
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -261,14 +261,14 @@ TAO_TypeCodeFactory_Adapter_Impl::create_abstract_interface_tc (
 
   return tcf.create_abstract_interface_tc (id,
                                            name
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc (
     const char * id,
     const char * name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -276,7 +276,7 @@ TAO_TypeCodeFactory_Adapter_Impl::create_local_interface_tc (
 
   return tcf.create_local_interface_tc (id,
                                         name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
 }
 
 // *********************************************************************
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
index 45764d9a832..4d751336df5 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
@@ -43,7 +43,7 @@ public:
       const char *id,
       const char *name,
       const CORBA_StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -52,7 +52,7 @@ public:
       const char *name,
       CORBA::TypeCode_ptr discriminator_type,
       const CORBA_UnionMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -60,7 +60,7 @@ public:
       const char *id,
       const char *name,
       const CORBA_EnumMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -68,7 +68,7 @@ public:
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -76,47 +76,47 @@ public:
       const char *id,
       const char *name,
       const CORBA_StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_interface_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_string_tc (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_wstring_tc (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_fixed_tc (
       CORBA::UShort digits,
       CORBA::UShort scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
       CORBA::TypeCode_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
       CORBA::TypeCode_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -126,7 +126,7 @@ public:
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
       const CORBA_ValueMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -134,34 +134,34 @@ public:
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr boxed_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
       const char *id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
index f3af1fe9ae1..882d11ecc90 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
@@ -27,7 +27,7 @@ CORBA::Object_ptr
 TAO_TypeCodeFactory_Loader::create_object (CORBA::ORB_ptr,
                                            int,
                                            char * []
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj;
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
index 7a02e826e44..cc6528ca3f0 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
@@ -39,7 +39,7 @@ public:
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            char *argv []
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Overload the base class method to create a new instance
   // of a TypeCodeFactory object.
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index 182ba3b48d2..6d4637b2259 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -17,7 +17,7 @@ TAO_TypeCodeFactory_i::~TAO_TypeCodeFactory_i (void)
 
 TAO_TypeCodeFactory_i *
 TAO_TypeCodeFactory_i::_narrow (CORBA::Object_ptr obj
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
 {
   if (CORBA::is_nil (obj))
     {
@@ -55,7 +55,7 @@ TAO_TypeCodeFactory_i::create_struct_tc (
     const char *id,
     const char *name,
     const CORBA_StructMemberSeq &members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -63,7 +63,7 @@ TAO_TypeCodeFactory_i::create_struct_tc (
                                         name,
                                         members,
                                         CORBA::tk_struct
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
@@ -72,7 +72,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
     const char *name,
     CORBA::TypeCode_ptr discriminator_type,
     const CORBA_UnionMemberSeq &members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -92,7 +92,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
 
   CORBA::Boolean good_disc_type =
     this->valid_disc_type (discriminator_type
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   if (!good_disc_type)
@@ -131,7 +131,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
             {
               CORBA::Boolean equiv =
                 members[i].type.in ()->equivalent (members[i - 1].type.in ()
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
               // If adjacent names are the same and their types are equivalent,
@@ -179,7 +179,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
 
       // Valid member type?
       valid_member = this->valid_content_type (tc_holder
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       if (!valid_member)
@@ -208,7 +208,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
 
           CORBA::Boolean equiv =
             discriminator_type->equivalent (tmp.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
           if (!equiv)
@@ -224,7 +224,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
     this->unique_label_values (members,
                                discriminator_type,
                                raw_default_index
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   if (!unique_labels)
@@ -265,7 +265,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
       if (index == raw_default_index)
         {
           // This is the default label - we have to find a legal value.
-          CORBA::TCKind kind = discriminator_type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::TCKind kind = discriminator_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
           this->compute_default_label (kind,
@@ -284,7 +284,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
           (void) TAO_Marshal_Object::perform_append (tc.in (),
                                                      &in,
                                                      &cdr
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
         }
 
@@ -318,7 +318,7 @@ TAO_TypeCodeFactory_i::create_enum_tc (
     const char *id,
     const char *name,
     const CORBA_EnumMemberSeq &members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -400,7 +400,7 @@ TAO_TypeCodeFactory_i::create_alias_tc (
     const char *id,
     const char *name,
     CORBA::TypeCode_ptr original_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -420,7 +420,7 @@ TAO_TypeCodeFactory_i::create_alias_tc (
 
   CORBA::Boolean valid_content =
     this->valid_content_type (original_type
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   if (!valid_content)
@@ -471,7 +471,7 @@ TAO_TypeCodeFactory_i::create_exception_tc (
     const char *id,
     const char *name,
     const CORBA_StructMemberSeq &members
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -479,27 +479,27 @@ TAO_TypeCodeFactory_i::create_exception_tc (
                                         name,
                                         members,
                                         CORBA::tk_except
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_interface_tc (
     const char *id,
     const char *name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
                                  CORBA::tk_objref
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_string_tc (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -527,7 +527,7 @@ TAO_TypeCodeFactory_i::create_string_tc (
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_wstring_tc (
     CORBA::ULong bound
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -556,7 +556,7 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_fixed_tc (
     CORBA::UShort /* digits */,
     CORBA::UShort /* scale */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -568,13 +568,13 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_sequence_tc (
     CORBA::ULong bound,
     CORBA::TypeCode_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean valid_element =
     this->valid_content_type (element_type
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   if (!valid_element)
@@ -616,13 +616,13 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_array_tc (
     CORBA::ULong length,
     CORBA::TypeCode_ptr element_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean valid_element =
     this->valid_content_type (element_type
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   if (!valid_element)
@@ -667,7 +667,7 @@ TAO_TypeCodeFactory_i::create_value_tc (
     CORBA::ValueModifier /* type_modifier */,
     CORBA::TypeCode_ptr /* concrete_base */,
     const CORBA_ValueMemberSeq & /* members */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -680,7 +680,7 @@ TAO_TypeCodeFactory_i::create_value_box_tc (
     const char *id,
     const char *name,
     CORBA::TypeCode_ptr boxed_type
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -701,7 +701,7 @@ TAO_TypeCodeFactory_i::create_value_box_tc (
 
   CORBA::Boolean valid_content =
     this->valid_content_type (boxed_type
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   if (!valid_content)
@@ -745,20 +745,20 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_native_tc (
     const char *id,
     const char *name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
                                  CORBA::tk_native
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_recursive_tc (
     const char * /* id */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -770,56 +770,56 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_abstract_interface_tc (
     const char *id,
     const char *name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
                                  CORBA::tk_abstract_interface
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_local_interface_tc (
     const char *id,
     const char *name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
                                  CORBA::tk_local_interface
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_component_tc (
     const char *id,
     const char *name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
                                  CORBA::tk_component
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_i::create_home_tc (
     const char *id,
     const char *name
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->create_tc_common (id,
                                  name,
                                  CORBA::tk_home
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1008,7 +1008,7 @@ TAO_TypeCodeFactory_i::create_tc_common (
     const char *id,
     const char *name,
     CORBA::TCKind kind
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1061,7 +1061,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
     const char *name,
     const CORBA_StructMemberSeq &members,
     CORBA::TCKind kind
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1111,7 +1111,7 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
       tc_holder = members[index].type.in ();
 
       valid_member = this->valid_content_type (tc_holder
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       if (!valid_member)
@@ -1221,9 +1221,9 @@ TAO_TypeCodeFactory_i::valid_id (const char *id)
 
 CORBA::Boolean
 TAO_TypeCodeFactory_i::valid_content_type (CORBA::TypeCode_ptr tc
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
 {
-  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (kind == CORBA::tk_null
@@ -1240,9 +1240,9 @@ CORBA::Boolean
 TAO_TypeCodeFactory_i::unique_label_values (const CORBA_UnionMemberSeq &members,
                                             CORBA::TypeCode_ptr disc_tc,
                                             CORBA::ULong default_index_slot
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
 {
-  CORBA::TCKind disc_kind = disc_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind disc_kind = disc_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = members.length ();
@@ -1392,9 +1392,9 @@ TAO_TypeCodeFactory_i::unique_label_values (const CORBA_UnionMemberSeq &members,
 
 CORBA::Boolean
 TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
-  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (kind == CORBA::tk_enum
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
index ad58d903275..919faf28219 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
@@ -50,7 +50,7 @@ public:
   /// = LocalObject methods
   static TAO_TypeCodeFactory_i *_narrow (
       CORBA::Object_ptr obj
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   virtual void *_tao_QueryInterface (ptr_arith_t type);
 
@@ -58,7 +58,7 @@ public:
       const char *id,
       const char *name,
       const CORBA_StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -67,7 +67,7 @@ public:
       const char *name,
       CORBA::TypeCode_ptr discriminator_type,
       const CORBA_UnionMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -75,7 +75,7 @@ public:
       const char *id,
       const char *name,
       const CORBA_EnumMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -83,7 +83,7 @@ public:
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -91,47 +91,47 @@ public:
       const char *id,
       const char *name,
       const CORBA_StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_interface_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_string_tc (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_wstring_tc (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_fixed_tc (
       CORBA::UShort digits,
       CORBA::UShort scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
       CORBA::TypeCode_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
       CORBA::TypeCode_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -141,7 +141,7 @@ public:
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
       const CORBA_ValueMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -149,48 +149,48 @@ public:
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr boxed_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
       const char *id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_component_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_home_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -206,7 +206,7 @@ private:
       const char *id,
       const char *name,
       CORBA::TCKind kind
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -216,7 +216,7 @@ private:
       const char *name,
       const CORBA_StructMemberSeq &members,
       CORBA::TCKind kind
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -225,13 +225,13 @@ private:
   CORBA::Boolean valid_name (const char *name);
   CORBA::Boolean valid_id (const char *id);
   CORBA::Boolean valid_content_type (CORBA::TypeCode_ptr tc
-                                     TAO_ENV_ARG_DECL);
+                                     ACE_ENV_ARG_DECL);
   CORBA::Boolean unique_label_values (const CORBA_UnionMemberSeq &members,
                                       CORBA::TypeCode_ptr disc_tc,
                                       CORBA::ULong default_index_slot
-                                      TAO_ENV_ARG_DECL);
+                                      ACE_ENV_ARG_DECL);
   CORBA::Boolean valid_disc_type (CORBA::TypeCode_ptr tc
-                                  TAO_ENV_ARG_DECL);
+                                  ACE_ENV_ARG_DECL);
 
   /// A string in a TAO typecode contains padding to give it a
   /// total size which is a multiple of 4 bytes.
diff --git a/TAO/tao/TypeCodeFactory_Adapter.cpp b/TAO/tao/TypeCodeFactory_Adapter.cpp
index 16c3ba57982..52fbf2498fa 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.cpp
+++ b/TAO/tao/TypeCodeFactory_Adapter.cpp
@@ -17,7 +17,7 @@ TAO_TypeCodeFactory_Adapter::create_struct_tc (
     const char * /* id */,
     const char * /* name */,
     const CORBA_StructMemberSeq & /* members */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -30,7 +30,7 @@ TAO_TypeCodeFactory_Adapter::create_union_tc (
     const char * /* name */,
     CORBA::TypeCode_ptr /* discriminator_type */,
     const CORBA_UnionMemberSeq & /* members */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -42,7 +42,7 @@ TAO_TypeCodeFactory_Adapter::create_enum_tc (
     const char * /* id */,
     const char * /* name */,
     const CORBA_EnumMemberSeq & /* members */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -54,7 +54,7 @@ TAO_TypeCodeFactory_Adapter::create_alias_tc (
     const char * /* id */,
     const char * /* name */,
     CORBA::TypeCode_ptr /* original_type */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -66,7 +66,7 @@ TAO_TypeCodeFactory_Adapter::create_exception_tc (
     const char * /* id */,
     const char * /* name */,
     const CORBA_StructMemberSeq & /* members */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -77,7 +77,7 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_interface_tc (
     const char * /* id */,
     const char * /* name */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -87,7 +87,7 @@ TAO_TypeCodeFactory_Adapter::create_interface_tc (
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_string_tc (
     CORBA::ULong /* bound */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -97,7 +97,7 @@ TAO_TypeCodeFactory_Adapter::create_string_tc (
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_wstring_tc (
     CORBA::ULong /* bound */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -108,7 +108,7 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_fixed_tc (
     CORBA::UShort /* digits */,
     CORBA::UShort /* scale */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -119,7 +119,7 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_sequence_tc (
     CORBA::ULong /* bound */,
     CORBA::TypeCode_ptr /* element_type */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -130,7 +130,7 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_array_tc (
     CORBA::ULong /* length */,
     CORBA::TypeCode_ptr /* element_type */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -144,7 +144,7 @@ TAO_TypeCodeFactory_Adapter::create_value_tc (
     CORBA::ValueModifier /* type_modifier */,
     CORBA::TypeCode_ptr /* concrete_base */,
     const CORBA_ValueMemberSeq & /* members */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -156,7 +156,7 @@ TAO_TypeCodeFactory_Adapter::create_value_box_tc (
     const char * /* id */,
     const char * /* name */,
     CORBA::TypeCode_ptr  /* boxed_type */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -167,7 +167,7 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_native_tc (
     const char * /* id */,
     const char * /* name */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -177,7 +177,7 @@ TAO_TypeCodeFactory_Adapter::create_native_tc (
 CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_recursive_tc (
     const char * /* id */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -188,7 +188,7 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_abstract_interface_tc (
     const char * /* id */,
     const char * /* name */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -199,7 +199,7 @@ CORBA::TypeCode_ptr
 TAO_TypeCodeFactory_Adapter::create_local_interface_tc (
     const char * /* id */,
     const char * /* name */
-    TAO_ENV_ARG_DECL_NOT_USED
+    ACE_ENV_ARG_DECL_NOT_USED
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index 995b566f073..3500d37aa5a 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -41,7 +41,7 @@ public:
       const char *id,
       const char *name,
       const CORBA_StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -50,7 +50,7 @@ public:
       const char *name,
       CORBA::TypeCode_ptr discriminator_type,
       const CORBA_UnionMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -58,7 +58,7 @@ public:
       const char *id,
       const char *name,
       const CORBA_EnumMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -66,7 +66,7 @@ public:
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr original_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -74,47 +74,47 @@ public:
       const char *id,
       const char *name,
       const CORBA_StructMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_interface_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_string_tc (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_wstring_tc (
       CORBA::ULong bound
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_fixed_tc (
       CORBA::UShort digits,
       CORBA::UShort scale
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_sequence_tc (
       CORBA::ULong bound,
       CORBA::TypeCode_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_array_tc (
       CORBA::ULong length,
       CORBA::TypeCode_ptr element_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -124,7 +124,7 @@ public:
       CORBA::ValueModifier type_modifier,
       CORBA::TypeCode_ptr concrete_base,
       const CORBA_ValueMemberSeq &members
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -132,34 +132,34 @@ public:
       const char *id,
       const char *name,
       CORBA::TypeCode_ptr boxed_type
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_native_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_recursive_tc (
       const char *id
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr create_local_interface_tc (
       const char *id,
       const char *name
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 254bfb5eb31..8d871401477 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -42,7 +42,7 @@ void CORBA_TypeCode::Bounds::_raise (void)
 
 void CORBA_TypeCode::Bounds::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << this->_id ())
@@ -51,7 +51,7 @@ void CORBA_TypeCode::Bounds::_tao_encode (
 }
 
 void CORBA_TypeCode::Bounds::_tao_decode (TAO_InputCDR &
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -84,7 +84,7 @@ void CORBA_TypeCode::BadKind::_raise (void)
 
 void CORBA_TypeCode::BadKind::_tao_encode (
     TAO_OutputCDR &cdr
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   if (cdr << this->_id ())
@@ -93,7 +93,7 @@ void CORBA_TypeCode::BadKind::_tao_encode (
 }
 
 void CORBA_TypeCode::BadKind::_tao_decode (TAO_InputCDR &
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
@@ -261,7 +261,7 @@ CORBA_TypeCode::~CORBA_TypeCode (void)
 
 CORBA::TypeCode_ptr
 CORBA_TypeCode::member_type (CORBA::ULong slot
-                             TAO_ENV_ARG_DECL) const
+                             ACE_ENV_ARG_DECL) const
 {
   CORBA::TypeCode_ptr typecode = 0;
 
@@ -279,7 +279,7 @@ CORBA_TypeCode::member_type (CORBA::ULong slot
     {
       typecode = CORBA::TypeCode::_duplicate (
                      this->private_member_type (slot
-                                                 TAO_ENV_ARG_PARAMETER)
+                                                 ACE_ENV_ARG_PARAMETER)
                    );
     }
 
@@ -290,7 +290,7 @@ CORBA_TypeCode::member_type (CORBA::ULong slot
 
 const char *
 CORBA_TypeCode::member_name (CORBA::ULong slot
-                             TAO_ENV_ARG_DECL) const
+                             ACE_ENV_ARG_DECL) const
 {
   if (this->private_state_->tc_member_count_known_
       && this->private_state_->tc_member_name_list_known_)
@@ -308,14 +308,14 @@ CORBA_TypeCode::member_name (CORBA::ULong slot
   else
     {
       return this->private_member_name (slot
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
     }
 }
 
 // Return the label of the i-th member.  Applicable only to CORBA::tk_union
 CORBA::Any_ptr
 CORBA_TypeCode::member_label (CORBA::ULong slot
-                              TAO_ENV_ARG_DECL) const
+                              ACE_ENV_ARG_DECL) const
 {
   CORBA::Any_ptr retval = 0;
 
@@ -339,7 +339,7 @@ CORBA_TypeCode::member_label (CORBA::ULong slot
   else
     {
       CORBA::Any_ptr label = this->private_member_label (slot
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_NEW_RETURN (retval,
@@ -352,7 +352,7 @@ CORBA_TypeCode::member_label (CORBA::ULong slot
 
 // only applicable to CORBA::tk_unions
 CORBA::TypeCode_ptr
-CORBA_TypeCode::discriminator_type (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const
 {
   if (this->kind_ != CORBA::tk_union)
     ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), (CORBA::TypeCode_ptr)0);
@@ -363,7 +363,7 @@ CORBA_TypeCode::discriminator_type (TAO_ENV_SINGLE_ARG_DECL) const
              );
 
   CORBA::TypeCode_ptr type =
-    this->private_discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->private_discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return CORBA_TypeCode::_duplicate (type);
@@ -371,7 +371,7 @@ CORBA_TypeCode::discriminator_type (TAO_ENV_SINGLE_ARG_DECL) const
 
 // only applicable to CORBA::tk_unions
 CORBA::Long
-CORBA_TypeCode::default_index (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::default_index (ACE_ENV_SINGLE_ARG_DECL) const
 {
   if (this->kind_ != CORBA::tk_union)
     ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
@@ -379,12 +379,12 @@ CORBA_TypeCode::default_index (TAO_ENV_SINGLE_ARG_DECL) const
   if (this->private_state_->tc_default_index_used_known_)
     return this->private_state_->tc_default_index_used_;
   else
-    return this->private_default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->private_default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // returns the length. Applicable only to string, sequence, and arrays
 CORBA::ULong
-CORBA_TypeCode::length (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::length (ACE_ENV_SINGLE_ARG_DECL) const
 {
   // a switch stmt, unfortunately, doesn't get inlined
   if (this->kind_ == CORBA::tk_sequence
@@ -395,7 +395,7 @@ CORBA_TypeCode::length (TAO_ENV_SINGLE_ARG_DECL) const
       if (this->private_state_->tc_length_known_)
         return this->private_state_->tc_length_;
       else
-        return this->private_length (TAO_ENV_SINGLE_ARG_PARAMETER);
+        return this->private_length (ACE_ENV_SINGLE_ARG_PARAMETER);
     }
   else
     ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
@@ -403,7 +403,7 @@ CORBA_TypeCode::length (TAO_ENV_SINGLE_ARG_DECL) const
 
 // returns the typecode. Applicable only to string, sequence, and arrays
 CORBA::TypeCode_ptr
-CORBA_TypeCode::content_type (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::content_type (ACE_ENV_SINGLE_ARG_DECL) const
 {
   if (this->kind_ == CORBA::tk_sequence
       || this->kind_ == CORBA::tk_array
@@ -416,7 +416,7 @@ CORBA_TypeCode::content_type (TAO_ENV_SINGLE_ARG_DECL) const
       else
         {
           CORBA::TypeCode_ptr tmp =
-            this->private_content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->private_content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
           return CORBA_TypeCode::_duplicate (tmp);
@@ -428,7 +428,7 @@ CORBA_TypeCode::content_type (TAO_ENV_SINGLE_ARG_DECL) const
 }
 
 CORBA::TypeCode_ptr
-CORBA_TypeCode::concrete_base_type (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const
 {
   if (this->private_state_->tc_concrete_base_type_known_)
     {
@@ -439,9 +439,9 @@ CORBA_TypeCode::concrete_base_type (TAO_ENV_SINGLE_ARG_DECL) const
   else
     {
       CORBA::TypeCode_ptr tmp =
-        this->private_concrete_base_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->private_concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-      
+
       return CORBA_TypeCode::_duplicate (tmp);
     }
 }
@@ -666,7 +666,7 @@ TC_Private_State::~TC_Private_State (void)
                   CORBA::string_free (this->tc_member_name_list_ [i]);
                   this->tc_member_name_list_ [i] = 0;
                 }
-              
+
               delete [] this->tc_member_name_list_;
               this->tc_member_name_list_ = 0;
             }
@@ -680,13 +680,13 @@ TC_Private_State::~TC_Private_State (void)
                 {
                   CORBA::release (this->tc_member_type_list_[i]);
                 }
-              
+
               // Now free up the array.
               delete [] this->tc_member_type_list_;
               this->tc_member_type_list_ = 0;
             }
           this->tc_member_count_ = 0;
-          
+
           // free up concrete base value typecode
           if (this->tc_concrete_base_type_known_)
             {
@@ -696,7 +696,7 @@ TC_Private_State::~TC_Private_State (void)
             }
           break;
       }
-      
+
       default:
         // nothing to do
         break;
@@ -707,7 +707,7 @@ TC_Private_State::~TC_Private_State (void)
 CORBA::Boolean
 CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
                             CORBA::Boolean equiv_only
-                            TAO_ENV_ARG_DECL) const
+                            ACE_ENV_ARG_DECL) const
 {
   // This will catch applications that haven't initialized an ORB.
   if (CORBA::is_nil (tc))
@@ -731,14 +731,14 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
 
       while (status)
         {
-          rcvr = rcvr->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+          rcvr = rcvr->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          status = (rcvr->kind (TAO_ENV_SINGLE_ARG_PARAMETER) == CORBA::tk_alias);
+          status = (rcvr->kind (ACE_ENV_SINGLE_ARG_PARAMETER) == CORBA::tk_alias);
           ACE_CHECK_RETURN (0);
         }
 
-      CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       status = (kind == CORBA::tk_alias);
 
@@ -750,17 +750,17 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
 
       while (status)
         {
-          tcvar = tcvar->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
           status = (kind == CORBA::tk_alias);
         }
 
-      kind = rcvr->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      kind = rcvr->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-      CORBA::TCKind other_kind = tcvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind other_kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (kind != other_kind)
@@ -770,10 +770,10 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
       // typecode kinds are same
       return rcvr->private_equal (tcvar.in (),
                                   equiv_only
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
     }
 
-  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   if (this->kind_ != kind)
     // simple case
@@ -782,7 +782,7 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
   // typecode kinds are same
   return this->private_equal (tc,
                               equiv_only
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 // check if typecodes are equal. Equality is based on a mix of structural
@@ -791,7 +791,7 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
 CORBA::Boolean
 CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr tc,
                                CORBA::Boolean equiv_only
-                               TAO_ENV_ARG_DECL) const
+                               ACE_ENV_ARG_DECL) const
 {
   // We come in here only if the typecode kinds of both are same
   // Handle each complex typecode separately.
@@ -821,48 +821,48 @@ CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr tc,
     case CORBA::tk_objref:
       return this->private_equal_objref (tc,
                                          equiv_only
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
     case CORBA::tk_struct:
       return this->private_equal_struct (tc,
                                          equiv_only
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
     case CORBA::tk_union:
       return this->private_equal_union (tc,
                                         equiv_only
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
     case CORBA::tk_enum:
       return this->private_equal_enum (tc,
                                        equiv_only
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
     case CORBA::tk_string:
       return this->private_equal_string (tc,
                                          equiv_only
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
     case CORBA::tk_wstring:
       return this->private_equal_wstring (tc,
                                           equiv_only
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
     case CORBA::tk_sequence:
       return this->private_equal_sequence (tc,
                                            equiv_only
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
     case CORBA::tk_array:
       return this->private_equal_array (tc,
                                         equiv_only
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
     case CORBA::tk_alias:
       return this->private_equal_alias (tc,
                                         equiv_only
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
     case CORBA::tk_except:
       return this->private_equal_except (tc,
                                          equiv_only
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
     case CORBA::tk_value:
       return this->private_equal_valuetype (tc,
                                             equiv_only
-                                            TAO_ENV_ARG_PARAMETER);
-                         
+                                            ACE_ENV_ARG_PARAMETER);
+
     case ~0u: // indirection
       {
         // indirection offset must be same
@@ -878,15 +878,15 @@ CORBA::Boolean
 CORBA_TypeCode::private_equal_objref (
     CORBA::TypeCode_ptr tc,
     CORBA::Boolean equiv_only
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   // compare the repoID and name, of which the name is optional as per GIOP
   // spec. However, the repoID is mandatory.
-  const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!ACE_OS::strcmp (my_id, tc_id))
@@ -900,10 +900,10 @@ CORBA_TypeCode::private_equal_objref (
       else
         {
           // same repository IDs. Now check their names
-          const char *myname = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+          const char *myname = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          const char *tcname = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+          const char *tcname = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if ((ACE_OS::strlen (myname) > 1) &&
@@ -925,15 +925,15 @@ CORBA::Boolean
 CORBA_TypeCode::private_equal_struct (
     CORBA::TypeCode_ptr tc,
     CORBA::Boolean equiv_only
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   // For structs the repoID and names are optional. However, if provided,
   // we must compare them
-  const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // compare repoIDs if they exist
@@ -954,10 +954,10 @@ CORBA_TypeCode::private_equal_struct (
   // Skipped by equivalent().
   if (!equiv_only)
     {
-      const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      const char *my_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      const char *tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Compare names if they exist.
@@ -968,10 +968,10 @@ CORBA_TypeCode::private_equal_struct (
     }
 
   // Check if the member count is same.
-  CORBA::ULong my_count = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong my_count = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (my_count != tc_count)
@@ -1003,11 +1003,11 @@ CORBA_TypeCode::private_equal_struct (
       if (!equiv_only)
         {
           const char *my_member_name =
-            this->member_name (i TAO_ENV_ARG_PARAMETER);
+            this->member_name (i ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           const char *tc_member_name =
-            tc->member_name (i TAO_ENV_ARG_PARAMETER);
+            tc->member_name (i ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (ACE_OS::strlen (my_member_name) > 1
@@ -1019,11 +1019,11 @@ CORBA_TypeCode::private_equal_struct (
 
       // now compare the typecodes of the members
       CORBA::TypeCode_var my_member_tc = this->member_type (i
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CORBA::TypeCode_var tc_member_tc = tc->member_type (i
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // One of our members may be recursive, but not through us.
@@ -1036,7 +1036,7 @@ CORBA_TypeCode::private_equal_struct (
       CORBA::Boolean flag =
         my_member_tc->equ_common (tc_member_tc.in (),
                                   equiv_only
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (!flag)
@@ -1049,14 +1049,14 @@ CORBA_TypeCode::private_equal_struct (
 CORBA::Boolean
 CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
                                      CORBA::Boolean equiv_only
-                                     TAO_ENV_ARG_DECL) const
+                                     ACE_ENV_ARG_DECL) const
 {
   // For unions the repoID and names are optional. However, if provided, we
   // must compare them
-  const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // compare repoIDs if they exist
@@ -1077,10 +1077,10 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
   // Skipped by equivalent().
   if (!equiv_only)
     {
-      const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      const char *my_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      const char *tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Compare names if they exist.
@@ -1093,36 +1093,36 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
 
   // check if the discriminant type is same
   CORBA::TypeCode_var my_discrim =
-    this->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::TypeCode_var tc_discrim =
-    tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Boolean status = my_discrim->equ_common (tc_discrim.in (),
                                                   equiv_only
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!status)
     return 0;
 
   // check the default used
-  CORBA::Long my_default = this->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Long my_default = this->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Long tc_default = tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Long tc_default = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (my_default != tc_default)
     return 0;
 
   // check if the member count is same
-  CORBA::ULong my_count = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong my_count = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (my_count != tc_count)
@@ -1156,11 +1156,11 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
       if (!equiv_only)
         {
           const char *my_member_name = this->member_name (i
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           const char *tc_member_name = tc->member_name (i
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (ACE_OS::strlen (my_member_name) > 1
@@ -1172,11 +1172,11 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
 
       // now compare the typecodes of the members
       CORBA::TypeCode_var my_member_tc = this->member_type (i
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CORBA::TypeCode_var tc_member_tc = tc->member_type (i
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // One of our members may be recursive, but not through us.
@@ -1188,7 +1188,7 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
 
       CORBA::Boolean flag = my_member_tc->equ_common (tc_member_tc.in (),
                                                       equiv_only
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (!flag)
@@ -1201,14 +1201,14 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
 CORBA::Boolean
 CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
                                     CORBA::Boolean equiv_only
-                                    TAO_ENV_ARG_DECL) const
+                                    ACE_ENV_ARG_DECL) const
 {
   // For enums the repoID and names are optional. However, if provided, we
   // must compare them
-  const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // compare repoIDs if they exist
@@ -1229,10 +1229,10 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
   // Skipped by equivalent().
   if (!equiv_only)
     {
-      const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      const char *my_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      const char *tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Compare names if they exist.
@@ -1244,10 +1244,10 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
     }
 
   // check if the member count is same
-  CORBA::ULong my_count = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong my_count = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (my_count != tc_count)
@@ -1259,11 +1259,11 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
       if (!equiv_only)
         {
           const char *my_member_name = this->member_name (i
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           const char *tc_member_name = tc->member_name (i
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (ACE_OS::strlen (my_member_name) > 1
@@ -1281,14 +1281,14 @@ CORBA::Boolean
 CORBA_TypeCode::private_equal_string (
     CORBA::TypeCode_ptr tc,
     CORBA::Boolean /* equiv_only */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   // compare the lengths
-  CORBA::ULong my_len = this->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong my_len = this->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_len = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong tc_len = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return (my_len == tc_len);
@@ -1298,14 +1298,14 @@ CORBA::Boolean
 CORBA_TypeCode::private_equal_wstring (
     CORBA::TypeCode_ptr tc,
     CORBA::Boolean /* equiv_only */
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   // compare the lengths
-  CORBA::ULong my_len = this->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong my_len = this->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_len = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong tc_len = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return (my_len == tc_len);
@@ -1315,30 +1315,30 @@ CORBA::Boolean
 CORBA_TypeCode::private_equal_sequence (
     CORBA::TypeCode_ptr tc,
     CORBA::Boolean equiv_only
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   // this involves comparing the typecodes of the element type as well
   // as the bounds
-  CORBA::TypeCode_var my_elem = this->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var my_elem = this->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::TypeCode_var tc_elem = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc_elem = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Boolean status = my_elem->equ_common (tc_elem.in (),
                                                equiv_only
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!status)
     return 0;
 
   // now check if bounds are same
-  CORBA::ULong my_len = this->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong my_len = this->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_len = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong tc_len = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return (my_len == tc_len);
@@ -1347,31 +1347,31 @@ CORBA_TypeCode::private_equal_sequence (
 CORBA::Boolean
 CORBA_TypeCode::private_equal_array (CORBA::TypeCode_ptr tc,
                                      CORBA::Boolean equiv_only
-                                     TAO_ENV_ARG_DECL) const
+                                     ACE_ENV_ARG_DECL) const
 {
   // exactly like sequence
   return this->private_equal_sequence (tc,
                                        equiv_only
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_alias (CORBA::TypeCode_ptr tc,
                                      CORBA::Boolean equiv_only
-                                     TAO_ENV_ARG_DECL) const
+                                     ACE_ENV_ARG_DECL) const
 {
   // for structs the repoID and names are optional. However, if provided,
   // we must compare them
-  const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *my_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // compare repoIDs if they exist
@@ -1385,28 +1385,28 @@ CORBA_TypeCode::private_equal_alias (CORBA::TypeCode_ptr tc,
       return 0;
 
   // now compare element typecodes
-  CORBA::TypeCode_var my_elem = this->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var my_elem = this->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::TypeCode_var tc_elem = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc_elem = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return my_elem->equ_common (tc_elem.in (),
                               equiv_only
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
 CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
                                       CORBA::Boolean equiv_only
-                                      TAO_ENV_ARG_DECL) const
+                                      ACE_ENV_ARG_DECL) const
 {
   // exactly similar to structs, except that the repository ID is mandatory
 
-  const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (ACE_OS::strcmp (my_id, tc_id))
@@ -1423,10 +1423,10 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
   // Now compare names. They may be optional - skipped by equivalent().
   if (!equiv_only)
     {
-      const char *my_name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      const char *my_name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      const char *tc_name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      const char *tc_name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       // Compare names if they exist.
@@ -1438,10 +1438,10 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
     }
 
   // check if the member count is same
-  CORBA::ULong my_count = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong my_count = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::ULong tc_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong tc_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (my_count != tc_count)
@@ -1453,11 +1453,11 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
       if (!equiv_only)
         {
           const char *my_member_name = this->member_name (i
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           const char *tc_member_name = tc->member_name (i
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (ACE_OS::strlen (my_member_name) > 1
@@ -1468,15 +1468,15 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
         }
 
       // now compare the typecodes of the members
-      CORBA::TypeCode_var my_member_tc = this->member_type (i TAO_ENV_ARG_PARAMETER);
+      CORBA::TypeCode_var my_member_tc = this->member_type (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TypeCode_var tc_member_tc = tc->member_type (i TAO_ENV_ARG_PARAMETER);
+      CORBA::TypeCode_var tc_member_tc = tc->member_type (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CORBA::Boolean flag = my_member_tc->equ_common (tc_member_tc.in (),
                                                       equiv_only
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (!flag)
@@ -1492,15 +1492,15 @@ CORBA::Boolean
 CORBA_TypeCode::private_equal_valuetype (
     CORBA::TypeCode_ptr tc,
     CORBA::Boolean equiv_only
-    TAO_ENV_ARG_DECL
+    ACE_ENV_ARG_DECL
   ) const
 {
   // compare the repoID and name, of which the name is optional as per GIOP
   // spec. However, the repoID is mandatory.
-  const char *my_id = this->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *my_id = this->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  const char *tc_id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *tc_id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!ACE_OS::strcmp (my_id, tc_id))
@@ -1514,10 +1514,10 @@ CORBA_TypeCode::private_equal_valuetype (
       else
         {
           // same repository IDs. Now check their names
-          const char *myname = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+          const char *myname = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
-          const char *tcname = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+          const char *tcname = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if ((ACE_OS::strlen (myname) > 1) &&
@@ -1543,7 +1543,7 @@ CORBA_TypeCode::private_equal_valuetype (
 // Valid only for objref, struct, union, enum, alias, and except. Raises
 // BadKind exception for the rest of the cases.
 const char *
-CORBA_TypeCode::private_id (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::private_id (ACE_ENV_SINGLE_ARG_DECL) const
 {
   switch (this->kind_)
     {
@@ -1583,7 +1583,7 @@ CORBA_TypeCode::private_id (TAO_ENV_SINGLE_ARG_DECL) const
 
 // return the name. The string is owned by the typecode
 const char *
-CORBA_TypeCode::private_name (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::private_name (ACE_ENV_SINGLE_ARG_DECL) const
 {
   switch (this->kind_)
     {
@@ -1637,7 +1637,7 @@ CORBA_TypeCode::private_name (TAO_ENV_SINGLE_ARG_DECL) const
 // For the rest of the cases, raises the BadKind exception.
 
 CORBA::ULong
-CORBA_TypeCode::private_member_count (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::private_member_count (ACE_ENV_SINGLE_ARG_DECL) const
 {
   switch (kind_)
     {
@@ -1757,7 +1757,7 @@ CORBA_TypeCode::private_member_count (TAO_ENV_SINGLE_ARG_DECL) const
 
 CORBA::TypeCode_ptr
 CORBA_TypeCode::private_member_type (CORBA::ULong slot
-                                     TAO_ENV_ARG_DECL) const
+                                     ACE_ENV_ARG_DECL) const
 {
   CORBA::ULong temp, mcount;
 
@@ -1772,7 +1772,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot
     {
     case CORBA::tk_except:
     case CORBA::tk_struct:              // index from 0
-      mcount = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mcount = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN ((CORBA::TypeCode_ptr)0);
 
       {
@@ -1813,7 +1813,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot
             CORBA_TypeCode::_tao_decode (this,
                                          stream,
                                          member_type
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
             ACE_CHECK_RETURN (0);
           }
 
@@ -1828,7 +1828,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot
       ACE_NOTREACHED (break;)
 
     case CORBA::tk_union:            // index from 0
-      mcount = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mcount = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN ((CORBA::TypeCode_ptr)0);
 
       {
@@ -1859,7 +1859,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot
 
         // get the typecode for the discriminator
         CORBA::TypeCode_ptr disc_tc =
-          this->private_discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->private_discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
         // compute the typecodes for all the members and return the
         // required one
         ACE_CHECK_RETURN (0);
@@ -1871,7 +1871,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot
             CORBA::TypeCode::traverse_status status =
               TAO_Marshal_Object::perform_skip (disc_tc,
                                                 &stream
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
             ACE_CHECK_RETURN (0);
 
             if (status != CORBA::TypeCode::TRAVERSE_CONTINUE
@@ -1883,7 +1883,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot
             CORBA_TypeCode::_tao_decode (this,
                                          stream,
                                          member_type
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
             ACE_CHECK_RETURN (0);
           }
         this->private_state_->tc_member_type_list_known_ = 1;
@@ -1896,7 +1896,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot
       ACE_NOTREACHED (break);
 
     case CORBA::tk_value:
-      mcount = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mcount = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN ((CORBA::TypeCode_ptr)0);
 
       {
@@ -1968,12 +1968,12 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot
             CORBA_TypeCode::_tao_decode (this,
                                          stream,
                                          member_type
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
             ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
             if (!stream.skip_ulong ())  // skip member visibility
               ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                                CORBA::TypeCode::_nil ());            
+                                CORBA::TypeCode::_nil ());
           }
 
         this->private_state_->tc_member_type_list_known_ = 1;
@@ -1998,7 +1998,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong slot
 // CORBA::tk_except
 const char *
 CORBA_TypeCode::private_member_name (CORBA::ULong slot
-                                     TAO_ENV_ARG_DECL) const
+                                     ACE_ENV_ARG_DECL) const
 {
   CORBA::ULong temp, mcount;
 
@@ -2009,7 +2009,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot
                        this->byte_order_);
   CORBA::TypeCode_var tc = 0;
 
-  mcount = this->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  mcount = this->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   // out of bounds
   ACE_CHECK_RETURN ((char *)0);
 
@@ -2107,7 +2107,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot
           {
             // get the typecode for the discriminator
             CORBA::TypeCode_ptr disc_tc =
-              this->private_discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->private_discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
             // compute the name for all the members and return the
             // required one
             ACE_CHECK_RETURN (0);
@@ -2118,7 +2118,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot
                 CORBA::TypeCode::traverse_status status =
                   TAO_Marshal_Object::perform_skip (disc_tc,
                                                     &stream
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
                 ACE_CHECK_RETURN (0);
 
                 if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -2153,7 +2153,7 @@ CORBA_TypeCode::private_member_name (CORBA::ULong slot
 // Return member labels for CORBA::tk_union typecodes.
 CORBA::Any_ptr
 CORBA_TypeCode::private_member_label (CORBA::ULong n
-                                      TAO_ENV_ARG_DECL) const
+                                      ACE_ENV_ARG_DECL) const
 {
   // this function is only applicable to the CORBA::tk_union TC
   if (this->kind_ != CORBA::tk_union)
@@ -2204,7 +2204,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n
 
   // get the discriminant TC
   CORBA::TypeCode_ptr disc_tc =
-    this->private_discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->private_discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   for (CORBA::ULong i = 0; i < member_count; i++)
@@ -2222,7 +2222,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n
       int retval =
         TAO_Marshal_Object::perform_skip (disc_tc,
                                           &temp
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -2260,7 +2260,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n
           retval =
             TAO_Marshal_Object::perform_skip (disc_tc,
                                               &stream
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -2276,7 +2276,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n
             TAO_Marshal_Object::perform_append (label_tc,
                                                 &stream,
                                                 &out
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -2319,19 +2319,19 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n
 
 CORBA::TypeCode_ptr
 CORBA_TypeCode::private_discriminator_type (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   ) const
 {
   // Double checked locking...
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
                     this->private_state_->mutex_, 0);
 
-  return this->private_discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->private_discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
 CORBA_TypeCode::private_discriminator_type_i (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   ) const
 {
   if (this->private_state_->tc_discriminator_type_known_)
@@ -2349,7 +2349,7 @@ CORBA_TypeCode::private_discriminator_type_i (
   CORBA_TypeCode::_tao_decode (this,
                                stream,
                                this->private_state_->tc_discriminator_type_
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   this->private_state_->tc_discriminator_type_known_ = 1;
@@ -2358,19 +2358,19 @@ CORBA_TypeCode::private_discriminator_type_i (
 
 CORBA::Long
 CORBA_TypeCode::private_default_index (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   ) const
 {
   // Double checked locking...
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard,
                     this->private_state_->mutex_, 0);
 
-  return this->private_default_index_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->private_default_index_i (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Long
 CORBA_TypeCode::private_default_index_i (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   ) const
 {
   if (this->private_state_->tc_default_index_used_known_)
@@ -2392,7 +2392,7 @@ CORBA_TypeCode::private_default_index_i (
 }
 
 CORBA::Long
-CORBA_TypeCode::private_length (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::private_length (ACE_ENV_SINGLE_ARG_DECL) const
 {
   TAO_InputCDR stream (this->buffer_+4, this->length_-4,
                        this->byte_order_);
@@ -2445,7 +2445,7 @@ CORBA_TypeCode::private_length (TAO_ENV_SINGLE_ARG_DECL) const
 }
 
 CORBA::TypeCode_ptr
-CORBA_TypeCode::private_content_type (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::private_content_type (ACE_ENV_SINGLE_ARG_DECL) const
 {
   TAO_InputCDR stream (this->buffer_+4, this->length_-4,
                        this->byte_order_);
@@ -2464,7 +2464,7 @@ CORBA_TypeCode::private_content_type (TAO_ENV_SINGLE_ARG_DECL) const
         CORBA_TypeCode::_tao_decode (this,
                                      stream,
                                      this->private_state_->tc_content_type_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         this->private_state_->tc_content_type_known_ = 1;
@@ -2487,7 +2487,7 @@ CORBA_TypeCode::private_content_type (TAO_ENV_SINGLE_ARG_DECL) const
         CORBA_TypeCode::_tao_decode (this,
                                      stream,
                                      this->private_state_->tc_content_type_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (0);
 
         this->private_state_->tc_content_type_known_ = 1;
@@ -2502,7 +2502,7 @@ CORBA_TypeCode::private_content_type (TAO_ENV_SINGLE_ARG_DECL) const
 }
 
 CORBA::TypeCode_ptr
-CORBA_TypeCode::private_concrete_base_type (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::private_concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const
 {
   if (kind_ != CORBA::tk_value)
     ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
@@ -2528,9 +2528,9 @@ CORBA_TypeCode::private_concrete_base_type (TAO_ENV_SINGLE_ARG_DECL) const
   CORBA_TypeCode::_tao_decode (this,
                                stream,
                                this->private_state_->tc_concrete_base_type_
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   this->private_state_->tc_concrete_base_type_known_ = 1;
   return this->private_state_->tc_concrete_base_type_;
 }
@@ -2541,7 +2541,7 @@ void
 CORBA_TypeCode::_tao_decode (const CORBA_TypeCode *parent,
                              TAO_InputCDR &cdr,
                              CORBA_TypeCode *&x
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   x = 0;
   CORBA::ULong kind;
@@ -2793,7 +2793,7 @@ CORBA_TypeCode::_tao_decode (const CORBA_TypeCode *parent,
 // provides.
 
 CORBA::ULong
-CORBA_TypeCode::param_count (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::param_count (ACE_ENV_SINGLE_ARG_DECL) const
 {
   switch (this->kind_)
     {
@@ -2867,7 +2867,7 @@ CORBA_TypeCode::param_count (TAO_ENV_SINGLE_ARG_DECL) const
 
 CORBA::Any_ptr
 CORBA_TypeCode::parameter (const CORBA::Long /* slot */
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
                                          CORBA::COMPLETED_NO),
@@ -2881,7 +2881,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
 {
   if (x == 0)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                         CORBA::COMPLETED_MAYBE),
                         0);
@@ -2913,7 +2913,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
         ACE_TRY_NEW_ENV
           {
             CORBA::ULong length =
-              x->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+              x->length (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             if (!cdr.write_ulong (length))
@@ -2956,7 +2956,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x)
 {
   ACE_TRY_NEW_ENV
     {
-      CORBA_TypeCode::_tao_decode (0, cdr, x TAO_ENV_ARG_PARAMETER);
+      CORBA_TypeCode::_tao_decode (0, cdr, x ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index 747bc19547a..63338455486 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -71,9 +71,9 @@ public:
     virtual void _raise (void);
 
     virtual void _tao_encode (TAO_OutputCDR &cdr
-                              TAO_ENV_ARG_DECL_NOT_USED) const;
+                              ACE_ENV_ARG_DECL_NOT_USED) const;
     virtual void _tao_decode (TAO_InputCDR &cdr
-                              TAO_ENV_ARG_DECL_NOT_USED);
+                              ACE_ENV_ARG_DECL_NOT_USED);
 
     static Bounds* _downcast (CORBA_Exception *ex);
     virtual int _is_a (const char* interface_id) const;
@@ -87,9 +87,9 @@ public:
     virtual void _raise (void);
 
     virtual void _tao_encode (TAO_OutputCDR &cdr
-                              TAO_ENV_ARG_DECL_NOT_USED) const;
+                              ACE_ENV_ARG_DECL_NOT_USED) const;
     virtual void _tao_decode (TAO_InputCDR &cdr
-                              TAO_ENV_ARG_DECL_NOT_USED);
+                              ACE_ENV_ARG_DECL_NOT_USED);
 
     static BadKind* _downcast (CORBA_Exception *ex);
     virtual int _is_a (const char* interface_id) const;
@@ -106,59 +106,59 @@ public:
 
   /// Compares two typecodes. Must be identical in every respect.
   CORBA::Boolean equal (CORBA::TypeCode_ptr
-                        TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                        ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Conforms to CORBA 2.3.1 (99-10-07).
   CORBA::Boolean equivalent (CORBA::TypeCode_ptr
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// For all TypeCode kinds, returns the "kind" of the typecode.
-  CORBA::TCKind kind (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  CORBA::TCKind kind (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// For tk_{objref,struct,union,enum,alias,except}. Returns the
   /// repository ID, raises BadKind.
-  const char *id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  const char *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns name (), raises (BadKind).
-  const char *name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  const char *name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns member_count (), raises (BadKind). Useful for tk_struct,
   /// tk_union, tk_enum, tk_alias, and tk_except.
-  CORBA::ULong member_count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  CORBA::ULong member_count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns member_name (...), raises (BadKind, Bounds); Useful for
   /// tk_struct, tk_union, tk_enum, tk_alias, and tk_except.
   const char *member_name (CORBA::ULong slot
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns member_type (...), raises (BadKind, Bounds); Useful for
   /// tk_struct, tk_union, and tk_except.
   CORBA::TypeCode_ptr member_type (CORBA::ULong slot
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// For tk_union. Returns the label. Raises BadKind, Bounds.
   CORBA::Any_ptr member_label (CORBA::ULong n
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns the discriminator type for tk_union. raises (BadKind).
-  CORBA::TypeCode_ptr discriminator_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  CORBA::TypeCode_ptr discriminator_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns the default slot for the tk_union. Raises (BadKind).
-  CORBA::Long default_index (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  CORBA::Long default_index (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns length, raises (BadKind). Used for tk_string,
   /// tk_sequence, and tk_array.
-  CORBA::ULong length (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  CORBA::ULong length (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Returns the content type (element type). Raises (BadKind); Useful
   /// for tk_sequence, tk_array, and tk_alias.
-  CORBA::TypeCode_ptr content_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  CORBA::TypeCode_ptr content_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
 
   /// Returns the concrete base type. Raises (BadKind); Useful
   /// for tk_value only.
   CORBA::TypeCode_ptr concrete_base_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       ) const;
 
   // = Creation/refcounting
@@ -217,18 +217,18 @@ public:
   /// Deprecated in the CORBA 2.2 spec and
   /// missing altogether from 2.3a (98-12-04),
   CORBA::Any_ptr parameter (const CORBA::Long slot
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   /// Deprecated, CORBA 1.2, not fully usable. Returns the number of
   /// parameters that the typecode takes.
-  CORBA::ULong param_count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  CORBA::ULong param_count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// CDR decoding: the >> operator is not enough because we must also
   /// respect the parent/child relationship among TypeCodes.
   static void _tao_decode (const CORBA_TypeCode *parent,
                            TAO_InputCDR &cdr,
                            CORBA_TypeCode *&child
-                           TAO_ENV_ARG_DECL);
+                           ACE_ENV_ARG_DECL);
 
   // private:
   //
@@ -292,71 +292,71 @@ private:
    */
   CORBA::Boolean equ_common (CORBA::TypeCode_ptr tc,
                              CORBA::Boolean equiv_only
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Compares the typecodes.
   CORBA::Boolean private_equal (CORBA::TypeCode_ptr tc,
                                 CORBA::Boolean equiv_only
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// For tk_{objref,struct,union,enum,alias,except}. Returns the
   /// repository ID, raises BadKind.
-  const char *private_id (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  const char *private_id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// returns name (), raises (BadKind)
-  const char *private_name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  const char *private_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// returns member_count (), raises (BadKind). Useful for tk_struct,
   /// tk_union, tk_enum, tk_alias, and tk_except.
-  CORBA::ULong private_member_count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  CORBA::ULong private_member_count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// returns member_type (...), raises (BadKind, Bounds); Useful for
   /// tk_struct, tk_union, and tk_except
   CORBA::TypeCode_ptr private_member_type (
       CORBA::ULong slot
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
     ) const;
 
   /// returns member_name (...), raises (BadKind, Bounds); Useful for
   /// tk_union, tk_struct, tk_except, and tk_enum
   const char *private_member_name (CORBA::ULong slot
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// For tk_union. Returns the label. Raises BadKind, Bounds.
   CORBA::Any_ptr private_member_label (CORBA::ULong n
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// returns the discriminator type for tk_union, and acquires the lock
   /// for the wrapped function below. raises (BadKind)
   CORBA::TypeCode_ptr private_discriminator_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) const;
 
   /// Acquires no lock so it can be called internally from blocks
   /// which have a lock.
   CORBA::TypeCode_ptr private_discriminator_type_i (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) const;
 
   /// returns the default slot for the tk_union. Raises (BadKind);
-  CORBA::Long private_default_index (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  CORBA::Long private_default_index (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// Acquires no lock so it can be called internally from blocks
   /// which have a lock.
-  CORBA::Long private_default_index_i (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  CORBA::Long private_default_index_i (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// returns length, raises (BadKind). Used for tk_string,
   /// tk_sequence, and tk_array
-  CORBA::Long private_length (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
+  CORBA::Long private_length (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
 
   /// returns the content type (element type). Raises (BadKind); Useful
   /// for tk_sequence, tk_array, and tk_alias
   CORBA::TypeCode_ptr private_content_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) const;
 
   CORBA::TypeCode_ptr private_concrete_base_type (
-      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     ) const;
 
   // = All the private helpers testing for equality of typecodes
@@ -364,57 +364,57 @@ private:
   /// test equality for typecodes of objrefs
   CORBA::Boolean private_equal_objref (CORBA::TypeCode_ptr tc,
                                        CORBA::Boolean equiv_only
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of structs
   CORBA::Boolean private_equal_struct (CORBA::TypeCode_ptr tc,
                                        CORBA::Boolean equiv_only
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of unions
   CORBA::Boolean private_equal_union (CORBA::TypeCode_ptr tc,
                                       CORBA::Boolean equiv_only
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of enums
   CORBA::Boolean private_equal_enum (CORBA::TypeCode_ptr tc,
                                      CORBA::Boolean equiv_only
-                                     TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of strings
   CORBA::Boolean private_equal_string (CORBA::TypeCode_ptr tc,
                                        CORBA::Boolean equiv_only
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of wide strings
   CORBA::Boolean private_equal_wstring (CORBA::TypeCode_ptr tc,
                                         CORBA::Boolean equiv_only
-                                        TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of sequences
   CORBA::Boolean private_equal_sequence (CORBA::TypeCode_ptr tc,
                                          CORBA::Boolean equiv_only
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of array
   CORBA::Boolean private_equal_array (CORBA::TypeCode_ptr tc,
                                       CORBA::Boolean equiv_only
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of typedefs
   CORBA::Boolean private_equal_alias (CORBA::TypeCode_ptr tc,
                                       CORBA::Boolean equiv_only
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of exceptions
   CORBA::Boolean private_equal_except (CORBA::TypeCode_ptr tc,
                                        CORBA::Boolean equiv_only
-                                       TAO_ENV_ARG_DECL_WITH_DEFAULTS) const;
+                                       ACE_ENV_ARG_DECL_WITH_DEFAULTS) const;
 
   /// test equality for typecodes of exceptions
   CORBA::Boolean private_equal_valuetype (CORBA::TypeCode_ptr tc,
                                           CORBA::Boolean equiv_only
-                                          TAO_ENV_ARG_DECL_WITH_DEFAULTS) 
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       const;
 
 
diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i
index d6df0851834..4066b436c19 100644
--- a/TAO/tao/Typecode.i
+++ b/TAO/tao/Typecode.i
@@ -36,7 +36,7 @@ CORBA::TypeCode::_nil (void)
 }
 
 ACE_INLINE CORBA::TCKind
-CORBA_TypeCode::kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) const
+CORBA_TypeCode::kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
 {
   return (CORBA::TCKind) this->kind_;
 }
@@ -44,43 +44,43 @@ CORBA_TypeCode::kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) const
 // Returns true if the two typecodes are equivalent.
 ACE_INLINE CORBA::Boolean
 CORBA_TypeCode::equivalent (CORBA::TypeCode_ptr tc
-                            TAO_ENV_ARG_DECL) const
+                            ACE_ENV_ARG_DECL) const
 {
   return this->equ_common (tc,
                            1
-			    TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
 }
 
 // Returns true if the two typecodes are identical.
 ACE_INLINE CORBA::Boolean
 CORBA_TypeCode::equal (CORBA::TypeCode_ptr tc
-                       TAO_ENV_ARG_DECL) const
+                       ACE_ENV_ARG_DECL) const
 {
   return this->equ_common (tc,
                            0
-			    TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
 }
 
 // returns the Repository ID
 ACE_INLINE const char *
-CORBA_TypeCode::id (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::id (ACE_ENV_SINGLE_ARG_DECL) const
 {
   // if already precomputed
   if (this->private_state_->tc_id_known_)
     return this->private_state_->tc_id_;
   else
-    return this->private_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->private_id (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // returns the string name
 ACE_INLINE const char *
-CORBA_TypeCode::name (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::name (ACE_ENV_SINGLE_ARG_DECL) const
 {
   // if already precomputed
   if (this->private_state_->tc_name_known_)
     return this->private_state_->tc_name_;
   else
-    return this->private_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->private_name (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // Return the number of members defined by this typecode
@@ -89,13 +89,13 @@ CORBA_TypeCode::name (TAO_ENV_SINGLE_ARG_DECL) const
 // For the rest of the cases, raises the BadKind exception.
 
 ACE_INLINE CORBA::ULong
-CORBA_TypeCode::member_count (TAO_ENV_SINGLE_ARG_DECL) const
+CORBA_TypeCode::member_count (ACE_ENV_SINGLE_ARG_DECL) const
 {
   // if already precomputed
   if (this->private_state_->tc_member_count_known_)
     return this->private_state_->tc_member_count_;
   else
-    return this->private_member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+    return this->private_member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // ************************************************************
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index e549a201aa8..7104b6dcef8 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -57,7 +57,7 @@ void CORBA_WrongTransaction::_raise (void)
 }
 
 void CORBA_WrongTransaction::_tao_encode (TAO_OutputCDR &cdr
-                                          TAO_ENV_ARG_DECL) const
+                                          ACE_ENV_ARG_DECL) const
 {
   if (cdr << *this)
     return;
@@ -65,7 +65,7 @@ void CORBA_WrongTransaction::_tao_encode (TAO_OutputCDR &cdr
 }
 
 void CORBA_WrongTransaction::_tao_decode (TAO_InputCDR &cdr
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   if (cdr >> *this)
     return;
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index 44ee6c588da..9dff05c5b16 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -66,8 +66,8 @@ public:
   virtual void _raise (void);
 
   virtual void _tao_encode (TAO_OutputCDR &cdr
-                            TAO_ENV_ARG_DECL_NOT_USED) const;
-  virtual void _tao_decode (TAO_InputCDR &cdr TAO_ENV_ARG_DECL_NOT_USED);
+                            ACE_ENV_ARG_DECL_NOT_USED) const;
+  virtual void _tao_decode (TAO_InputCDR &cdr ACE_ENV_ARG_DECL_NOT_USED);
 
   static CORBA_WrongTransaction *_downcast (CORBA::Exception *);
 
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index e6ea5de14ac..8979afd5cc1 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -38,7 +38,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
                                TAO_InputCDR *src,
                                TAO_OutputCDR *dest
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_append = 1;
   CORBA::TypeCode::traverse_status retval =
@@ -101,7 +101,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
                          TAO_InputCDR *src,
                          TAO_OutputCDR *dest
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   // Typecode of the element that makes the Any.
   CORBA::TypeCode_var elem_tc;
@@ -121,7 +121,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
     TAO_Marshal_Object::perform_append (elem_tc.in (),
                                         src,
                                         dest
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -142,7 +142,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                               TAO_InputCDR *src,
                               TAO_OutputCDR *dest
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_append = 1;
   CORBA::TypeCode::traverse_status retval =
@@ -179,7 +179,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                   TAO_Marshal_Object::perform_append (CORBA::_tc_long,
                                                       src,
                                                       dest
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
                 ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
               }
             break;
@@ -192,7 +192,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                   TAO_Marshal_Object::perform_append (CORBA::_tc_long,
                                                       src,
                                                       dest
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
                 ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
               }
             break;
@@ -214,7 +214,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
                   TAO_Marshal_Object::perform_append (TC_opaque,
                                                       src,
                                                       dest
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
                 ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
               }
             } // end of switch
@@ -250,20 +250,20 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Principal::append (CORBA::TypeCode_ptr,
                                TAO_InputCDR *src,
                                TAO_OutputCDR *dest
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   // write the octet sequence representing the Principal
   return TAO_Marshal_Object::perform_append (TC_opaque,
                                              src,
                                              dest
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
                             TAO_InputCDR *src,
                             TAO_OutputCDR *dest
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_append = 1;
 
@@ -336,14 +336,14 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
                             TAO_InputCDR *src,
                             TAO_OutputCDR *dest
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
   CORBA::TypeCode_var param;
 
   // Number of fields in the struct.
-  int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   for (int i = 0;
@@ -351,14 +351,14 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
        i++)
     {
       // get member type
-      param = tc->member_type (i TAO_ENV_ARG_PARAMETER);
+      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       retval =
         TAO_Marshal_Object::perform_append (param.in (),
                                             src,
                                             dest
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
     }
 
@@ -378,14 +378,14 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
                            TAO_InputCDR *src,
                            TAO_OutputCDR *dest
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var discrim_tc =
-    tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   CORBA::ULong kind =
-    discrim_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+    discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // Save the discriminator value in a temporary variable...
@@ -469,7 +469,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
     }
 
   CORBA::ULong member_count =
-    tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   const CORBA::ULong null_member = ~ACE_static_cast (CORBA::ULong, 0U);
@@ -482,14 +482,14 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
        ++i)
     {
       CORBA::Any_var any = tc->member_label (i
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       CORBA::Octet o;
       if ((any >>= CORBA::Any::to_octet (o)) && o == 0)
         {
           CORBA::ULong default_index =
-            tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
+            tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
           if (i != default_index)
@@ -586,12 +586,12 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
         {
           // Good, use the default to append...
           CORBA::TypeCode_var member_tc =
-            tc->member_type (default_member TAO_ENV_ARG_PARAMETER);
+            tc->member_type (default_member ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
           return TAO_Marshal_Object::perform_append (member_tc.in (),
                                                      src,
                                                      dest
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
         }
 
       return CORBA::TypeCode::TRAVERSE_STOP;
@@ -599,19 +599,19 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
 
   // If we found the member successfully then just use that one...
   CORBA::TypeCode_var member_tc =
-    tc->member_type (current_member TAO_ENV_ARG_PARAMETER);
+    tc->member_type (current_member ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
   return TAO_Marshal_Object::perform_append (member_tc.in (),
                                              src,
                                              dest
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_String::append (CORBA::TypeCode_ptr,
                             TAO_InputCDR *src,
                             TAO_OutputCDR *dest
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_append = 1;
 
@@ -640,7 +640,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
                               TAO_InputCDR *src,
                               TAO_OutputCDR *dest
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   // Size of element.
   CORBA::ULong bounds;
@@ -673,13 +673,13 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
     {
       // Get element typecode.
       CORBA::TypeCode_var tc2 =
-        tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+        tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       CORBA::TypeCode::traverse_status retval =
         CORBA::TypeCode::TRAVERSE_CONTINUE;
 
-      CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       switch (kind)
@@ -834,7 +834,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
               retval = TAO_Marshal_Object::perform_append (tc2.in (),
                                                            src,
                                                            dest
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
               ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
             }
           break;
@@ -858,18 +858,18 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
                            TAO_OutputCDR *dest
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   // retrieve the bounds of the array
-  CORBA::ULong bounds = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // get element typecode
-  CORBA::TypeCode_var tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // For CORBA basic types, the copy can be optimized
-  CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // Return status.
@@ -1027,7 +1027,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
           retval = TAO_Marshal_Object::perform_append (tc2.in (),
                                                        src,
                                                        dest
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
         }
       break;
@@ -1049,7 +1049,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
                            TAO_OutputCDR *dest
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   // Typecode of the aliased type.
   CORBA::TypeCode_var tc2;
@@ -1059,13 +1059,13 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
 
-  tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   retval = TAO_Marshal_Object::perform_append (tc2.in (),
                                                src,
                                                dest
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
@@ -1091,7 +1091,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
                             TAO_InputCDR *src,
                             TAO_OutputCDR *dest
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -1102,20 +1102,20 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
   continue_append = dest->append_string (*src);
 
   // Number of fields in the struct.
-  int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   for (int i = 0; i < member_count
          && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
          && continue_append == 1; i++)
     {
-      param = tc->member_type (i TAO_ENV_ARG_PARAMETER);
+      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       retval = TAO_Marshal_Object::perform_append (param.in (),
                                                    src,
                                                    dest
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
     }
 
   if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
@@ -1134,7 +1134,7 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
                              TAO_InputCDR *src,
                              TAO_OutputCDR *dest
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_append = 1;
 
@@ -1163,15 +1163,15 @@ CORBA::TypeCode::traverse_status
 TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
                            TAO_InputCDR *src,
                            TAO_OutputCDR *dest
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
   CORBA::TypeCode_var param;
 
   // Use the same method to append our base valuetype.
-  // To achive this we'll need to distinguish between 
-  // first-time/nested appends so that we won't attempt to 
+  // To achive this we'll need to distinguish between
+  // first-time/nested appends so that we won't attempt to
   // append rep_id several times.
   //
   if (nested_processing_ == 0)
@@ -1204,14 +1204,14 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
     }
 
   // Handle our base valuetype if any.
-  param = tc->concrete_base_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  param = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
   if (param->kind () != CORBA::tk_null)
     {
-      retval = this->append (param.in (), 
+      retval = this->append (param.in (),
                              src,
                              dest
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -1221,7 +1221,7 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
     }
 
   // Number of fields in the struct.
-  int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   for (int i = 0;
@@ -1229,14 +1229,14 @@ TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
        i++)
     {
       // get member type
-      param = tc->member_type (i TAO_ENV_ARG_PARAMETER);
+      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       retval =
         TAO_Marshal_Object::perform_append (param.in (),
                                             src,
                                             dest
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
     }
 
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 239c8dd36f7..f4c4ce69180 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -610,7 +610,7 @@ typedef void (*TAO_Skeleton)(
     TAO_ServerRequest &,
     void *,
     void *
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT)
+#if !defined (TAO_HAS_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT)
     , CORBA_Environment &
 #endif
   );
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index ae45be48568..9f60e45b056 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -223,111 +223,24 @@ const size_t TAO_DEFAULT_ORB_TABLE_SIZE = 16;
 # error "tao/orbconf.h: You can only use exceptions in TAO if ACE supports them"
 #endif /* TAO_HAS_EXCEPTIONS */
 
-//@{
-/**
- * @name Native C++ exceptions portability macros.
- *
- * The following macros are used to write code portable between
- * platforms with and without native C++ exception support.  Their
- * main goal is to hide the presence of the CORBA::Environment
- * argument, but they collaborate with the ACE_TRY_* macros to emulate
- * the try/catch blocks.
- */
-
-/// Define a macro to emit code only when CORBA::Environment is used
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT)
-#  define TAO_ENV_EMIT_CODE(X) X
-#else
-#  define TAO_ENV_EMIT_CODE(X)
-#endif /* TAO_HAS_EXCEPTIONS && !TAO_ENV_BKWD_COMPAT */
-
-/// Another macro to emit code only when CORBA::Environment is used
-#if !defined (TAO_HAS_EXCEPTIONS) || defined (TAO_ENV_BKWD_COMPAT)
-#  define TAO_ENV_EMIT_CODE2(X,Y) X,Y
-#else
-#  define TAO_ENV_EMIT_CODE2(X,Y)
-#endif /* TAO_HAS_EXCEPTIONS && !TAO_ENV_BKWD_COMPAT */
-
-/// Helper macro
-#define TAO_ENV_EMIT_DUMMY
-
-/// Declare a CORBA::Environment argument as the last argument of a
-/// function
-/**
- * Normally this macro is used as follows:
- *
- * <CODE>void my_funct (int x, int y TAO_ENV_ARG_DECL);</CODE>
- *
- * Its purpose is to provide TAO developers (and users) with a
- * mechanism to write code that is portable to platforms with and
- * without native C++ exceptions.
- */
-#define TAO_ENV_ARG_DECL \
-    TAO_ENV_EMIT_CODE2(TAO_ENV_EMIT_DUMMY, \
-                       CORBA::Environment &ACE_TRY_ENV)
-
-/// Declare a CORBA::Environment argument with the default value
-/// obtained from the TAO orb.  Similar to TAO_ENV_ARG_DECL
-#define TAO_ENV_ARG_DECL_WITH_DEFAULTS \
-    TAO_ENV_EMIT_CODE2(TAO_ENV_EMIT_DUMMY, \
-                       CORBA::Environment &ACE_TRY_ENV = \
-                           TAO_default_environment ())
-
-/// Declare a CORBA::Environment argument that is not used by the
-/// function definition.
-/**
- * Similar to TAO_ENV_ARG_DECL, but the formal parameter name is
- * dropped to avoid warnings about unused parameters
- */
-#define TAO_ENV_ARG_DECL_NOT_USED \
-    TAO_ENV_EMIT_CODE2(TAO_ENV_EMIT_DUMMY, \
-                       CORBA::Environment &)
-
-/// Declare a CORBA::Environment argument for methods that do not take
-/// any other parameters
-#define TAO_ENV_SINGLE_ARG_DECL \
-    TAO_ENV_EMIT_CODE(CORBA::Environment &ACE_TRY_ENV)
-
-/// Declare a CORBA::Environment argument with a default value for
-/// methods that do not take any other parameters
-#define TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \
-    TAO_ENV_EMIT_CODE(CORBA::Environment &ACE_TRY_ENV = \
-                          TAO_default_environment ())
-
-/// Declare a CORBA::Environment argument for for ethods
-#define TAO_ENV_SINGLE_ARG_DECL_NOT_USED \
-    TAO_ENV_EMIT_CODE(CORBA::Environment &)
-
-/// Use the CORBA::Environment argument is a nested call
-#define TAO_ENV_ARG_PARAMETER \
-    TAO_ENV_EMIT_CODE2(TAO_ENV_EMIT_DUMMY, \
-                       ACE_TRY_ENV)
-
-/// Use the CORBA::Environment argument is a nested call, assuming the
-/// called function take only the ACE_TRY_ENV argument.
-#define TAO_ENV_SINGLE_ARG_PARAMETER \
-    TAO_ENV_EMIT_CODE(ACE_TRY_ENV)
-
-/// Eliminate unused argument warnings about ACE_TRY_ENV
-#define TAO_ENV_ARG_NOT_USED \
-    TAO_ENV_EMIT_CODE(ACE_UNUSED_ARG(ACE_TRY_ENV))
-
-/// Declare a CORBA::Environment variable.
-/**
- * Used in methods that do not take such an argument, or do not take
- * it when compiled with native C++ exceptions, but use the argument
- * in all platforms
- */
-#define TAO_ENV_DECLARE_NEW_ENV \
-    TAO_ENV_EMIT_CODE(ACE_DECLARE_NEW_CORBA_ENV)
-//@}
-
-#if !defined (TAO_HAS_EXCEPTIONS)
-// This thing can be moved into the above when we drop TAO_ENV_BKWD_COMPAT.
-#  define TAO_ENV_RAISE(ex) ACE_TRY_ENV.exception (ex)
-#else
-#  define TAO_ENV_RAISE(ex) (ex)->_raise ()
-#endif /* TAO_HAS_EXCEPTIONS */
+//-------- begin deprecated -----------------------------------------------
+// The TAO_ENV_ macros have been renamed to ACE_ENV_
+// and have been moved to $ACE_ROOT/ace/CORBA_macros.h.
+// Please only use the latter.
+// The macros below are deprecated and may be removed soon.
+#define TAO_ENV_EMIT_CODE(X)                  ACE_ENV_EMIT_CODE(X)
+#define TAO_ENV_EMIT_CODE2(X,Y)               ACE_ENV_EMIT_CODE2(X,Y)
+#define TAO_ENV_ARG_DECL                      ACE_ENV_ARG_DECL
+#define TAO_ENV_ARG_DECL_WITH_DEFAULTS        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+#define TAO_ENV_ARG_DECL_NOT_USED             ACE_ENV_ARG_DECL_NOT_USED
+#define TAO_ENV_SINGLE_ARG_DECL               ACE_ENV_SINGLE_ARG_DECL
+#define TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+#define TAO_ENV_SINGLE_ARG_DECL_NOT_USED      ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+#define TAO_ENV_ARG_PARAMETER                 ACE_ENV_ARG_PARAMETER
+#define TAO_ENV_SINGLE_ARG_PARAMETER          ACE_ENV_SINGLE_ARG_PARAMETER
+#define TAO_ENV_ARG_NOT_USED                  ACE_ENV_ARG_NOT_USED
+#define TAO_ENV_RAISE(ex)                     ACE_ENV_RAISE(ex)
+//-------- end deprecated -------------------------------------------------
 
 // BC++ seems to have a different convention for detecting Win32 than
 // VC++.
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index 65ffe868d3f..e05a686a8f7 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -31,7 +31,7 @@ ACE_RCSID(tao, skip, "$Id$")
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
                              TAO_InputCDR *stream
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -95,7 +95,7 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
                        TAO_InputCDR *stream
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   // Typecode of the element that makes the Any.
   CORBA::TypeCode_var elem_tc;
@@ -106,13 +106,13 @@ TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
 
   return TAO_Marshal_Object::perform_skip (elem_tc.in (),
                                            stream
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
                             TAO_InputCDR *stream
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -206,7 +206,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
                              TAO_InputCDR *stream
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -237,7 +237,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
                           TAO_InputCDR *stream
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -300,26 +300,26 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
                           TAO_InputCDR *stream
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
   CORBA::TypeCode_var param;
 
   // Number of fields in the struct.
-  int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   for (int i = 0; i < member_count
          && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
        i++)
     {
-      param = tc->member_type (i TAO_ENV_ARG_PARAMETER);
+      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       retval = TAO_Marshal_Object::perform_skip (param.in (),
                                                  stream
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
     }
 
@@ -337,14 +337,14 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
                          TAO_InputCDR *src
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode_var discrim_tc =
-    tc->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   CORBA::ULong kind =
-    discrim_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+    discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // Save the discriminator value in a temporary variable...
@@ -420,7 +420,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
     }
 
   CORBA::ULong member_count =
-    tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   const CORBA::ULong null_member = ~ACE_static_cast (CORBA::ULong, 0U);
@@ -432,14 +432,14 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
        i != member_count && current_member == null_member;
        ++i)
     {
-      CORBA::Any_var any = tc->member_label (i TAO_ENV_ARG_PARAMETER);
+      CORBA::Any_var any = tc->member_label (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       CORBA::Octet o;
       if ((any >>= CORBA::Any::to_octet (o)) && o == 0)
         {
           CORBA::ULong default_index =
-            tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER);
+            tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
           if (i != default_index)
@@ -536,11 +536,11 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
         {
           // Good, use the default to append...
           CORBA::TypeCode_var member_tc =
-            tc->member_type (default_member TAO_ENV_ARG_PARAMETER);
+            tc->member_type (default_member ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
           return TAO_Marshal_Object::perform_skip (member_tc.in (),
                                                    src
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
         }
 
       // If we're here, we have an implicit default case, and we
@@ -551,17 +551,17 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
 
   // If we found the member successfully then just use that one...
   CORBA::TypeCode_var member_tc =
-    tc->member_type (current_member TAO_ENV_ARG_PARAMETER);
+    tc->member_type (current_member ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
   return TAO_Marshal_Object::perform_skip (member_tc.in (),
                                            src
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
                           TAO_InputCDR *stream
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -590,7 +590,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
                             TAO_InputCDR *stream
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   // Size of element.
   CORBA::ULong bounds;
@@ -616,11 +616,11 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
 
   // Get element typecode.
   CORBA::TypeCode_var tc2 =
-    tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // For CORBA basic types, the skip can be optimized
-  CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   char *dummy;
@@ -676,7 +676,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
           continue_skipping =
             TAO_Marshal_Object::perform_skip (tc2.in (),
                                               stream
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
         }
       break;
@@ -696,22 +696,22 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
                          TAO_InputCDR *stream
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   CORBA::Boolean continue_skipping = 1;
 
 
   // retrieve the bounds of the array
-  CORBA::ULong bounds = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // get element typecode
   // Typecode of the element.
-  CORBA::TypeCode_var tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   // For CORBA basic types, the skip can be optimized
-  CORBA::TCKind kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   char *dummy;
@@ -767,7 +767,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
           int stop =
             TAO_Marshal_Object::perform_skip (tc2.in (),
                                               stream
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
           if (stop == CORBA::TypeCode::TRAVERSE_STOP)
             continue_skipping = 0;
@@ -789,7 +789,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
                          TAO_InputCDR *stream
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   // Typecode of the aliased type.
   CORBA::TypeCode_var tc2;
@@ -799,12 +799,12 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
 
-  tc2 = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   retval = TAO_Marshal_Object::perform_skip (tc2.in (),
                                              stream
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   //  tc2->_decr_refcnt ();
@@ -830,7 +830,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
                           TAO_InputCDR *stream
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -841,19 +841,19 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_STOP;
 
   // Number of fields in the exception
-  int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   for (int i = 0; i < member_count
          && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
        i++)
     {
-      param = tc->member_type (i TAO_ENV_ARG_PARAMETER);
+      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       retval = TAO_Marshal_Object::perform_skip (param.in (),
                                                  stream
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
     }
 
@@ -872,7 +872,7 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
                            TAO_InputCDR *stream
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_CDR::Boolean continue_skipping = 1;
 
@@ -902,15 +902,15 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
                          TAO_InputCDR *stream
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
   CORBA::TypeCode_var param;
 
   // Use the same method to skip over our base valuetype.
-  // To achive this we'll need to distinguish between 
-  // first-time/nested skips so that we won't attempt to 
+  // To achive this we'll need to distinguish between
+  // first-time/nested skips so that we won't attempt to
   // skip rep_id several times.
   //
   if (nested_processing_ == 0)
@@ -932,7 +932,7 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
       else if (value_tag & TAO_OBV_GIOP_Flags::Type_info_single)
         {
           // Skip a single repository id which is of type string.
-          stream->skip_string (); 
+          stream->skip_string ();
         }
       else
         {
@@ -942,11 +942,11 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
     }
 
   // Handle our base valuetype if any.
-  param = tc->concrete_base_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+  param = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
   if (param->kind () != CORBA::tk_null)
     {
-      retval = this->skip (param.in (), stream TAO_ENV_ARG_PARAMETER);
+      retval = this->skip (param.in (), stream ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -956,19 +956,19 @@ TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
     }
 
   // Number of fields in the valuetype.
-  int member_count = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int member_count = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   for (int i = 0; i < member_count
          && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
        i++)
     {
-      param = tc->member_type (i TAO_ENV_ARG_PARAMETER);
+      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
       retval = TAO_Marshal_Object::perform_skip (param.in (),
                                                  stream
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
     }
 
diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp
index 3745bc069ea..4586a4d67a1 100644
--- a/TAO/tests/AMI/ami_test_i.cpp
+++ b/TAO/tests/AMI/ami_test_i.cpp
@@ -33,7 +33,7 @@ CORBA::Long
 AMI_Test_i::foo (CORBA::Long_out out_l,
                  CORBA::Long in_l,
                  const char* in_str
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    A::DidTheRightThing))
 {
@@ -58,7 +58,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l,
 
 
 void
-AMI_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
@@ -66,7 +66,7 @@ AMI_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 CORBA::Long
-AMI_Test_i::yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Test_i::yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -77,7 +77,7 @@ AMI_Test_i::yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 AMI_Test_i::yadda (CORBA::Long yadda
-                   TAO_ENV_ARG_DECL_NOT_USED)
+                   ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/AMI/ami_test_i.h b/TAO/tests/AMI/ami_test_i.h
index 8e877174b25..719c9e34f88 100644
--- a/TAO/tests/AMI/ami_test_i.h
+++ b/TAO/tests/AMI/ami_test_i.h
@@ -38,18 +38,18 @@ public:
   CORBA::Long foo (CORBA::Long_out out_l,
                    CORBA::Long in_l,
                    const char* in_str
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      A::DidTheRightThing));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Long yadda (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::Long yadda (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   void yadda (CORBA::Long yadda
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index 3dfd4a579a1..6fb873efd42 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -100,7 +100,7 @@ public:
 
   void foo (CORBA::Long result,
             CORBA::Long out_l
-            TAO_ENV_ARG_DECL_NOT_USED)
+            ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       if (debug)
@@ -115,7 +115,7 @@ public:
     };
 
    void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
@@ -123,7 +123,7 @@ public:
                   "Callback method <foo_excep> called: \n"));
       ACE_TRY
         {
-          excep_holder->raise_foo (TAO_ENV_SINGLE_ARG_PARAMETER);
+          excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -136,7 +136,7 @@ public:
     };
 
   void get_yadda (CORBA::Long result
-                  TAO_ENV_ARG_DECL_NOT_USED)
+                  ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -145,14 +145,14 @@ public:
     };
 
   void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
-  void set_yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -160,7 +160,7 @@ public:
     };
 
   void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -175,22 +175,22 @@ Handler handler;
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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;
 
       A::AMI_Test_var server =
-        A::AMI_Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        A::AMI_Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -204,7 +204,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -213,14 +213,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Let the client perform the test in a separate thread
@@ -248,12 +248,12 @@ main (int argc, char *argv[])
       while (number_of_replies > 0)
         {
           CORBA::Boolean pending =
-            orb->work_pending(TAO_ENV_SINGLE_ARG_PARAMETER);
+            orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (pending)
             {
-              orb->perform_work(TAO_ENV_SINGLE_ARG_PARAMETER);
+              orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -274,10 +274,10 @@ main (int argc, char *argv[])
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         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
@@ -298,7 +298,7 @@ Client::Client (A::AMI_Test_ptr server,
                 :  ami_test_var_ (A::AMI_Test::_duplicate (server)),
      niterations_ (niterations)
 {
-  the_handler_var_ = handler._this (/* TAO_ENV_SINGLE_ARG_PARAMETER */);
+  the_handler_var_ = handler._this (/* ACE_ENV_SINGLE_ARG_PARAMETER */);
 }
 
 int
@@ -313,7 +313,7 @@ Client::svc (void)
           ami_test_var_->sendc_foo (the_handler_var_.in (),
                                     number,
                                     "Let's talk AMI."
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (debug)
diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp
index da4274ab73f..44845b90c46 100644
--- a/TAO/tests/AMI/server.cpp
+++ b/TAO/tests/AMI/server.cpp
@@ -56,15 +56,15 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -73,11 +73,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -86,11 +86,11 @@ main (int argc, char *argv[])
       AMI_Test_i ami_test_i (orb.in ());
 
       A::AMI_Test_var ami_test_var =
-        ami_test_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ami_test_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (ami_test_var.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (ami_test_var.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -108,18 +108,18 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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;
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         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_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index b203a92e2c7..c1081426714 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -83,7 +83,7 @@ public:
 
   void foo (CORBA::Long ami_return_val,
             CORBA::Long out_l
-            TAO_ENV_ARG_DECL_NOT_USED)
+            ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       if (debug)
@@ -96,7 +96,7 @@ public:
     };
 
   void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
 
@@ -105,7 +105,7 @@ public:
                                   "Testing proper exception handling ...\n"));
       ACE_TRY
         {
-          excep_holder->raise_foo (TAO_ENV_SINGLE_ARG_PARAMETER);
+          excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (A::DidTheRightThing, ex)
@@ -124,7 +124,7 @@ public:
 
 
   void get_yadda (CORBA::Long result
-                  TAO_ENV_ARG_DECL_NOT_USED)
+                  ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -133,14 +133,14 @@ public:
     };
 
   void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
-                  TAO_ENV_ARG_DECL_NOT_USED)
+                  ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Callback method <get_yadda_excep> called: \n"));
     };
 
-  void set_yadda (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void set_yadda (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -148,7 +148,7 @@ public:
     };
 
   void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
-                  TAO_ENV_ARG_DECL_NOT_USED)
+                  ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -161,38 +161,38 @@ int
 main (int argc, char *argv[])
 {
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       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;
 
       CORBA::Object_var object_var =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa_var =
-        PortableServer::POA::_narrow (object_var.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager_var =
-        poa_var->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager_var->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       // We reuse the object_var smart pointer!
-      object_var = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+      object_var = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       A::AMI_Test_var ami_test_var =
-        A::AMI_Test::_narrow (object_var.in () TAO_ENV_ARG_PARAMETER);
+        A::AMI_Test::_narrow (object_var.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ami_test_var.in ()))
@@ -206,7 +206,7 @@ main (int argc, char *argv[])
       // Instantiate the ReplyHandler and register that with the POA.
       Handler handler;
       A::AMI_AMI_TestHandler_var the_handler_var =
-        handler._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        handler._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try out sending asynchronous messages without a reply handler
@@ -215,7 +215,7 @@ main (int argc, char *argv[])
       ami_test_var->sendc_foo (A::AMI_AMI_TestHandler::_nil (),
                                0,
                                ""
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -227,7 +227,7 @@ main (int argc, char *argv[])
       ami_test_var->sendc_foo (the_handler_var.in (),
                                0,
                                "Let's talk AMI."
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Long l = 931247;
@@ -241,22 +241,22 @@ main (int argc, char *argv[])
           ami_test_var->sendc_foo (the_handler_var.in (),
                                    l,
                                    "Let's talk AMI."
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       // Begin test of attributes
       ami_test_var->sendc_get_yadda (the_handler_var.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ami_test_var->sendc_set_yadda (the_handler_var.in (),
                                      4711
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ami_test_var->sendc_get_yadda (the_handler_var.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // End test of attributes
@@ -281,7 +281,7 @@ main (int argc, char *argv[])
       CORBA::Long number = ami_test_var->foo (l,
                                               l,
                                               "Let's talk SMI."
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (debug)
@@ -293,16 +293,16 @@ main (int argc, char *argv[])
 
       if (shutdown_flag)
         {
-          ami_test_var->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ami_test_var->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       poa_var->destroy (1,  // ethernalize objects
                         0  // wait for completion
-                        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/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
index 9d7ab0a4455..9719e14472c 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp
@@ -14,28 +14,28 @@ AMI_Buffering::AMI_Buffering (CORBA::ORB_ptr orb,
 
 void
 AMI_Buffering::receive_data (const Test::Payload &the_payload
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->admin_->request_received (the_payload.length () TAO_ENV_ARG_PARAMETER);
+  this->admin_->request_received (the_payload.length () ACE_ENV_ARG_PARAMETER);
 }
 
 void
-AMI_Buffering::flush (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Buffering::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-AMI_Buffering::sync (TAO_ENV_SINGLE_ARG_DECL)
+AMI_Buffering::sync (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->admin_->flush (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->admin_->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-AMI_Buffering::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+AMI_Buffering::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);
 }
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h
index 52614d58731..1ab2f42e125 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h
@@ -27,16 +27,16 @@ public:
 
   // = The skeleton methods
   virtual void receive_data (const Test::Payload &the_payload
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void flush (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void flush (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void sync (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void sync (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
index 9f258445acd..ccc6b54b6b1 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp
@@ -13,14 +13,14 @@ AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb)
 }
 
 CORBA::ULong
-AMI_Buffering_Admin::request_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Buffering_Admin::request_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_count_;
 }
 
 CORBA::ULong
-AMI_Buffering_Admin::bytes_received_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Buffering_Admin::bytes_received_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->bytes_received_count_;
@@ -28,7 +28,7 @@ AMI_Buffering_Admin::bytes_received_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 AMI_Buffering_Admin::request_received (CORBA::ULong payload_length
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_count_++;
@@ -36,14 +36,14 @@ AMI_Buffering_Admin::request_received (CORBA::ULong payload_length
 }
 
 void
-AMI_Buffering_Admin::flush (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+AMI_Buffering_Admin::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-AMI_Buffering_Admin::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+AMI_Buffering_Admin::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);
 }
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
index f3f3d305fbc..acc8e49201f 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h
@@ -25,20 +25,20 @@ public:
   AMI_Buffering_Admin (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong request_count (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong request_count (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong bytes_received_count (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong bytes_received_count (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void request_received (CORBA::ULong payload_length
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void flush (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void flush (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/AMI_Buffering/Client_Task.cpp b/TAO/tests/AMI_Buffering/Client_Task.cpp
index e515a0b11a4..6f49c529d36 100644
--- a/TAO/tests/AMI_Buffering/Client_Task.cpp
+++ b/TAO/tests/AMI_Buffering/Client_Task.cpp
@@ -23,14 +23,14 @@ int
 Client_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       while (1)
         {
           // run the even loop for 1 second...
           ACE_Time_Value tv (1, 0);
-          this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
+          this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
index c07882c69ce..7666e09cd4d 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.cpp
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp
@@ -10,19 +10,19 @@ Reply_Handler::Reply_Handler (void)
 }
 
 void
-Reply_Handler::receive_data (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Reply_Handler::receive_data (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Reply_Handler::receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_receive_data (TAO_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_receive_data (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -34,19 +34,19 @@ Reply_Handler::receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holde
 }
 
 void
-Reply_Handler::sync (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Reply_Handler::sync (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Reply_Handler::sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_sync (TAO_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_sync (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -58,19 +58,19 @@ Reply_Handler::sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
 }
 
 void
-Reply_Handler::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Reply_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Reply_Handler::shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h
index fe3b6df4fab..6159fc6a126 100644
--- a/TAO/tests/AMI_Buffering/Reply_Handler.h
+++ b/TAO/tests/AMI_Buffering/Reply_Handler.h
@@ -25,22 +25,22 @@ public:
   Reply_Handler (void);
 
   // = The skeleton methods
-  virtual void receive_data (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void receive_data (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void sync (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void sync (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp
index c4bc16203d6..d70c351695a 100644
--- a/TAO/tests/AMI_Buffering/admin.cpp
+++ b/TAO/tests/AMI_Buffering/admin.cpp
@@ -39,15 +39,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(AMI_buffering_admin_impl);
 
       Test::AMI_Buffering_Admin_var AMI_buffering_admin =
-        AMI_buffering_admin_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        AMI_buffering_admin_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (AMI_buffering_admin.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (AMI_buffering_admin.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -86,18 +86,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) admin - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index 1b3841c5af7..2708b9178b2 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -89,24 +89,24 @@ int
 run_message_count (CORBA::ORB_ptr orb,
                    Test::AMI_Buffering_ptr ami_buffering,
                    Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 int
 run_timeout (CORBA::ORB_ptr orb,
              Test::AMI_Buffering_ptr ami_buffering,
              Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
 int
 run_timeout_reactive (CORBA::ORB_ptr orb,
                       Test::AMI_Buffering_ptr oneway_buffering,
                       Test::AMI_Buffering_Admin_ptr oneway_buffering_admin
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
 int
 run_buffer_size (CORBA::ORB_ptr orb,
                  Test::AMI_Buffering_ptr ami_buffering,
                  Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
@@ -115,15 +115,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -132,21 +132,21 @@ 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(server_ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::AMI_Buffering_var ami_buffering =
-        Test::AMI_Buffering::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::AMI_Buffering::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ami_buffering.in ()))
@@ -158,11 +158,11 @@ main (int argc, char *argv[])
         }
 
       tmp =
-        orb->string_to_object(admin_ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(admin_ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::AMI_Buffering_Admin_var ami_buffering_admin =
-        Test::AMI_Buffering_Admin::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::AMI_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ami_buffering_admin.in ()))
@@ -187,7 +187,7 @@ main (int argc, char *argv[])
             run_message_count (orb.in (),
                                ami_buffering.in (),
                                ami_buffering_admin.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (run_timeout_test)
@@ -198,7 +198,7 @@ main (int argc, char *argv[])
             run_timeout (orb.in (),
                          ami_buffering.in (),
                          ami_buffering_admin.in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (run_timeout_reactive_test)
@@ -209,7 +209,7 @@ main (int argc, char *argv[])
             run_timeout_reactive (orb.in (),
                                   ami_buffering.in (),
                                   ami_buffering_admin.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (run_buffer_size_test)
@@ -220,7 +220,7 @@ main (int argc, char *argv[])
             run_buffer_size (orb.in (),
                              ami_buffering.in (),
                              ami_buffering_admin.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -233,16 +233,16 @@ main (int argc, char *argv[])
 
       client_task.thr_mgr ()->wait ();
 
-      ami_buffering->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ami_buffering->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ami_buffering_admin->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ami_buffering_admin->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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
@@ -261,14 +261,14 @@ configure_policies (CORBA::ORB_ptr orb,
                     const TAO::BufferingConstraint &buffering_constraint,
                     Test::AMI_Buffering_ptr ami_buffering,
                     Test::AMI_Buffering_out flusher
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object =
-    orb->resolve_initial_references ("PolicyCurrent" TAO_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::PolicyCurrent_var policy_current =
-    CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+    CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (policy_current.in ()))
@@ -286,21 +286,21 @@ configure_policies (CORBA::ORB_ptr orb,
   policies[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                         scope_as_any
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   policies[1] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
                         buffering_as_any
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   TAO::BufferingConstraint flush_constraint;
@@ -314,20 +314,20 @@ configure_policies (CORBA::ORB_ptr orb,
   policies[0] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
                         buffering_as_any
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   object =
     ami_buffering->_set_policy_overrides (policies,
                                              CORBA::ADD_OVERRIDE
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   flusher =
-    Test::AMI_Buffering::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+    Test::AMI_Buffering::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -336,17 +336,17 @@ configure_policies (CORBA::ORB_ptr orb,
 void
 sync_server (CORBA::ORB_ptr orb,
              Test::AMI_Buffering_ptr flusher
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
 {
   // Get back in sync with the server...
-  flusher->flush (TAO_ENV_SINGLE_ARG_PARAMETER);
+  flusher->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  flusher->sync (TAO_ENV_SINGLE_ARG_PARAMETER);
+  flusher->sync (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Drain responses from the queue
   ACE_Time_Value tv (0, 100000);
-  orb->run (tv TAO_ENV_ARG_PARAMETER);
+  orb->run (tv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -356,17 +356,17 @@ run_liveness_test (CORBA::ORB_ptr orb,
                    Test::AMI_Buffering_ptr ami_buffering,
                    Test::AMI_Buffering_ptr flusher,
                    Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, ".... checking for liveness\n"));
   int test_failed = 0;
 
   // Get back in sync with the server...
-  sync_server (orb, flusher TAO_ENV_ARG_PARAMETER);
+  sync_server (orb, flusher ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong send_count =
-    ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   int liveness_test_iterations = int(send_count);
@@ -381,12 +381,12 @@ run_liveness_test (CORBA::ORB_ptr orb,
     {
       ami_buffering->sendc_receive_data (reply_handler,
                                          payload
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       send_count++;
 
       CORBA::ULong receive_count =
-        ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       // Once the system has sent enough messages we don't
@@ -404,13 +404,13 @@ run_liveness_test (CORBA::ORB_ptr orb,
                       "expected %u\n",
                       i, receive_count, expected));
 
-          sync_server (orb, flusher TAO_ENV_ARG_PARAMETER);
+          sync_server (orb, flusher ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
 
       if (depth++ == LIVENESS_MAX_DEPTH)
         {
-          sync_server (orb, flusher TAO_ENV_ARG_PARAMETER);
+          sync_server (orb, flusher ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           depth = 0;
@@ -424,7 +424,7 @@ int
 run_message_count (CORBA::ORB_ptr orb,
                    Test::AMI_Buffering_ptr ami_buffering,
                    Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_MESSAGE_COUNT;
@@ -436,7 +436,7 @@ run_message_count (CORBA::ORB_ptr orb,
   int test_failed =
     configure_policies (orb, buffering_constraint,
                         ami_buffering, flusher.out ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -454,17 +454,17 @@ run_message_count (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (orb, flusher.in () TAO_ENV_ARG_PARAMETER);
+      sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_receive_count =
-        ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_receive_count != send_count)
@@ -479,12 +479,12 @@ run_message_count (CORBA::ORB_ptr orb,
         {
           ami_buffering->sendc_receive_data (reply_handler.in (),
                                              payload
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           send_count++;
 
           CORBA::ULong receive_count =
-            ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+            ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           CORBA::ULong iteration_count =
@@ -524,7 +524,7 @@ run_message_count (CORBA::ORB_ptr orb,
                        ami_buffering,
                        flusher.in (),
                        ami_buffering_admin
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
@@ -537,7 +537,7 @@ int
 run_timeout (CORBA::ORB_ptr orb,
               Test::AMI_Buffering_ptr ami_buffering,
               Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_TIMEOUT;
@@ -549,7 +549,7 @@ run_timeout (CORBA::ORB_ptr orb,
   int test_failed =
     configure_policies (orb, buffering_constraint,
                         ami_buffering, flusher.out ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -567,17 +567,17 @@ run_timeout (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (orb, flusher.in () TAO_ENV_ARG_PARAMETER);
+      sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_receive_count =
-        ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_receive_count != send_count)
@@ -593,12 +593,12 @@ run_timeout (CORBA::ORB_ptr orb,
         {
           ami_buffering->sendc_receive_data (reply_handler.in (),
                                              payload
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           send_count++;
 
           CORBA::ULong receive_count =
-            ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+            ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start;
@@ -638,7 +638,7 @@ run_timeout (CORBA::ORB_ptr orb,
                        ami_buffering,
                        flusher.in (),
                        ami_buffering_admin
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
@@ -651,7 +651,7 @@ int
 run_timeout_reactive (CORBA::ORB_ptr orb,
                       Test::AMI_Buffering_ptr ami_buffering,
                       Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_TIMEOUT;
@@ -663,7 +663,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   int test_failed =
     configure_policies (orb, buffering_constraint,
                         ami_buffering, flusher.out ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -681,17 +681,17 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (orb, flusher.in () TAO_ENV_ARG_PARAMETER);
+      sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_receive_count =
-        ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_receive_count != send_count)
@@ -707,18 +707,18 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
         {
           ami_buffering->sendc_receive_data (reply_handler.in (),
                                              payload
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           send_count++;
         }
       while (1)
         {
           CORBA::ULong receive_count =
-            ami_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+            ami_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_Time_Value sleep (0, 10000);
-          orb->run (sleep TAO_ENV_ARG_PARAMETER);
+          orb->run (sleep ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start;
@@ -759,7 +759,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
                        ami_buffering,
                        flusher.in (),
                        ami_buffering_admin
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
@@ -774,7 +774,7 @@ int
 run_buffer_size (CORBA::ORB_ptr orb,
                  Test::AMI_Buffering_ptr ami_buffering,
                  Test::AMI_Buffering_Admin_ptr ami_buffering_admin
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_MESSAGE_BYTES;
@@ -786,7 +786,7 @@ run_buffer_size (CORBA::ORB_ptr orb,
   int test_failed =
     configure_policies (orb, buffering_constraint,
                         ami_buffering, flusher.out ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -802,17 +802,17 @@ run_buffer_size (CORBA::ORB_ptr orb,
   PortableServer::ServantBase_var owner_transfer(reply_handler_impl);
 
   Test::AMI_AMI_BufferingHandler_var reply_handler =
-    reply_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    reply_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong bytes_sent = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (orb, flusher.in () TAO_ENV_ARG_PARAMETER);
+      sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_bytes_received =
-        ami_buffering_admin->bytes_received_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ami_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_bytes_received != bytes_sent)
@@ -827,12 +827,12 @@ run_buffer_size (CORBA::ORB_ptr orb,
         {
           ami_buffering->sendc_receive_data (reply_handler.in (),
                                              payload
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           bytes_sent += PAYLOAD_LENGTH;
 
           CORBA::ULong bytes_received =
-            ami_buffering_admin->bytes_received_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+            ami_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           CORBA::ULong payload_delta =
@@ -877,7 +877,7 @@ run_buffer_size (CORBA::ORB_ptr orb,
                        ami_buffering,
                        flusher.in (),
                        ami_buffering_admin
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp
index 469c863e865..80ea86a110e 100644
--- a/TAO/tests/AMI_Buffering/server.cpp
+++ b/TAO/tests/AMI_Buffering/server.cpp
@@ -45,15 +45,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -62,18 +62,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;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::AMI_Buffering_Admin_var admin =
-        Test::AMI_Buffering_Admin::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::AMI_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (admin.in ()))
@@ -92,11 +92,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(AMI_buffering_impl);
 
       Test::AMI_Buffering_var AMI_buffering =
-        AMI_buffering_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        AMI_buffering_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (AMI_buffering.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (AMI_buffering.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -109,18 +109,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index 104925ce803..d3f7271a568 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.cpp
@@ -65,22 +65,22 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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;
 
       TimeoutObj_var timeout_var =
-        TimeoutObj::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        TimeoutObj::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (timeout_var.in ()))
@@ -94,7 +94,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -103,21 +103,21 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate reply handler
       TimeoutHandler_i timeoutHandler_i;
 
       AMI_TimeoutObjHandler_var timeoutHandler_var =
-        timeoutHandler_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        timeoutHandler_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate client
@@ -130,19 +130,19 @@ main (int argc, char *argv[])
       client.activate ();
 
       // ORB loop.
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);  // Fetch responses
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);  // Fetch responses
       ACE_TRY_CHECK;
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Wait for all the threads to finish before destroying the
       // ORB.
       (void) client.thr_mgr ()->wait ();
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "ORB finished\n"));
diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp
index c9ea325ae42..0b15c0c4672 100644
--- a/TAO/tests/AMI_Timeouts/server.cpp
+++ b/TAO/tests/AMI_Timeouts/server.cpp
@@ -56,15 +56,15 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -73,11 +73,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -86,11 +86,11 @@ main (int argc, char *argv[])
       Timeout_i timeout_i (orb.in ());
 
       TimeoutObj_var timeout_var =
-        timeout_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        timeout_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (timeout_var.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (timeout_var.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -108,14 +108,14 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate reply handler
       TimeoutHandler_i timeoutHandler_i;
 
       AMI_TimeoutObjHandler_var timeoutHandler_var =
-        timeoutHandler_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        timeoutHandler_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate client
@@ -128,7 +128,7 @@ main (int argc, char *argv[])
       client->activate ();
       */
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -136,10 +136,10 @@ main (int argc, char *argv[])
 
       root_poa->destroy (1,  // ethernalize objects
                          0  // wait for completion
-                         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;
 
       //delete client;
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp
index a8b55d47f0b..32a7b694eaa 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp
@@ -44,7 +44,7 @@ TimeoutClient::svc ()
 {
   this->initialize ();
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 
@@ -61,14 +61,14 @@ TimeoutClient::svc ()
       this->none_test ();
 
       // shut down remote ORB
-      timeoutObject_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      timeoutObject_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (0, 20); // wait for the ORB to deliver the shutdonw
       ACE_OS::sleep (tv);
 
       // shut down local ORB
-      orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+      orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -87,16 +87,16 @@ TimeoutClient::svc ()
 int
 TimeoutClient::initialize ()
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::Object_var object =
         orb_->resolve_initial_references ("ORBPolicyManager"
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_manager_ =
-        CORBA::PolicyManager::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        CORBA::PolicyManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -131,7 +131,7 @@ TimeoutClient::send (CORBA::Boolean async,
 
   CORBA::PolicyList policy_list (1);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY_EX (normal)
     {
       if (local_timeout != 0)
@@ -145,12 +145,12 @@ TimeoutClient::send (CORBA::Boolean async,
           policy_list[0] =
             orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                                  any_orb
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (normal);
 
           policy_manager_->set_policy_overrides (policy_list,
                                                  CORBA::SET_OVERRIDE
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (normal);
         }
       else
@@ -158,7 +158,7 @@ TimeoutClient::send (CORBA::Boolean async,
           policy_list.length (0);
           policy_manager_->set_policy_overrides (policy_list,
                                                  CORBA::SET_OVERRIDE
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (normal);
         }
 
@@ -170,12 +170,12 @@ TimeoutClient::send (CORBA::Boolean async,
         {
           timeoutObject_->sendc_sendTimeToWait (replyHandlerObject_.in (),
                                                 remote_sleep
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
         }
       else // synch
         {
           timeoutObject_->sendTimeToWait (remote_sleep
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
         }
       ACE_TRY_CHECK_EX (normal);
     }
@@ -196,7 +196,7 @@ TimeoutClient::send (CORBA::Boolean async,
     {
       if (local_timeout != 0)
         {
-          policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (cleanup);
         }
     }
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index 45727ec7e6f..d15659f9208 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp
@@ -30,7 +30,7 @@ Timeout_i::~Timeout_i ()
 
 void
 Timeout_i::sendTimeToWait (CORBA::Long msec
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //ACE_DEBUG ((LM_DEBUG,
@@ -48,7 +48,7 @@ Timeout_i::sendTimeToWait (CORBA::Long msec
 }
 
 void
-Timeout_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Timeout_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   orb_->shutdown ();
@@ -72,7 +72,7 @@ TimeoutHandler_i::~TimeoutHandler_i ()
 }
 
 void
-TimeoutHandler_i::sendTimeToWait (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TimeoutHandler_i::sendTimeToWait (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -83,14 +83,14 @@ TimeoutHandler_i::sendTimeToWait (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TimeoutHandler_i::sendTimeToWait_excep (AMI_TimeoutObjExceptionHolder *excep_holder
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   timer_.stop ();
 
   ACE_TRY
     {
-      excep_holder->raise_sendTimeToWait (TAO_ENV_SINGLE_ARG_PARAMETER);
+      excep_holder->raise_sendTimeToWait (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TIMEOUT, timeout)
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h
index 0b2742dac01..ccf4816da42 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.h
+++ b/TAO/tests/AMI_Timeouts/timeout_i.h
@@ -33,10 +33,10 @@ public:
   ~Timeout_i ();
 
   virtual void sendTimeToWait (CORBA::Long msec
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -52,12 +52,12 @@ public:
 
   ~TimeoutHandler_i ();
 
-  virtual void sendTimeToWait (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void sendTimeToWait (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void sendTimeToWait_excep (
       AMI_TimeoutObjExceptionHolder * excep_holder
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void reset_reply_counter ();
diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index f6658882d03..a5cec1f517b 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/BiDirectional/client.cpp
@@ -44,11 +44,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -57,11 +57,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       // Policies for the childPOA to be created.
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
                             pol
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA as child of RootPOA with the above policies.  This POA
@@ -83,7 +83,7 @@ main (int argc, char *argv[])
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of childPOA is over. Destroy the Policy objects.
@@ -91,22 +91,22 @@ main (int argc, char *argv[])
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policies[i]->destroy (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;
 
       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;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -121,17 +121,17 @@ main (int argc, char *argv[])
       Callback_i callback_impl (orb.in ());
 
       Callback_var callback =
-        callback_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Send the calback object to the server
       server->callback_object (callback.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // A  method to kickstart callbacks from the server
       CORBA::Long r =
-        server->test_method (1 TAO_ENV_ARG_PARAMETER);
+        server->test_method (1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r != 0)
@@ -141,10 +141,10 @@ main (int argc, char *argv[])
                       r));
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp
index fd5c272ead5..5feeadfd930 100644
--- a/TAO/tests/BiDirectional/server.cpp
+++ b/TAO/tests/BiDirectional/server.cpp
@@ -44,11 +44,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -57,11 +57,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       // Policies for the childPOA to be created.
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
                             pol
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA as child of RootPOA with the above policies.  This POA
@@ -83,7 +83,7 @@ main (int argc, char *argv[])
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of childPOA is over. Destroy the Policy objects.
@@ -91,11 +91,11 @@ main (int argc, char *argv[])
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policies[i]->destroy (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;
 
       if (parse_args (argc, argv) != 0)
@@ -109,16 +109,16 @@ main (int argc, char *argv[])
 
       child_poa->activate_object_with_id (id.in (),
                                           &server_impl
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
         child_poa->id_to_reference (id.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -142,23 +142,23 @@ main (int argc, char *argv[])
           // Just process one upcall. We know that we would get the
           // clients IOR in that call.
           CORBA::Boolean pending =
-            orb->work_pending(TAO_ENV_SINGLE_ARG_PARAMETER);
+            orb->work_pending(ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (pending)
             {
-              orb->perform_work(TAO_ENV_SINGLE_ARG_PARAMETER);
+              orb->perform_work(ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
           // Now that hopefully we have the clients IOR, just start
           // making remote calls to the client.
-          retval = server_impl.call_client (TAO_ENV_SINGLE_ARG_PARAMETER);
+          retval = server_impl.call_client (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index e0afb927c2c..8203a116ce5 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/BiDirectional/test_i.cpp
@@ -14,15 +14,15 @@
 ACE_RCSID(BiDirectional, test_i, "$Id$")
 
 void
-Callback_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
-Callback_i::callback_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -34,7 +34,7 @@ Callback_i::callback_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_A
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback
-                              TAO_ENV_ARG_DECL_NOT_USED )
+                              ACE_ENV_ARG_DECL_NOT_USED )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
@@ -47,7 +47,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
 
 void
 Simple_Server_i::callback_object (Callback_ptr callback
-                                  TAO_ENV_ARG_DECL_NOT_USED )
+                                  ACE_ENV_ARG_DECL_NOT_USED )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
@@ -55,13 +55,13 @@ Simple_Server_i::callback_object (Callback_ptr callback
 }
 
 int
-Simple_Server_i::call_client (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::call_client (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (this->flag_)
     {
       for (int times = 0; times < this->no_iterations_; ++times)
         {
-          this->callback_->callback_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
@@ -73,7 +73,7 @@ Simple_Server_i::call_client (TAO_ENV_SINGLE_ARG_DECL)
             }
         }
 
-      this->callback_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
       this->flag_ = 0;
 
@@ -85,8 +85,8 @@ Simple_Server_i::call_client (TAO_ENV_SINGLE_ARG_DECL)
 
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_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);
 }
diff --git a/TAO/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h
index 6dbdd7c79a5..d66809ff118 100644
--- a/TAO/tests/BiDirectional/test_i.h
+++ b/TAO/tests/BiDirectional/test_i.h
@@ -31,11 +31,11 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Safe way to shutdown
 
-  void callback_method (TAO_ENV_SINGLE_ARG_DECL)
+  void callback_method (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback method
 
@@ -59,17 +59,17 @@ public:
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void callback_object (Callback_ptr callback
-                        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));
 
-  int call_client (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int call_client (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index b119fd6e7cb..8fb72a19b5a 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -45,11 +45,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -58,11 +58,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       // Policies for the childPOA to be created.
@@ -74,7 +74,7 @@ main (int argc, char *argv[])
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
                             pol
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA as child of RootPOA with the above policies.  This POA
@@ -84,7 +84,7 @@ main (int argc, char *argv[])
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of childPOA is over. Destroy the Policy objects.
@@ -92,22 +92,22 @@ main (int argc, char *argv[])
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policies[i]->destroy (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;
 
       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;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -126,18 +126,18 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(callback_impl);
 
       Callback_var callback =
-        callback_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Send the calback object to the server
       server->callback_object (callback.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Call the client that will make remote calls
 
       CORBA::Long r =
-        server->test_method (1 TAO_ENV_ARG_PARAMETER);
+        server->test_method (1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r != 0)
@@ -148,10 +148,10 @@ main (int argc, char *argv[])
         }
 
       // Shtdown the server
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
index 9623dcf960f..046e54367a1 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
@@ -44,11 +44,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -57,11 +57,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       // Policies for the childPOA to be created.
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
       policies[0] =
         orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
                             pol
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create POA as child of RootPOA with the above policies.  This POA
@@ -83,7 +83,7 @@ main (int argc, char *argv[])
         root_poa->create_POA ("childPOA",
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of childPOA is over. Destroy the Policy objects.
@@ -91,11 +91,11 @@ main (int argc, char *argv[])
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policies[i]->destroy (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;
 
       if (parse_args (argc, argv) != 0)
@@ -114,16 +114,16 @@ main (int argc, char *argv[])
 
       child_poa->activate_object_with_id (id.in (),
                                           server_impl
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
         child_poa->id_to_reference (id.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -142,12 +142,12 @@ main (int argc, char *argv[])
         }
 
       // Run the event loop
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
index 04289ca3616..d4caa76da5e 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
@@ -13,15 +13,15 @@
 ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$")
 
 void
-Callback_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
-Callback_i::callback_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -33,7 +33,7 @@ Callback_i::callback_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_A
 
 CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
@@ -46,7 +46,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
            times < this->no_iterations_;
            ++times)
         {
-          this->callback_->callback_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
@@ -64,7 +64,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback
 
 void
 Simple_Server_i::callback_object (Callback_ptr callback
-                                  TAO_ENV_ARG_DECL_NOT_USED )
+                                  ACE_ENV_ARG_DECL_NOT_USED )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Store the callback object
@@ -73,8 +73,8 @@ Simple_Server_i::callback_object (Callback_ptr callback
 
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_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);
 }
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.h b/TAO/tests/BiDirectional_NestedUpcall/test_i.h
index f8424b7272f..47f5f0c57bf 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.h
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.h
@@ -32,11 +32,11 @@ public:
   Callback_i (CORBA::ORB_ptr orb);
   // ctor
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Safe way to shutdown
 
-  void callback_method (TAO_ENV_SINGLE_ARG_DECL)
+  void callback_method (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback method
 
@@ -60,14 +60,14 @@ public:
 
   // = The Simple_Server methods.
   CORBA::Long test_method (CORBA::Boolean do_callback
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void callback_object (Callback_ptr callback
-                        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:
diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp
index 60a43593f69..6b6b332a9cc 100644
--- a/TAO/tests/Big_Oneways/Coordinator.cpp
+++ b/TAO/tests/Big_Oneways/Coordinator.cpp
@@ -30,7 +30,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                                   CORBA::ULong thread_count,
                                   CORBA::ULong message_count,
                                   Test::Session_List &session_list
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   session_list.length (this->peer_count_);
   CORBA::ULong count = 0;
@@ -44,13 +44,13 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                               thread_count,
                               message_count,
                               this->peer_count_
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL)
+Coordinator::shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (Test::Peer_var *i = this->peers_;
        i != this->peers_ + this->peer_count_;
@@ -58,7 +58,7 @@ Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL)
     {
       ACE_TRY
         {
-          (*i)->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (*i)->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -72,7 +72,7 @@ Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Coordinator::add_peer (Test::Peer_ptr peer
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->peer_count_ >= this->peer_max_)
diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h
index 48f5180eb78..0c8211c09b2 100644
--- a/TAO/tests/Big_Oneways/Coordinator.h
+++ b/TAO/tests/Big_Oneways/Coordinator.h
@@ -36,14 +36,14 @@ public:
                             CORBA::ULong thread_count,
                             CORBA::ULong message_count,
                             Test::Session_List &session_list
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
   /// Shutdown all the peers
-  void shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL);
 
   // = The skeleton methods
   virtual void add_peer (Test::Peer_ptr peer
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp
index c4bd8a20639..3ffb1bf388f 100644
--- a/TAO/tests/Big_Oneways/Peer.cpp
+++ b/TAO/tests/Big_Oneways/Peer.cpp
@@ -21,7 +21,7 @@ Peer::create_session (Test::Session_Control_ptr control,
                       CORBA::ULong thread_count,
                       CORBA::ULong message_count,
                       CORBA::ULong peer_count
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Session *session_impl;
@@ -35,11 +35,11 @@ Peer::create_session (Test::Session_Control_ptr control,
   ACE_CHECK_RETURN (Test::Session::_nil ());
   PortableServer::ServantBase_var transfer_ownership (session_impl);
 
-  return session_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return session_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -47,5 +47,5 @@ Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, shutting down ORB\n"));
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h
index 41ab681be6f..8069d439665 100644
--- a/TAO/tests/Big_Oneways/Peer.h
+++ b/TAO/tests/Big_Oneways/Peer.h
@@ -33,9 +33,9 @@ public:
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
                                             CORBA::ULong peer_count
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp
index dc1ed674ba4..f2abce4d041 100644
--- a/TAO/tests/Big_Oneways/Session.cpp
+++ b/TAO/tests/Big_Oneways/Session.cpp
@@ -36,7 +36,7 @@ Session::svc (void)
   /// thread
   PortableServer::ServantBase_var auto_decrement (this);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -53,7 +53,7 @@ Session::svc (void)
       CORBA::ULong session_count =
         this->other_sessions_.length ();
 
-      this->validate_connections (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->validate_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0; i != this->message_count_; ++i)
@@ -70,7 +70,7 @@ Session::svc (void)
           for (CORBA::ULong j = 0; j != session_count; ++j)
             {
               this->other_sessions_[j]->receive_payload (payload
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -83,7 +83,7 @@ Session::svc (void)
             return 0;
           }
       }
-      this->terminate (1 TAO_ENV_ARG_PARAMETER);
+      this->terminate (1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -97,7 +97,7 @@ Session::svc (void)
 }
 
 void
-Session::validate_connections (TAO_ENV_SINGLE_ARG_DECL)
+Session::validate_connections (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULong session_count =
     this->other_sessions_.length ();
@@ -107,7 +107,7 @@ Session::validate_connections (TAO_ENV_SINGLE_ARG_DECL)
         {
           ACE_TRY
             {
-              this->other_sessions_[j]->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
+              this->other_sessions_[j]->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           ACE_CATCHANY {} ACE_ENDTRY;
@@ -117,7 +117,7 @@ Session::validate_connections (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Session::start (const Test::Session_List &other_sessions
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Already_Running,
                    Test::No_Peers))
@@ -138,12 +138,12 @@ Session::start (const Test::Session_List &other_sessions
         // access to this object....
         ACE_TRY
           {
-            this->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             if (this->task_.activate (
                     THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1)
               {
-                this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+                this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
               }
             else
@@ -170,17 +170,17 @@ Session::start (const Test::Session_List &other_sessions
   }
   /// None of the threads are running, this session is useless at
   /// this point, report the problem and destroy the local objects
-  this->terminate (0 TAO_ENV_ARG_PARAMETER);
+  this->terminate (0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
-Session::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException))
+Session::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
 Session::receive_payload (const Test::Payload &the_payload
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (the_payload.length () != this->payload_size_)
@@ -217,23 +217,23 @@ Session::receive_payload (const Test::Payload &the_payload
     if (this->more_work ())
       return;
   }
-  this->terminate (1 TAO_ENV_ARG_PARAMETER);
+  this->terminate (1 ACE_ENV_ARG_PARAMETER);
 }
 
 
 void
-Session::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Session::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Make sure local resources are released
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -250,14 +250,14 @@ Session::more_work (void) const
 
 void
 Session::terminate (CORBA::Boolean success
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC (())
 {
   // Make sure that global resources are released
   ACE_TRY_EX(GLOBAL)
     {
       this->control_->session_finished (success
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX(GLOBAL);
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h
index 62dcd896fa5..ff450c1ff47 100644
--- a/TAO/tests/Big_Oneways/Session.h
+++ b/TAO/tests/Big_Oneways/Session.h
@@ -37,26 +37,26 @@ public:
 
   // = The skeleton methods
   virtual void start (const Test::Session_List &other_sessions
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Already_Running,
                      Test::No_Peers));
 
-  virtual void ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual void ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_payload (const Test::Payload &the_payload
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   /// Helper function used to report any problems and destroy local
   /// resources
   void terminate (CORBA::Boolean success
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC (());
 
   /// Return 1 if all the work in this session has been completed
@@ -64,7 +64,7 @@ private:
 
   /// Make sure that all threads have connections avaiable to the
   /// other sessions.
-  void validate_connections (TAO_ENV_SINGLE_ARG_DECL);
+  void validate_connections (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// Synchronize the internal state
diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp
index 62a77e985b3..5b5c2e8ee44 100644
--- a/TAO/tests/Big_Oneways/Session_Control.cpp
+++ b/TAO/tests/Big_Oneways/Session_Control.cpp
@@ -42,7 +42,7 @@ Session_Control::~Session_Control (void)
 
 void
 Session_Control::session_finished (CORBA::Boolean success
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -63,12 +63,12 @@ Session_Control::session_finished (CORBA::Boolean success
   if (session_count_ == 0)
     {
       PortableServer::POA_var poa =
-        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       PortableServer::ObjectId_var oid =
-        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h
index 3f3dfcab3f9..a574ec4134f 100644
--- a/TAO/tests/Big_Oneways/Session_Control.h
+++ b/TAO/tests/Big_Oneways/Session_Control.h
@@ -35,7 +35,7 @@ public:
 
   // = The skeleton methods
   virtual void session_finished (CORBA::Boolean success
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp
index 1b90a459f6f..ed04da64896 100644
--- a/TAO/tests/Big_Oneways/client.cpp
+++ b/TAO/tests/Big_Oneways/client.cpp
@@ -40,15 +40,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -57,18 +57,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;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Coordinator_var coordinator =
-        Test::Coordinator::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Coordinator::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (coordinator.in ()))
@@ -86,24 +86,24 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var peer_owner_transfer(peer_impl);
 
       Test::Peer_var peer =
-        peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      coordinator->add_peer (peer.in () TAO_ENV_ARG_PARAMETER);
+      coordinator->add_peer (peer.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Wait for all the threads.
       ACE_Thread_Manager::instance ()->wait ();
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp
index 20111f3eabe..183124a1e5d 100644
--- a/TAO/tests/Big_Oneways/server.cpp
+++ b/TAO/tests/Big_Oneways/server.cpp
@@ -64,15 +64,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -81,7 +81,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var coordinator_owner_transfer(coordinator_impl);
 
       Test::Coordinator_var coordinator =
-        coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        coordinator_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (coordinator.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,7 +111,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Waiting for peers . . . "));
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
            ++i)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv TAO_ENV_ARG_PARAMETER);
+          orb->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_DEBUG ((LM_DEBUG, "done.\n"));
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var session_control_owner_transfer(session_control_impl);
 
       Test::Session_Control_var session_control =
-        session_control_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        session_control_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Session_List session_list;
@@ -148,7 +148,7 @@ main (int argc, char *argv[])
                                              thread_count,
                                              message_count,
                                              session_list
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ASSERT (session_list.length () == peer_count);
@@ -169,7 +169,7 @@ main (int argc, char *argv[])
             }
 
           session_list[j]->start (other_sessions
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
@@ -180,7 +180,7 @@ main (int argc, char *argv[])
            ++k)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv TAO_ENV_ARG_PARAMETER);
+          orb->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -195,18 +195,18 @@ main (int argc, char *argv[])
 
       for (j = 0; j != peer_count; ++j)
         {
-          session_list[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          session_list[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
 
-      coordinator_impl->shutdown_all_peers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      coordinator_impl->shutdown_all_peers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Big_Reply/Big_Reply_i.cpp b/TAO/tests/Big_Reply/Big_Reply_i.cpp
index 58960000cef..40b9cca6846 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.cpp
+++ b/TAO/tests/Big_Reply/Big_Reply_i.cpp
@@ -14,7 +14,7 @@ Big_Reply_i::~Big_Reply_i (void)
 }
 
 Test::Octet_Seq *
-Big_Reply_i::get_big_reply (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Big_Reply_i::get_big_reply (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Test::Octet_Seq_var reply_mesg =
@@ -26,13 +26,13 @@ Big_Reply_i::get_big_reply (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_AR
 }
 
 void
-Big_Reply_i::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Big_Reply_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Big_Reply_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Big_Reply_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h
index ab73819e6e3..69edbcbe236 100644
--- a/TAO/tests/Big_Reply/Big_Reply_i.h
+++ b/TAO/tests/Big_Reply/Big_Reply_i.h
@@ -40,13 +40,13 @@ public:
   virtual ~Big_Reply_i (void);
 
   // = The skeleton methods
-  virtual Test::Octet_Seq *get_big_reply (TAO_ENV_SINGLE_ARG_DECL)
+  virtual Test::Octet_Seq *get_big_reply (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void ping (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp
index ff78b52259f..2a979dede09 100644
--- a/TAO/tests/Big_Reply/Client_Task.cpp
+++ b/TAO/tests/Big_Reply/Client_Task.cpp
@@ -31,7 +31,7 @@ Client_Task::svc (void)
     {
       for (int i = 0; i != this->event_count_; ++i)
         {
-          this->reply_gen_->get_big_reply (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->reply_gen_->get_big_reply (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -63,7 +63,7 @@ Client_Task::validate_connection (void)
       ACE_TRY
         {
 
-          this->reply_gen_->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->reply_gen_->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
         ACE_CATCHANY {}
diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp
index 2ada7182cf3..803b5db7e89 100644
--- a/TAO/tests/Big_Reply/client.cpp
+++ b/TAO/tests/Big_Reply/client.cpp
@@ -38,18 +38,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 tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Big_Reply_var reply_gen =
-        Test::Big_Reply::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Big_Reply::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (reply_gen.in ()))
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Got all the replies...\n"));
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp
index e00ea261bfc..9aa133ddf4f 100644
--- a/TAO/tests/Big_Reply/server.cpp
+++ b/TAO/tests/Big_Reply/server.cpp
@@ -43,11 +43,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -56,11 +56,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
 
@@ -78,12 +78,12 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var big_reply_owner_transfer(big_reply_gen);
 
       Test::Big_Reply_var big_reply =
-        big_reply_gen->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        big_reply_gen->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (big_reply.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -96,13 +96,13 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb->run ();
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
index 399aa4e0e41..dc8712a9176 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
@@ -30,18 +30,18 @@ Client_Task::svc (void)
   for (CORBA::ULong j = 0; j != payload.length (); ++j)
     payload[j] = (j % 256);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var 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;
 
       CORBA::Any scope_as_any;
@@ -53,17 +53,17 @@ Client_Task::svc (void)
       policy_list[0] =
         this->orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                                    scope_as_any
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::ADD_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != this->event_count_; ++i)
         {
-          this->payload_receiver_->more_data (payload TAO_ENV_ARG_PARAMETER);
+          this->payload_receiver_->more_data (payload ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -76,13 +76,13 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       for (int i = 0; i != 100; ++i)
         {
-          (void) this->payload_receiver_->get_message_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (void) this->payload_receiver_->get_message_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h
index a543a408097..6d6fbde41d5 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.h
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.h
@@ -32,7 +32,7 @@ public:
 private:
   /// Make sure that all threads have connections available to
   /// workaround bug 189
-  void validate_connection (TAO_ENV_SINGLE_ARG_DECL);
+  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
index 86d6c47f73d..85bfb412706 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
@@ -13,7 +13,7 @@ Payload_Receiver::Payload_Receiver (void)
 
 void
 Payload_Receiver::more_data (const Test::Payload &payload
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->message_count_++;
@@ -21,7 +21,7 @@ Payload_Receiver::more_data (const Test::Payload &payload
 }
 
 CORBA::Long
-Payload_Receiver::get_message_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Payload_Receiver::get_message_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->message_count_;
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
index 4675c2e2b30..db7e351b53e 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
@@ -29,9 +29,9 @@ public:
 
   // = The skeleton methods
   virtual void more_data (const Test::Payload &payload
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::Long get_message_count (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long get_message_count (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Request_Muxing/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp
index 52518c3d9bc..9c3764458d8 100644
--- a/TAO/tests/Big_Request_Muxing/client.cpp
+++ b/TAO/tests/Big_Request_Muxing/client.cpp
@@ -39,18 +39,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 tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Payload_Receiver_var payload_receiver =
-        Test::Payload_Receiver::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Payload_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (payload_receiver.in ()))
@@ -96,20 +96,20 @@ main (int argc, char *argv[])
         }
 
       ACE_Time_Value tv (120, 0);
-      orb->run (tv TAO_ENV_ARG_PARAMETER);
+      orb->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Thread_Manager::instance ()->wait ();
       ACE_DEBUG ((LM_DEBUG, "(%P) Threads finished\n"));
 
       CORBA::Long count =
-        payload_receiver->get_message_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+        payload_receiver->get_message_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P) - Payload_Receiver got %d messages\n",
                   count));
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp
index 55ccd63e20e..065d1ae1e2f 100644
--- a/TAO/tests/Big_Request_Muxing/server.cpp
+++ b/TAO/tests/Big_Request_Muxing/server.cpp
@@ -38,11 +38,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -68,11 +68,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(payload_receiver_impl);
 
       Test::Payload_Receiver_var payload_receiver =
-        payload_receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        payload_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (payload_receiver.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (payload_receiver.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -85,19 +85,19 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (240, 0);
-      orb->run (tv TAO_ENV_ARG_PARAMETER);
+      orb->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Now terminating test\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp
index 60a43593f69..6b6b332a9cc 100644
--- a/TAO/tests/Big_Twoways/Coordinator.cpp
+++ b/TAO/tests/Big_Twoways/Coordinator.cpp
@@ -30,7 +30,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                                   CORBA::ULong thread_count,
                                   CORBA::ULong message_count,
                                   Test::Session_List &session_list
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   session_list.length (this->peer_count_);
   CORBA::ULong count = 0;
@@ -44,13 +44,13 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control,
                               thread_count,
                               message_count,
                               this->peer_count_
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL)
+Coordinator::shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (Test::Peer_var *i = this->peers_;
        i != this->peers_ + this->peer_count_;
@@ -58,7 +58,7 @@ Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL)
     {
       ACE_TRY
         {
-          (*i)->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (*i)->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -72,7 +72,7 @@ Coordinator::shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Coordinator::add_peer (Test::Peer_ptr peer
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->peer_count_ >= this->peer_max_)
diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h
index 48f5180eb78..0c8211c09b2 100644
--- a/TAO/tests/Big_Twoways/Coordinator.h
+++ b/TAO/tests/Big_Twoways/Coordinator.h
@@ -36,14 +36,14 @@ public:
                             CORBA::ULong thread_count,
                             CORBA::ULong message_count,
                             Test::Session_List &session_list
-                            TAO_ENV_ARG_DECL);
+                            ACE_ENV_ARG_DECL);
 
   /// Shutdown all the peers
-  void shutdown_all_peers (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown_all_peers (ACE_ENV_SINGLE_ARG_DECL);
 
   // = The skeleton methods
   virtual void add_peer (Test::Peer_ptr peer
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp
index c4bd8a20639..3ffb1bf388f 100644
--- a/TAO/tests/Big_Twoways/Peer.cpp
+++ b/TAO/tests/Big_Twoways/Peer.cpp
@@ -21,7 +21,7 @@ Peer::create_session (Test::Session_Control_ptr control,
                       CORBA::ULong thread_count,
                       CORBA::ULong message_count,
                       CORBA::ULong peer_count
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Session *session_impl;
@@ -35,11 +35,11 @@ Peer::create_session (Test::Session_Control_ptr control,
   ACE_CHECK_RETURN (Test::Session::_nil ());
   PortableServer::ServantBase_var transfer_ownership (session_impl);
 
-  return session_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return session_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -47,5 +47,5 @@ Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Peer::shutdown, shutting down ORB\n"));
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h
index 41ab681be6f..8069d439665 100644
--- a/TAO/tests/Big_Twoways/Peer.h
+++ b/TAO/tests/Big_Twoways/Peer.h
@@ -33,9 +33,9 @@ public:
                                             CORBA::ULong thread_count,
                                             CORBA::ULong message_count,
                                             CORBA::ULong peer_count
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp
index efe3afe001f..2ec327b5946 100644
--- a/TAO/tests/Big_Twoways/Session.cpp
+++ b/TAO/tests/Big_Twoways/Session.cpp
@@ -36,7 +36,7 @@ Session::svc (void)
   /// thread
   PortableServer::ServantBase_var auto_decrement (this);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -63,7 +63,7 @@ Session::svc (void)
             {
               Test::Payload_var received =
                 this->other_sessions_[j]->echo_payload (payload
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -76,7 +76,7 @@ Session::svc (void)
             return 0;
           }
       }
-      this->terminate (1 TAO_ENV_ARG_PARAMETER);
+      this->terminate (1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -91,7 +91,7 @@ Session::svc (void)
 
 void
 Session::start (const Test::Session_List &other_sessions
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Already_Running,
                    Test::No_Peers))
@@ -112,12 +112,12 @@ Session::start (const Test::Session_List &other_sessions
         // access to this object....
         ACE_TRY
           {
-            this->_add_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+            this->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             if (this->task_.activate (
                     THR_NEW_LWP | THR_JOINABLE, 1, 1) == -1)
               {
-                this->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
+                this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
               }
             else
@@ -144,12 +144,12 @@ Session::start (const Test::Session_List &other_sessions
   }
   /// None of the threads are running, this session is useless at
   /// this point, report the problem and destroy the local objects
-  this->terminate (0 TAO_ENV_ARG_PARAMETER);
+  this->terminate (0 ACE_ENV_ARG_PARAMETER);
 }
 
 Test::Payload *
 Session::echo_payload (const Test::Payload &the_payload
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (the_payload.length () != this->payload_size_)
@@ -188,7 +188,7 @@ Session::echo_payload (const Test::Payload &the_payload
     if (this->more_work ())
       return retval._retn ();
   }
-  this->terminate (1 TAO_ENV_ARG_PARAMETER);
+  this->terminate (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return retval._retn ();
@@ -196,18 +196,18 @@ Session::echo_payload (const Test::Payload &the_payload
 
 
 void
-Session::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Session::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Make sure local resources are released
 
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -224,14 +224,14 @@ Session::more_work (void) const
 
 void
 Session::terminate (CORBA::Boolean success
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC (())
 {
   // Make sure that global resources are released
   ACE_TRY_EX(GLOBAL)
     {
       this->control_->session_finished (success
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX(GLOBAL);
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h
index 112165a85b2..bcee5c959d0 100644
--- a/TAO/tests/Big_Twoways/Session.h
+++ b/TAO/tests/Big_Twoways/Session.h
@@ -37,23 +37,23 @@ public:
 
   // = The skeleton methods
   virtual void start (const Test::Session_List &other_sessions
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Already_Running,
                      Test::No_Peers));
 
   virtual Test::Payload* echo_payload (const Test::Payload &the_payload
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   /// Helper function used to report any problems and destroy local
   /// resources
   void terminate (CORBA::Boolean success
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC (());
 
   /// Return 1 if all the work in this session has been completed
diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp
index 62a77e985b3..5b5c2e8ee44 100644
--- a/TAO/tests/Big_Twoways/Session_Control.cpp
+++ b/TAO/tests/Big_Twoways/Session_Control.cpp
@@ -42,7 +42,7 @@ Session_Control::~Session_Control (void)
 
 void
 Session_Control::session_finished (CORBA::Boolean success
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -63,12 +63,12 @@ Session_Control::session_finished (CORBA::Boolean success
   if (session_count_ == 0)
     {
       PortableServer::POA_var poa =
-        this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
       PortableServer::ObjectId_var oid =
-        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-      poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h
index 3f3dfcab3f9..a574ec4134f 100644
--- a/TAO/tests/Big_Twoways/Session_Control.h
+++ b/TAO/tests/Big_Twoways/Session_Control.h
@@ -35,7 +35,7 @@ public:
 
   // = The skeleton methods
   virtual void session_finished (CORBA::Boolean success
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp
index 1b90a459f6f..ed04da64896 100644
--- a/TAO/tests/Big_Twoways/client.cpp
+++ b/TAO/tests/Big_Twoways/client.cpp
@@ -40,15 +40,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -57,18 +57,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;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Coordinator_var coordinator =
-        Test::Coordinator::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Coordinator::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (coordinator.in ()))
@@ -86,24 +86,24 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var peer_owner_transfer(peer_impl);
 
       Test::Peer_var peer =
-        peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      coordinator->add_peer (peer.in () TAO_ENV_ARG_PARAMETER);
+      coordinator->add_peer (peer.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Wait for all the threads.
       ACE_Thread_Manager::instance ()->wait ();
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp
index 6b164fb63f9..75797785317 100644
--- a/TAO/tests/Big_Twoways/server.cpp
+++ b/TAO/tests/Big_Twoways/server.cpp
@@ -64,15 +64,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -81,7 +81,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var coordinator_owner_transfer(coordinator_impl);
 
       Test::Coordinator_var coordinator =
-        coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        coordinator_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (coordinator.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,7 +111,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Waiting for peers . . . "));
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
            ++i)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv TAO_ENV_ARG_PARAMETER);
+          orb->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_DEBUG ((LM_DEBUG, "done.\n"));
@@ -139,7 +139,7 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var session_control_owner_transfer(session_control_impl);
 
       Test::Session_Control_var session_control =
-        session_control_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        session_control_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Session_List session_list;
@@ -148,7 +148,7 @@ main (int argc, char *argv[])
                                              thread_count,
                                              message_count,
                                              session_list
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_ASSERT (session_list.length () == peer_count);
@@ -169,7 +169,7 @@ main (int argc, char *argv[])
             }
 
           session_list[j]->start (other_sessions
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
@@ -180,7 +180,7 @@ main (int argc, char *argv[])
            ++k)
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv TAO_ENV_ARG_PARAMETER);
+          orb->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -195,18 +195,18 @@ main (int argc, char *argv[])
 
       for (j = 0; j != peer_count; ++j)
         {
-          session_list[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          session_list[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
 
-      coordinator_impl->shutdown_all_peers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      coordinator_impl->shutdown_all_peers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
index 80af10cfde4..744dd414e47 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp
@@ -13,7 +13,7 @@ Blocking_Sync_None::Blocking_Sync_None (CORBA::ORB_ptr orb)
 void
 Blocking_Sync_None::slow_operation (const Test::Payload &,
                                     CORBA::ULong sleep_microseconds
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value sleep_time (0, sleep_microseconds);
@@ -21,8 +21,8 @@ Blocking_Sync_None::slow_operation (const Test::Payload &,
 }
 
 void
-Blocking_Sync_None::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Blocking_Sync_None::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);
 }
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
index 8e970e76ee4..ae0fc296fec 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h
@@ -27,10 +27,10 @@ public:
   // = The skeleton methods
   virtual void slow_operation (const Test::Payload &the_payload,
                                CORBA::ULong sleep_microseconds
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp
index 6275dd20856..fb8c1c89b02 100644
--- a/TAO/tests/Blocking_Sync_None/client.cpp
+++ b/TAO/tests/Blocking_Sync_None/client.cpp
@@ -46,18 +46,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 tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Blocking_Sync_None_var blocking_sync_none =
-        Test::Blocking_Sync_None::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Blocking_Sync_None::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (blocking_sync_none.in ()))
@@ -67,11 +67,11 @@ main (int argc, char *argv[])
                           1);
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PolicyCurrent" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("PolicyCurrent" 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 (CORBA::is_nil (policy_current.in ()))
@@ -86,14 +86,14 @@ main (int argc, char *argv[])
       policies[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                             scope_as_any
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const int payload_length = 65536;
@@ -111,7 +111,7 @@ main (int argc, char *argv[])
 
           blocking_sync_none->slow_operation (payload,
                                               sleep_microseconds
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday ();
@@ -123,10 +123,10 @@ main (int argc, char *argv[])
             }
         }
 
-      blocking_sync_none->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      blocking_sync_none->shutdown (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;
 
       if (blocked_calls > iterations / 20)
diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp
index 59278406f4f..8ab148a2db0 100644
--- a/TAO/tests/Blocking_Sync_None/server.cpp
+++ b/TAO/tests/Blocking_Sync_None/server.cpp
@@ -39,15 +39,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(blocking_sync_none_impl);
 
       Test::Blocking_Sync_None_var blocking_sync_none =
-        blocking_sync_none_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        blocking_sync_none_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (blocking_sync_none.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (blocking_sync_none.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -86,18 +86,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index 7b6407c01d9..dbcf70eabbb 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -213,7 +213,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Get_Opt get_opt (argc, argv, "dn:l:");
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
index c82887f6eae..87d8dec4eb4 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -33,7 +33,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       static const CORBA::TypeCode_ptr tcs[]=
@@ -104,7 +104,7 @@ main (int argc, char *argv[])
         {
           CORBA::TypeCode_ptr tc = *i;
 
-          CORBA::TCKind k = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+          CORBA::TCKind k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           switch (k)
@@ -116,10 +116,10 @@ main (int argc, char *argv[])
             case CORBA::tk_alias:
             case CORBA::tk_except:
               {
-                const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+                const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
 
-                const char *name = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+                const char *name = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
 
                 CORBA::ULong length = 0;
diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp
index c1cb89ae728..8d28b7d9bc5 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.cpp
+++ b/TAO/tests/Cache_Growth_Test/Hello.cpp
@@ -14,7 +14,7 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
@@ -27,8 +27,8 @@ Hello::get_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Hello::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Hello::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);
 }
diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h
index 2222cb5236d..501584bd17d 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.h
+++ b/TAO/tests/Cache_Growth_Test/Hello.h
@@ -25,10 +25,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (TAO_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp
index 896af123dd7..167a3e08b27 100644
--- a/TAO/tests/Cache_Growth_Test/client.cpp
+++ b/TAO/tests/Cache_Growth_Test/client.cpp
@@ -45,18 +45,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 tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (hello.in ()))
@@ -68,7 +68,7 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (TAO_ENV_SINGLE_ARG_PARAMETER);
+        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
@@ -76,11 +76,11 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          hello->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          hello->shutdown (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/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp
index dab7a38e33a..0a3a75b9185 100644
--- a/TAO/tests/Cache_Growth_Test/server.cpp
+++ b/TAO/tests/Cache_Growth_Test/server.cpp
@@ -39,15 +39,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -86,18 +86,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Client_Leaks/Client_Task.cpp b/TAO/tests/Client_Leaks/Client_Task.cpp
index 2e7d2ebc5c8..2ae166c58be 100644
--- a/TAO/tests/Client_Leaks/Client_Task.cpp
+++ b/TAO/tests/Client_Leaks/Client_Task.cpp
@@ -30,12 +30,12 @@ Client_Task::svc (void)
 
   ACE_TRY
     {
-      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != this->iterations_; ++i)
         {
-          int retval = this->one_iteration (TAO_ENV_SINGLE_ARG_PARAMETER);
+          int retval = this->one_iteration (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (retval != 0)
@@ -65,13 +65,13 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       for (int i = 0; i != 100; ++i)
         {
-          (void) this->process_factory_->noop (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (void) this->process_factory_->noop (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -84,18 +84,18 @@ Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Client_Task::one_iteration (TAO_ENV_SINGLE_ARG_DECL)
+Client_Task::one_iteration (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       Test::Process_var process =
-        this->process_factory_->create_new_process (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->process_factory_->create_new_process (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      (void) process->get_process_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+      (void) process->get_process_id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      process->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      process->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 1;
diff --git a/TAO/tests/Client_Leaks/Client_Task.h b/TAO/tests/Client_Leaks/Client_Task.h
index bf1cdcbe900..83b5fd50637 100644
--- a/TAO/tests/Client_Leaks/Client_Task.h
+++ b/TAO/tests/Client_Leaks/Client_Task.h
@@ -29,10 +29,10 @@ public:
 
 private:
   /// Run one iteration of the test
-  int one_iteration (TAO_ENV_SINGLE_ARG_DECL);
+  int one_iteration (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Make sure that the thread has a connection available
-  void validate_connection (TAO_ENV_SINGLE_ARG_DECL);
+  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp
index f7135b2fab6..02e80c8e7aa 100644
--- a/TAO/tests/Client_Leaks/Process.cpp
+++ b/TAO/tests/Client_Leaks/Process.cpp
@@ -11,16 +11,16 @@ Process::Process (CORBA::ORB_ptr orb)
 }
 
 CORBA::Long
-Process::get_process_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Process::get_process_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return ACE_OS::getpid ();
 }
 
 void
-Process::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Process::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);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h
index e2c74fcf62a..cb69ff8a24f 100644
--- a/TAO/tests/Client_Leaks/Process.h
+++ b/TAO/tests/Client_Leaks/Process.h
@@ -25,10 +25,10 @@ public:
   Process (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::Long get_process_id (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long get_process_id (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp
index 48bfb96e6d7..f1039150d26 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.cpp
+++ b/TAO/tests/Client_Leaks/Process_Factory.cpp
@@ -20,7 +20,7 @@ Process_Factory::shutdown_received (void)
 }
 
 Test::Process_ptr
-Process_Factory::create_new_process (TAO_ENV_SINGLE_ARG_DECL)
+Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed))
 {
   Startup_Callback *startup_callback_impl;
@@ -32,11 +32,11 @@ Process_Factory::create_new_process (TAO_ENV_SINGLE_ARG_DECL)
   PortableServer::ServantBase_var owner_transfer(startup_callback_impl);
 
   Test::Startup_Callback_var startup_callback =
-    startup_callback_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    startup_callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (Test::Process::_nil ());
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (startup_callback.in () TAO_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (startup_callback.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Test::Process::_nil ());
 
   const char* argv[3] = {
@@ -68,7 +68,7 @@ Process_Factory::create_new_process (TAO_ENV_SINGLE_ARG_DECL)
   for (int i = 0; i != 500 && !process_has_started; ++i)
     {
       ACE_Time_Value interval (0, 10000);
-      this->orb_->perform_work (interval TAO_ENV_ARG_PARAMETER);
+      this->orb_->perform_work (interval ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (Test::Process::_nil ());
 
       process_has_started =
@@ -78,12 +78,12 @@ Process_Factory::create_new_process (TAO_ENV_SINGLE_ARG_DECL)
   ACE_TRY
     {
       PortableServer::POA_var poa =
-        startup_callback_impl->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+        startup_callback_impl->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (startup_callback_impl TAO_ENV_ARG_PARAMETER);
+        poa->servant_to_id (startup_callback_impl ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+      poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -104,15 +104,15 @@ Process_Factory::create_new_process (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Process_Factory::noop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Process_Factory::noop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Process_Factory::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Process_Factory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->shutdown_received_ = 1;
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h
index dffc1f930b0..057e0a2557f 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.h
+++ b/TAO/tests/Client_Leaks/Process_Factory.h
@@ -28,13 +28,13 @@ public:
   int shutdown_received (void);
 
   // = The skeleton methods
-  virtual Test::Process_ptr create_new_process (TAO_ENV_SINGLE_ARG_DECL)
+  virtual Test::Process_ptr create_new_process (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed));
 
-  virtual void noop (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void noop (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Client_Leaks/Server_Task.cpp b/TAO/tests/Client_Leaks/Server_Task.cpp
index 21935bbec89..150de719f94 100644
--- a/TAO/tests/Client_Leaks/Server_Task.cpp
+++ b/TAO/tests/Client_Leaks/Server_Task.cpp
@@ -22,7 +22,7 @@ Server_Task::svc (void)
     {
       // run the test for at most 120 seconds...
       // ACE_Time_Value tv (120, 0);
-      this->orb_->run ( /* tv, */ TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run ( /* tv, */ ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.cpp b/TAO/tests/Client_Leaks/Startup_Callback.cpp
index 6c55a96b5a0..df4d755a97f 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.cpp
+++ b/TAO/tests/Client_Leaks/Startup_Callback.cpp
@@ -23,7 +23,7 @@ Startup_Callback::process_has_started (Test::Process_out the_process)
 
 void
 Startup_Callback::started (Test::Process_ptr process
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/tests/Client_Leaks/Startup_Callback.h b/TAO/tests/Client_Leaks/Startup_Callback.h
index e5b6c619ef4..2271320207e 100644
--- a/TAO/tests/Client_Leaks/Startup_Callback.h
+++ b/TAO/tests/Client_Leaks/Startup_Callback.h
@@ -33,7 +33,7 @@ public:
 
   // = The skeleton methods
   virtual void started (Test::Process_ptr the_process
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp
index b2d66aae41a..4ee5c104d0b 100644
--- a/TAO/tests/Client_Leaks/child.cpp
+++ b/TAO/tests/Client_Leaks/child.cpp
@@ -11,14 +11,14 @@ 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 (argc < 2)
         {
           // Paranoia, we should have an auto_ptr-like gadget for
           // this.
-          orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -27,10 +27,10 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var object =
-        orb->string_to_object (argv[1] TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       Test::Startup_Callback_var startup_callback =
-        Test::Startup_Callback::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test::Startup_Callback::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (startup_callback.in ()))
         {
@@ -40,11 +40,11 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -53,7 +53,7 @@ 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;
 
       Process *process_impl;
@@ -63,23 +63,23 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(process_impl);
 
       Test::Process_var process =
-        process_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        process_impl->_this (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;
 
-      startup_callback->started (process.in () TAO_ENV_ARG_PARAMETER);
+      startup_callback->started (process.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (50, 0);
-      orb->run (tv TAO_ENV_ARG_PARAMETER);
+      orb->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp
index 3dac3dff84a..a06c49b3e8a 100644
--- a/TAO/tests/Client_Leaks/client.cpp
+++ b/TAO/tests/Client_Leaks/client.cpp
@@ -51,18 +51,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 tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Process_Factory_var process_factory =
-        Test::Process_Factory::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Process_Factory::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (process_factory.in ()))
@@ -83,10 +83,10 @@ main (int argc, char *argv[])
         }
       ACE_Thread_Manager::instance ()->wait ();
 
-      process_factory->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      process_factory->shutdown (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;
 
       // Only pass the test if 90% of the calls worked
diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp
index 9f1492674bc..4260fbfd963 100644
--- a/TAO/tests/Client_Leaks/server.cpp
+++ b/TAO/tests/Client_Leaks/server.cpp
@@ -39,15 +39,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(process_factory_impl);
 
       Test::Process_Factory_var process =
-        process_factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        process_factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (process.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (process.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -86,7 +86,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Task server_task (orb.in (),
@@ -101,10 +101,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Codec/client.cpp b/TAO/tests/Codec/client.cpp
index 29062b2a642..a552eb3bef3 100644
--- a/TAO/tests/Codec/client.cpp
+++ b/TAO/tests/Codec/client.cpp
@@ -39,21 +39,21 @@ verify_data (Foo::Bar *original, Foo::Bar *extracted)
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "my_orb" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "my_orb" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain a reference to the CodecFactory.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("CodecFactory"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IOP::CodecFactory_var codec_factory =
-        IOP::CodecFactory::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        IOP::CodecFactory::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ----------------------------------------------------------
@@ -67,7 +67,7 @@ main (int argc, char *argv[])
 
       // Obtain the CDR encapsulation Codec.
       IOP::Codec_var codec =
-        codec_factory->create_codec (encoding TAO_ENV_ARG_PARAMETER);
+        codec_factory->create_codec (encoding ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ----------------------------------------------------------
@@ -101,11 +101,11 @@ main (int argc, char *argv[])
 
       // Start out with the encode() method, i.e. the one that
       // includes the TypeCode in the CDR encapsulation.
-      encoded_data = codec->encode (data TAO_ENV_ARG_PARAMETER);
+      encoded_data = codec->encode (data ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Extract the data from the octet sequence.
-      decoded_data = codec->decode (encoded_data.in () TAO_ENV_ARG_PARAMETER);
+      decoded_data = codec->decode (encoded_data.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       decoded_data.in() >>= extracted_value;
@@ -127,13 +127,13 @@ main (int argc, char *argv[])
 
       // Now use the encode_value() method, i.e. the one that does
       // *not* include the TypeCode in the CDR encapsulation.
-      encoded_data = codec->encode_value (data TAO_ENV_ARG_PARAMETER);
+      encoded_data = codec->encode_value (data ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Extract the data from the octet sequence.
       decoded_data = codec->decode_value (encoded_data.in (),
                                           Foo::_tc_Bar
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       decoded_data.in() >>= extracted_value;
diff --git a/TAO/tests/Collocation/Collocation.cpp b/TAO/tests/Collocation/Collocation.cpp
index d0e720b64a0..ee89da71243 100644
--- a/TAO/tests/Collocation/Collocation.cpp
+++ b/TAO/tests/Collocation/Collocation.cpp
@@ -13,13 +13,13 @@ int main (int argc, char *argv[])
     {
       Collocation_Test coll_test;
 
-      coll_test.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      coll_test.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      coll_test.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      coll_test.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      coll_test.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp
index c179cc0c9dd..87fba9ceb92 100644
--- a/TAO/tests/Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/Collocation/Collocation_Tester.cpp
@@ -21,19 +21,19 @@ Collocation_Test::Collocation_Test (void)
 }
 
 void
-Collocation_Test::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Collocation_Test::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->root_poa_->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+  this->root_poa_->destroy (1, 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;
 }
 
 int
-Collocation_Test::init (int argc, char *argv[] TAO_ENV_ARG_DECL)
+Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 {
   // Initialize the ORB.
-  this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+  this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   int result = this->parse_args (argc, argv);
@@ -42,52 +42,52 @@ Collocation_Test::init (int argc, char *argv[] TAO_ENV_ARG_DECL)
 
   // Get an Object reference to RootPOA.
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Narrow the Object reference to a POA reference
   this->root_poa_ =
-    PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get the POAManager of RootPOA
   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_RETURN (-1);
 
   // Activate the diamond servant and its base classes under RootPOA.
   PortableServer::ObjectId_var id =
     this->root_poa_->activate_object (&this->top_servant_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 //    // We only care about the most derived class here.
-//    this->diamond_obj_ = this->diamond_servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+//    this->diamond_obj_ = this->diamond_servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
 //    ACE_CHECK_RETURN (-1);
 
   id =
     this->root_poa_->activate_object (&this->diamond_servant_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // We only care about the most derived class here.
   this->diamond_obj_ = this->root_poa_->id_to_reference (id.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   id =
     this->root_poa_->activate_object (&this->left_servant_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   id =
     this->root_poa_->activate_object (&this->right_servant_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::String_var str =
     this->orb_->object_to_string (this->diamond_obj_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n",
@@ -106,37 +106,37 @@ Collocation_Test::parse_args (int /*argc*/,
 }
 
 int
-Collocation_Test::test_narrow (TAO_ENV_SINGLE_ARG_DECL)
+Collocation_Test::test_narrow (ACE_ENV_SINGLE_ARG_DECL)
 {
   Diamond::Top_var top =
-    Diamond::Top::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER);
+    Diamond::Top::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Left_var left =
-    Diamond::Left::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER);
+    Diamond::Left::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Right_var right =
-    Diamond::Right::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER);
+    Diamond::Right::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Buttom_var buttom =
-    Diamond::Buttom::_narrow (this->diamond_obj_.in () TAO_ENV_ARG_PARAMETER);
+    Diamond::Buttom::_narrow (this->diamond_obj_.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  CORBA::String_var str = top->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var str = top->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ()));
 
-  str = left->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = left->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling left->shape: %s\n", str.in ()));
 
-  str = right->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = right->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling right->shape: %s\n", str.in ()));
 
-  str = buttom->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = buttom->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling buttom->shape: %s\n", str.in ()));
 
@@ -144,12 +144,12 @@ Collocation_Test::test_narrow (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Collocation_Test::run (TAO_ENV_SINGLE_ARG_DECL)
+Collocation_Test::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->test_narrow (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_narrow (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/tests/Collocation/Collocation_Tester.h b/TAO/tests/Collocation/Collocation_Tester.h
index ee51d2fa1f0..131e18003dd 100644
--- a/TAO/tests/Collocation/Collocation_Tester.h
+++ b/TAO/tests/Collocation/Collocation_Tester.h
@@ -29,19 +29,19 @@ class Collocation_Test
 public:
   Collocation_Test (void);
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
-  int init (int argc, char *argv[] TAO_ENV_ARG_DECL_NOT_USED);
+  int init (int argc, char *argv[] ACE_ENV_ARG_DECL_NOT_USED);
   // Initializing the Collocation_Test object.
 
   int parse_args (int argc, char *argv[]);
   // Parse the test specific arguments.
 
-  int test_narrow (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int test_narrow (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // This test narrow an object reference to its base class and see
   // if it works correctly.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Run the test.
 
 private:
diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp
index 149c2aed27b..f94a35d2c4b 100644
--- a/TAO/tests/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Collocation/Diamond_i.cpp
@@ -13,7 +13,7 @@ Top_i::~Top_i ()
 }
 
 char *
-Top_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Top_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -32,7 +32,7 @@ Left_i::~Left_i ()
 }
 
 char *
-Left_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Left_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -41,7 +41,7 @@ Left_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Left_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Left_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -60,7 +60,7 @@ Right_i::~Right_i ()
 }
 
 char *
-Right_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Right_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -69,7 +69,7 @@ Right_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Right_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Right_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -79,7 +79,7 @@ Right_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::Long
-Right_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Right_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -98,7 +98,7 @@ Buttom_i::~Buttom_i ()
 }
 
 char *
-Buttom_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -107,7 +107,7 @@ Buttom_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Buttom_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -116,7 +116,7 @@ Buttom_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::Long
-Buttom_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -125,7 +125,7 @@ Buttom_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Buttom_i::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h
index 4d3ba4293b5..1400bbb5696 100644
--- a/TAO/tests/Collocation/Diamond_i.h
+++ b/TAO/tests/Collocation/Diamond_i.h
@@ -17,7 +17,7 @@ public:
   ~Top_i (void);
   // Ctor and dtor.
 
-  virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 };
@@ -29,11 +29,11 @@ public:
   ~Left_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 };
@@ -45,15 +45,15 @@ public:
   ~Right_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the width of the stuff.
 };
@@ -65,19 +65,19 @@ public:
   ~Buttom_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the width of the stuff.
 
-  virtual char * name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the name of the object.
 };
diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp
index 0af2e31ef87..ddd39137669 100644
--- a/TAO/tests/Connection_Purging/client.cpp
+++ b/TAO/tests/Connection_Purging/client.cpp
@@ -38,7 +38,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;
 
       if (parse_args (argc, argv) != 0)
@@ -58,11 +58,11 @@ main (int argc, char *argv[])
             {
               iorfile = "file://" + iorfile;
               CORBA::Object_var tmp =
-                orb->string_to_object(iorfile.c_str () TAO_ENV_ARG_PARAMETER);
+                orb->string_to_object(iorfile.c_str () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               test_var test =
-                test::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+                test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (CORBA::is_nil (test.in ()))
@@ -73,14 +73,14 @@ main (int argc, char *argv[])
                                     1);
                 }
 
-              test->send_stuff ("Some stuff to send" TAO_ENV_ARG_PARAMETER);
+              test->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK
 
               // Test for LFU strategy.  The transport to any other
               // server should be removed before the first one.
               if (i == 0)
                 {
-                  test->send_stuff ("Some stuff to send" TAO_ENV_ARG_PARAMETER);
+                  test->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK
 
                   holder = test;
@@ -91,7 +91,7 @@ main (int argc, char *argv[])
                                 // removed.
                   if (!CORBA::is_nil(holder.in ()))
                     {
-                      holder->send_stuff ("Some stuff to send" TAO_ENV_ARG_PARAMETER);
+                      holder->send_stuff ("Some stuff to send" ACE_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK
                     }
                 }
@@ -102,10 +102,10 @@ main (int argc, char *argv[])
             }
         }
 
-      orb->shutdown (1 TAO_ENV_ARG_PARAMETER);
+      orb->shutdown (1 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/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp
index dce725de720..0a9c8394ebf 100644
--- a/TAO/tests/Connection_Purging/server.cpp
+++ b/TAO/tests/Connection_Purging/server.cpp
@@ -38,15 +38,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -55,7 +55,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -68,11 +68,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       test_var test =
-        test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -85,19 +85,19 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
       delete test_impl;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Connection_Purging/test_i.cpp b/TAO/tests/Connection_Purging/test_i.cpp
index 9f69f9e1ec0..48b6bc7ccb1 100644
--- a/TAO/tests/Connection_Purging/test_i.cpp
+++ b/TAO/tests/Connection_Purging/test_i.cpp
@@ -5,7 +5,7 @@
 
 void
 test_i::send_stuff (const char* string
-                  TAO_ENV_ARG_DECL_NOT_USED)
+                  ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - %s\n", string));
diff --git a/TAO/tests/Connection_Purging/test_i.h b/TAO/tests/Connection_Purging/test_i.h
index b862bd1e806..d73acbf3587 100644
--- a/TAO/tests/Connection_Purging/test_i.h
+++ b/TAO/tests/Connection_Purging/test_i.h
@@ -23,7 +23,7 @@ class test_i
 public:
   // = The skeleton methods
   virtual void send_stuff (const char* string
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
index db977d4d71c..59b0bcb3398 100644
--- a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
+++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp
@@ -10,7 +10,7 @@ Oneway_Receiver::Oneway_Receiver (void)
 }
 
 void
-Oneway_Receiver::receive_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Oneway_Receiver::receive_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.h b/TAO/tests/Crash_On_Write/Oneway_Receiver.h
index 69eeebf4920..85b76acc476 100644
--- a/TAO/tests/Crash_On_Write/Oneway_Receiver.h
+++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.h
@@ -25,7 +25,7 @@ public:
   Oneway_Receiver (void);
 
   // = The skeleton methods
-  virtual void receive_oneway (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void receive_oneway (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp
index 0ea17c4a904..f43bed72e14 100644
--- a/TAO/tests/Crash_On_Write/client.cpp
+++ b/TAO/tests/Crash_On_Write/client.cpp
@@ -41,11 +41,11 @@ parse_args (int argc, char *argv[])
 
 int
 single_iteration (Test::Oneway_Receiver_ptr oneway_receiver
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      oneway_receiver->receive_oneway (TAO_ENV_SINGLE_ARG_PARAMETER);
+      oneway_receiver->receive_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_Time_Value tv (0, 40000);
       ACE_OS::sleep (tv);
@@ -64,18 +64,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 tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Oneway_Receiver_var oneway_receiver =
-        Test::Oneway_Receiver::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Oneway_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (oneway_receiver.in ()))
@@ -91,7 +91,7 @@ main (int argc, char *argv[])
       for (int i = 0; i != iterations; ++i)
         {
           int result = single_iteration (oneway_receiver.in ()
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (result)
             exception_count++;
@@ -108,7 +108,7 @@ main (int argc, char *argv[])
       if (normal_count == 0)
         ACE_ERROR ((LM_ERROR, "ERROR: no request was succesful\n"));
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp
index da03693e775..0851a528aee 100644
--- a/TAO/tests/Crash_On_Write/server.cpp
+++ b/TAO/tests/Crash_On_Write/server.cpp
@@ -40,15 +40,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -57,7 +57,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -70,11 +70,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl);
 
       Test::Oneway_Receiver_var oneway_receiver =
-        oneway_receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        oneway_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (oneway_receiver.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (oneway_receiver.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -87,7 +87,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create a separate thread to crash the server.
@@ -99,16 +99,16 @@ main (int argc, char *argv[])
           return 1;
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /*NOTREACHED*/
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
index 1c716d5ac16..c90594a4f2f 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp
@@ -10,14 +10,14 @@ Crashed_Callback::Crashed_Callback (void)
 }
 
 CORBA::Boolean
-Crashed_Callback::are_you_there (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Crashed_Callback::are_you_there (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 1;
 }
 
 void
-Crashed_Callback::crash_now_please (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Crashed_Callback::crash_now_please (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -33,7 +33,7 @@ Crashed_Callback::crash_now_please (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Crashed_Callback::test_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Crashed_Callback::test_oneway (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h
index cc1b316356b..9352c92bd6a 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.h
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h
@@ -25,13 +25,13 @@ public:
   Crashed_Callback (void);
 
   // = The skeleton methods
-  virtual CORBA::Boolean are_you_there (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Boolean are_you_there (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void crash_now_please (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void crash_now_please (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void test_oneway (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void test_oneway (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp
index 69f2817c3ff..d4786b4fb6c 100644
--- a/TAO/tests/Crashed_Callback/Service.cpp
+++ b/TAO/tests/Crashed_Callback/Service.cpp
@@ -22,28 +22,28 @@ Service::dump_results (void)
 
 void
 Service::run_test (Test::Crashed_Callback_ptr callback
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int pre_crash_exceptions =
-    this->call_are_you_there (callback TAO_ENV_ARG_PARAMETER);
+    this->call_are_you_there (callback ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   pre_crash_exceptions +=
-    this->call_test_oneway (callback TAO_ENV_ARG_PARAMETER);
+    this->call_test_oneway (callback ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) - Service, calling crash_now_please\n"));
-      callback->crash_now_please (TAO_ENV_SINGLE_ARG_PARAMETER);
+      callback->crash_now_please (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
 
   int pos_crash_exceptions =
-    this->call_test_oneway (callback TAO_ENV_ARG_PARAMETER);
+    this->call_test_oneway (callback ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (pre_crash_exceptions != 0)
@@ -70,7 +70,7 @@ Service::run_test (Test::Crashed_Callback_ptr callback
 
 int
 Service::call_are_you_there (Test::Crashed_Callback_ptr callback
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling are_you_there\n"));
@@ -81,7 +81,7 @@ Service::call_are_you_there (Test::Crashed_Callback_ptr callback
     {
       ACE_TRY
         {
-          (void) callback->are_you_there (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (void) callback->are_you_there (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -95,7 +95,7 @@ Service::call_are_you_there (Test::Crashed_Callback_ptr callback
 
 int
 Service::call_test_oneway (Test::Crashed_Callback_ptr callback
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC (())
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling test_oneway\n"));
@@ -106,7 +106,7 @@ Service::call_test_oneway (Test::Crashed_Callback_ptr callback
     {
       ACE_TRY
         {
-          (void) callback->test_oneway (TAO_ENV_SINGLE_ARG_PARAMETER);
+          (void) callback->test_oneway (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h
index 8427d6d80fe..373b00c7757 100644
--- a/TAO/tests/Crashed_Callback/Service.h
+++ b/TAO/tests/Crashed_Callback/Service.h
@@ -32,7 +32,7 @@ public:
 
   // = The skeleton methods
   virtual void run_test (Test::Crashed_Callback_ptr callback
-                         TAO_ENV_ARG_DECL)
+                         ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -41,7 +41,7 @@ private:
    * @return Number of exceptions raised
    */
   int call_are_you_there (Test::Crashed_Callback_ptr callback
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC (());
 
   /// Call the test_oneway method mutiple times.
@@ -49,7 +49,7 @@ private:
    * @return Number of exceptions raised
    */
   int call_test_oneway (Test::Crashed_Callback_ptr callback
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC (());
 
 private:
diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp
index 1c07493fbcc..546493dd016 100644
--- a/TAO/tests/Crashed_Callback/client.cpp
+++ b/TAO/tests/Crashed_Callback/client.cpp
@@ -40,15 +40,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -57,18 +57,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;
 
       // Make all oneways "reliable."
       {
         CORBA::Object_var manager_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(manager_object.in()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (CORBA::is_nil (policy_manager.in ()))
@@ -81,15 +81,15 @@ main (int argc, char *argv[])
         policies[0] =
           orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                               policy_value
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         policy_manager->set_policy_overrides (policies,
                                               CORBA::ADD_OVERRIDE
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+        policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -97,11 +97,11 @@ main (int argc, char *argv[])
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Service_var service =
-        Test::Service::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (service.in ()))
@@ -119,22 +119,22 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(crashed_callback_impl);
 
       Test::Crashed_Callback_var crashed_callback =
-        crashed_callback_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        crashed_callback_impl->_this (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;
 
-      service->run_test (crashed_callback.in () TAO_ENV_ARG_PARAMETER);
+      service->run_test (crashed_callback.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp
index 09cfd2db824..b2a766e9600 100644
--- a/TAO/tests/Crashed_Callback/server.cpp
+++ b/TAO/tests/Crashed_Callback/server.cpp
@@ -40,15 +40,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -57,18 +57,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;
 
       // Make all oneways "reliable."
       {
         CORBA::Object_var manager_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(manager_object.in()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (CORBA::is_nil (policy_manager.in ()))
@@ -81,15 +81,15 @@ main (int argc, char *argv[])
         policies[0] =
           orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                               policy_value
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         policy_manager->set_policy_overrides (policies,
                                               CORBA::ADD_OVERRIDE
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+        policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -103,11 +103,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(service_impl);
 
       Test::Service_var service =
-        service_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (service.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (service.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -120,21 +120,21 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (50, 0);
-      orb->run (tv TAO_ENV_ARG_PARAMETER);
+      orb->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Event loop finished\n"));
 
       service_impl->dump_results ();
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
index 5496c07f1fa..02dba7c117c 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
@@ -63,7 +63,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
   // -----------------------------------------------------------------
   // Boilerplate CORBA/TAO client-side ORB initialization code.
   // -----------------------------------------------------------------
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Prepend a "dummy" program name argument to the Service
@@ -88,7 +88,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
       this->orb_ = CORBA::ORB_init (new_argc,
                                     new_argv.get_buffer (),
                                     ""
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->orb_.in ()))
@@ -98,11 +98,11 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
         return 1;
 
       CORBA::Object_var obj =
-        this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->test_ =
-        Test::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        Test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->test_.in ()))
@@ -139,13 +139,13 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
 int
 Test_Client_Module::fini (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Make sure the ORB is destroyed.
       if (!CORBA::is_nil (this->orb_.in ()))
         {
-          this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -184,15 +184,15 @@ Test_Client_Module::fini (void)
 int
 Test_Client_Module::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Invoke an operation on the Test object.
-      this->test_->invoke_me (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->test_->invoke_me (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       /// Shutdown the remote ORB.
-      this->test_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->test_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
index aae697c0b63..f3d0d850cff 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
@@ -64,7 +64,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
   // -----------------------------------------------------------------
   // Boilerplate CORBA/TAO server-side ORB initialization code.
   // -----------------------------------------------------------------
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Add one to the new argc since "dummy" is being added to the
@@ -89,14 +89,14 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
       this->orb_ = CORBA::ORB_init (new_argc,
                                     new_argv.get_buffer (),
                                     0
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->orb_.in ()))
         return -1;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -105,23 +105,23 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
                           1);
 
       this->poa_ =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->poa_manager_ = this->poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->poa_manager_ = this->poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (::parse_args (new_argc, new_argv.get_buffer ()) != 0)
         return -1;
 
-      CORBA::Object_var obj = this->servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Object_var obj = this->servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        this->orb_->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
+        this->orb_->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -166,13 +166,13 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
 int
 Test_Server_Module::fini (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Make sure the ORB is destroyed.
       if (!CORBA::is_nil (this->orb_.in ()))
         {
-          this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -202,11 +202,11 @@ Test_Server_Module::fini (void)
 int
 Test_Server_Module::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Run the ORB event loop in its own thread.
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp
index f5ee66fd980..aa8d19ec17b 100644
--- a/TAO/tests/DLL_ORB/Test_i.cpp
+++ b/TAO/tests/DLL_ORB/Test_i.cpp
@@ -12,7 +12,7 @@ Test_i::Test_i (void)
 }
 
 void
-Test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
+Test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /* ACE_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_INFO,
@@ -20,14 +20,14 @@ Test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAME
 }
 
 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_INFO,
               "Server is shutting down.\n"));
 
   if (!CORBA::is_nil (this->orb_.in ()))
-    this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+    this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/tests/DLL_ORB/Test_i.h b/TAO/tests/DLL_ORB/Test_i.h
index b0f6ddb293a..9452bce731f 100644
--- a/TAO/tests/DLL_ORB/Test_i.h
+++ b/TAO/tests/DLL_ORB/Test_i.h
@@ -34,11 +34,11 @@ public:
 
   /// Simple two-way operation used to excercise the ORB transport
   /// internals.
-  virtual void invoke_me (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void invoke_me (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Set the ORB to be shutdown by the shutdown() method in this
diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp
index 047d01fe24f..4919809f944 100644
--- a/TAO/tests/DSI_Gateway/client.cpp
+++ b/TAO/tests/DSI_Gateway/client.cpp
@@ -66,7 +66,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;
 
       if (parse_args (argc, argv) != 0)
@@ -75,11 +75,11 @@ main (int argc, char *argv[])
         }
 
       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;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -95,12 +95,12 @@ main (int argc, char *argv[])
 
       if (test_user_exception == 1)
         {
-          server->raise_user_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->raise_user_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (test_system_exception == 1)
         {
-          server->raise_system_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->raise_system_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -117,7 +117,7 @@ main (int argc, char *argv[])
                                      the_in_structure,
                                      the_out_structure.out (),
                                      name.inout ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (TAO_debug_level > 0)
@@ -145,7 +145,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp
index dce3e19f8cc..4aade2c1f03 100644
--- a/TAO/tests/DSI_Gateway/gateway.cpp
+++ b/TAO/tests/DSI_Gateway/gateway.cpp
@@ -59,11 +59,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -74,14 +74,14 @@ main (int argc, char *argv[])
         }
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -90,7 +90,7 @@ main (int argc, char *argv[])
         }
 
       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;
 
       DSI_Simple_Server server_impl (orb.in (),
@@ -98,16 +98,16 @@ main (int argc, char *argv[])
                                      root_poa.in ());
       PortableServer::ObjectId_var oid =
         root_poa->activate_object (&server_impl
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var server =
         root_poa->id_to_reference (oid.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -129,7 +129,7 @@ main (int argc, char *argv[])
                 ACE_OS::fclose (output_file);
               }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp
index 8d4eabba3da..dfe1919fe78 100644
--- a/TAO/tests/DSI_Gateway/server.cpp
+++ b/TAO/tests/DSI_Gateway/server.cpp
@@ -46,11 +46,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -61,11 +61,11 @@ main (int argc, char *argv[])
         }
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -76,11 +76,11 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -102,10 +102,10 @@ main (int argc, char *argv[])
                 ACE_OS::fclose (output_file);
               }
 
-      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, "event loop finished\n"));
diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp
index a278997774d..77c7394dc92 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_Gateway/test_dsi.cpp
@@ -12,20 +12,20 @@ ACE_RCSID(DSI_Gateway, test_dsi, "$Id$")
 
 void
 DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
     {
-      this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   CORBA::NVList_ptr list;
-  this->orb_->create_list (0, list TAO_ENV_ARG_PARAMETER);
+  this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  request->arguments (list TAO_ENV_ARG_PARAMETER);
+  request->arguments (list ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Request_var target_request;
@@ -38,7 +38,7 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request
                                   0, // context_list,
                                   target_request.inout (),
                                   0
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   target_request->_tao_lazy_evaluation (1);
@@ -49,7 +49,7 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request
   ACE_TRY
     {
       // Updates the byte order state, if necessary.
-      target_request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+      target_request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UNKNOWN, ex)
@@ -72,14 +72,14 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request
 CORBA::RepositoryId
 DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &,
                                        PortableServer::POA_ptr
-                                       TAO_ENV_ARG_DECL_NOT_USED)
+                                       ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC (())
 {
   return CORBA::string_dup ("IDL:Simple_Server:1.0");
 }
 
 PortableServer::POA_ptr
-DSI_Simple_Server::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+DSI_Simple_Server::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/tests/DSI_Gateway/test_dsi.h b/TAO/tests/DSI_Gateway/test_dsi.h
index 77333ed445d..50ffe38674f 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.h
+++ b/TAO/tests/DSI_Gateway/test_dsi.h
@@ -36,18 +36,18 @@ public:
 
   // = The DynamicImplementation methods.
   virtual void invoke (CORBA::ServerRequest_ptr request
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
       PortableServer::POA_ptr poa
-      TAO_ENV_ARG_DECL
+      ACE_ENV_ARG_DECL
     )
       ACE_THROW_SPEC (());
 
   virtual PortableServer::POA_ptr _default_POA (
-      TAO_ENV_SINGLE_ARG_DECL
+      ACE_ENV_SINGLE_ARG_DECL
     );
 
 private:
diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp
index 6813e9f6af5..767dcca9973 100644
--- a/TAO/tests/DSI_Gateway/test_i.cpp
+++ b/TAO/tests/DSI_Gateway/test_i.cpp
@@ -14,7 +14,7 @@ Simple_Server_i::test_method (CORBA::Long x,
                               const Structure& the_in_structure,
                               Structure_out the_out_structure,
                               char *&name
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Structure *tmp;
@@ -39,7 +39,7 @@ Simple_Server_i::test_method (CORBA::Long x,
 }
 
 void
-Simple_Server_i::raise_user_exception (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::raise_user_exception (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      test_exception))
 {
@@ -49,15 +49,15 @@ Simple_Server_i::raise_user_exception (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Simple_Server_i::raise_system_exception (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::raise_system_exception (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW (CORBA::NO_PERMISSION ());
 }
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_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);
 }
diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h
index 6f960b77359..13d0e484c55 100644
--- a/TAO/tests/DSI_Gateway/test_i.h
+++ b/TAO/tests/DSI_Gateway/test_i.h
@@ -35,17 +35,17 @@ public:
                            const Structure& the_in_structure,
                            Structure_out the_out_structure,
                            char *&name
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void raise_user_exception (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void raise_user_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      test_exception));
 
-  void raise_system_exception (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void raise_system_exception (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:
diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp
index 9582037ebd3..82b2fa3e934 100644
--- a/TAO/tests/DynAny_Test/data.cpp
+++ b/TAO/tests/DynAny_Test/data.cpp
@@ -39,7 +39,7 @@ Data::Data (CORBA::ORB_var orb)
     m_any1 (CORBA::_tc_long),
     orb_ (orb)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -63,7 +63,7 @@ Data::Data (CORBA::ORB_var orb)
       // Getting the RootPOA so we can generate object references.
       CORBA::Object_var obj =
         this->orb_->resolve_initial_references ("RootPOA"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -76,27 +76,27 @@ Data::Data (CORBA::ORB_var orb)
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Generate values for the member variables.
      this->m_objref1 =
         root_poa->create_reference ("foo"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       this->m_objref2 =
         root_poa->create_reference ("foo"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Clean up after the POA
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index 5b44900d2d4..a5da90c10d9 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -74,7 +74,7 @@ Driver::init (int argc, char* argv[])
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     "local"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index c18f79d4569..1a795c95402 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -55,12 +55,12 @@ Test_DynAny::run_test (void)
 
       CORBA::Object_var factory_obj =
         this->orb_->resolve_initial_references ("DynAnyFactory"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAnyFactory_var dynany_factory =
         DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (dynany_factory.in ()))
@@ -72,13 +72,13 @@ Test_DynAny::run_test (void)
 
       CORBA::Any in1 (CORBA::_tc_double);
       DynamicAny::DynAny_var fa1 =
-        dynany_factory->create_dyn_any (in1 TAO_ENV_ARG_PARAMETER);
+        dynany_factory->create_dyn_any (in1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       fa1->insert_double (data.m_double1
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Double d_out = fa1->get_double (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Double d_out = fa1->get_double (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (d_out == data.m_double1)
@@ -97,14 +97,14 @@ Test_DynAny::run_test (void)
       d_out = data.m_double2;
       DynamicAny::DynAny_var ftc1 =
         dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_double
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Any in_any1;
       in_any1 <<= data.m_double1;
       ftc1->from_any (in_any1
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Any_var out_any1 = ftc1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       out_any1 >>= d_out;
 
@@ -118,9 +118,9 @@ Test_DynAny::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -133,16 +133,16 @@ Test_DynAny::run_test (void)
       CORBA_Any in (CORBA::_tc_TypeCode);
       DynamicAny::DynAny_var fa2 =
         dynany_factory->create_dyn_any (in
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       fa2->insert_typecode (data.m_typecode1
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::TypeCode_var tc_out = fa2->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var tc_out = fa2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (tc_out->equal (data.m_typecode1
-                         TAO_ENV_ARG_PARAMETER))
+                         ACE_ENV_ARG_PARAMETER))
         {
           ACE_DEBUG ((LM_DEBUG,
                      "++ OK ++\n"));
@@ -159,20 +159,20 @@ Test_DynAny::run_test (void)
 
       DynamicAny::DynAny_var ftc2 =
         dynany_factory->create_dyn_any_from_type_code (CORBA::_tc_TypeCode
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Any in_any2;
       in_any2 <<= data.m_typecode1;
       ftc2->from_any (in_any2
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Any_var out_any2 = ftc2->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var out_any2 = ftc2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::TypeCode_ptr out_tc;
       out_any2 >>= out_tc;
 
       CORBA::Boolean equal = out_tc->equal (data.m_typecode1
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (equal)
@@ -187,9 +187,9 @@ Test_DynAny::run_test (void)
 
       ACE_TRY_CHECK;
 
-      fa2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fa2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ftc2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp
index ec9fc3c1fbd..0c069d92ae2 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.cpp
+++ b/TAO/tests/DynAny_Test/test_dynarray.cpp
@@ -58,12 +58,12 @@ Test_DynArray::run_test (void)
 
       CORBA::Object_var factory_obj =
         this->orb_->resolve_initial_references ("DynAnyFactory"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAnyFactory_var dynany_factory =
         DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (dynany_factory.in ()))
@@ -77,24 +77,24 @@ Test_DynArray::run_test (void)
       in_any1 <<= ta;
       DynamicAny::DynAny_var dp1 =
         dynany_factory->create_dyn_any (in_any1
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::DynArray_var fa1 = DynamicAny::DynArray::_narrow (dp1.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       fa1->seek (1
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       fa1->insert_long (data.m_long1
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->rewind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Long l_out1 = data.m_long2;
       fa1->seek (1
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      l_out1 = fa1->get_long (TAO_ENV_SINGLE_ARG_PARAMETER);
+      l_out1 = fa1->get_long (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (l_out1 == data.m_long1)
@@ -112,12 +112,12 @@ Test_DynArray::run_test (void)
 
       DynamicAny::DynAny_var ftc1_base =
         dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_array
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynArray_var ftc1 =
         DynamicAny::DynArray::_narrow (ftc1_base.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ftc1.in ()))
@@ -131,9 +131,9 @@ Test_DynArray::run_test (void)
       CORBA::Any in_any2;
       in_any2 <<= ta;
       ftc1->from_any (in_any2
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Any_var out_any1 = ftc1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynAnyTests::test_array_forany ta_out;
       out_any1.in () >>= ta_out;
@@ -158,9 +158,9 @@ Test_DynArray::run_test (void)
       as_in[0] = in_any3;
       as_in[1] = in_any3;
       ftc1->set_elements (as_in
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      DynamicAny::AnySeq_var as_out = ftc1->get_elements (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::AnySeq_var as_out = ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA_Any out_any2 = as_out[1U];
       CORBA::Long l_out2;
@@ -176,9 +176,9 @@ Test_DynArray::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index 1b8b4d77894..f910bdfb5e5 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -50,12 +50,12 @@ Test_DynEnum::run_test (void)
 
       CORBA::Object_var factory_obj =
         this->orb_->resolve_initial_references ("DynAnyFactory"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAnyFactory_var dynany_factory =
         DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (dynany_factory.in ()))
@@ -70,16 +70,16 @@ Test_DynEnum::run_test (void)
       in_any1 <<= te;
       DynamicAny::DynAny_var dp1 =
         dynany_factory->create_dyn_any (in_any1
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::DynEnum_var de1 =
         DynamicAny::DynEnum::_narrow (dp1.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       de1->set_as_string ("TE_FIRST"
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::ULong ul_out1 = de1->get_as_ulong (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::ULong ul_out1 = de1->get_as_ulong (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ul_out1 == 1)
@@ -96,9 +96,9 @@ Test_DynEnum::run_test (void)
                  "testing: set_as_ulong/get_as_string\n"));
 
       de1->set_as_ulong (3
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::String_var s = de1->get_as_string (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::String_var s = de1->get_as_string (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp (s.in (), "TE_THIRD") == 0)
@@ -117,12 +117,12 @@ Test_DynEnum::run_test (void)
 
       DynamicAny::DynAny_var de2_base =
         dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_enum
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynEnum_var de2 =
         DynamicAny::DynEnum::_narrow (de2_base.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (de2.in ()))
@@ -135,9 +135,9 @@ Test_DynEnum::run_test (void)
       CORBA_Any in_any2;
       in_any2 <<= DynAnyTests::TE_THIRD;
       de2->from_any (in_any2
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA_Any_var out_any1 = de2->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA_Any_var out_any1 = de2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       out_any1.in () >>= te;
 
@@ -151,9 +151,9 @@ Test_DynEnum::run_test (void)
           ++this->error_count_;
         }
 
-      de1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      de1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      de2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      de2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 36e8ab2b1ce..8bea56e8f1b 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -60,12 +60,12 @@ Test_DynSequence::run_test (void)
 
       CORBA::Object_var factory_obj =
         this->orb_->resolve_initial_references ("DynAnyFactory"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAnyFactory_var dynany_factory =
         DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (dynany_factory.in ()))
@@ -81,24 +81,24 @@ Test_DynSequence::run_test (void)
       in_any1 <<= ts;
       DynamicAny::DynAny_var dp1 =
         dynany_factory->create_dyn_any (in_any1
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::DynSequence_var fa1 =
         DynamicAny::DynSequence::_narrow (dp1.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       fa1->seek (1
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       fa1->insert_string (data.m_string1
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->rewind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       fa1->seek (1
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::String_var out_str1 = fa1->get_string (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::String_var out_str1 = fa1->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!ACE_OS::strcmp (out_str1.in (), data.m_string1))
@@ -138,16 +138,16 @@ Test_DynSequence::run_test (void)
           elem_any <<= CORBA::Any::from_string (values[i],
                                                 8);
           elements[i] = dynany_factory->create_dyn_any (elem_any
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       fa1->set_elements_as_dyn_any (elements.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAnySeq_var out_elems =
-        fa1->get_elements_as_dyn_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+        fa1->get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (out_elems->length () != 3)
@@ -160,12 +160,12 @@ Test_DynSequence::run_test (void)
 
       for (i = 0; i < length; ++i)
         {
-          out_str = out_elems[i]->get_string (TAO_ENV_SINGLE_ARG_PARAMETER);
+          out_str = out_elems[i]->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Boolean equal =
             out_elems[i]->equal (elements[i].in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (!equal)
@@ -175,7 +175,7 @@ Test_DynSequence::run_test (void)
 
           // To show that calling destroy() on a component does
           // nothing, as required by the spec.
-          out_elems[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          out_elems[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -191,13 +191,13 @@ Test_DynSequence::run_test (void)
       DynamicAny::DynAny_var ftc1_base =
         dynany_factory->create_dyn_any_from_type_code (
                             DynAnyTests::_tc_test_seq
-                            TAO_ENV_ARG_PARAMETER
+                            ACE_ENV_ARG_PARAMETER
                           );
       ACE_TRY_CHECK;
 
       DynamicAny::DynSequence_var ftc1 =
         DynamicAny::DynSequence::_narrow (ftc1_base.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ftc1.in ()))
@@ -211,9 +211,9 @@ Test_DynSequence::run_test (void)
       CORBA_Any in_any2;
       in_any2 <<= ts;
       ftc1->from_any (in_any2
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Any_var out_any1 = ftc1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynAnyTests::test_seq *ts_out;
       out_any1.in () >>= ts_out;
@@ -231,7 +231,7 @@ Test_DynSequence::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: length/set_elements/get_elements\n"));
 
-      length = ftc1->get_length (TAO_ENV_SINGLE_ARG_PARAMETER);
+      length = ftc1->get_length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (length != 2)
@@ -240,7 +240,7 @@ Test_DynSequence::run_test (void)
         }
 
       ftc1->set_length (3
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::AnySeq as_in (3);
       as_in.length (3);
@@ -251,9 +251,9 @@ Test_DynSequence::run_test (void)
       in_any3 <<= CORBA::Any::from_string (data.m_string1, 8);
       as_in[2] = in_any3;
       ftc1->set_elements (as_in
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      DynamicAny::AnySeq_var as_out = ftc1->get_elements (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::AnySeq_var as_out = ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::ULong index = 2;
       CORBA_Any out_any2 = as_out[index];
@@ -271,9 +271,9 @@ Test_DynSequence::run_test (void)
                      "++ OK ++\n"));
         }
 
-      fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index b72b83e6229..52c2abf7ee2 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -58,12 +58,12 @@ Test_DynStruct::run_test (void)
 
       CORBA::Object_var factory_obj =
         this->orb_->resolve_initial_references ("DynAnyFactory"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAnyFactory_var dynany_factory =
         DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (dynany_factory.in ()))
@@ -77,44 +77,44 @@ Test_DynStruct::run_test (void)
       in_any1 <<= ts;
       DynamicAny::DynAny_var dp1 =
         dynany_factory->create_dyn_any (in_any1
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::DynStruct_var fa1 =
         DynamicAny::DynStruct::_narrow (dp1.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       fa1->insert_char (data.m_char1
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->next (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       fa1->insert_long (data.m_long1
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      fa1->next (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      DynamicAny::DynAny_var cc = fa1->current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var cc = fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       cc->insert_float (data.m_float1
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      cc->next (TAO_ENV_SINGLE_ARG_PARAMETER);
+      cc->next (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       cc->insert_short (data.m_short1
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      cc->rewind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      cc->rewind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // To show that calling destroy() on a component does
       // nothing, as required by the spec.
-      cc->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      cc->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      fa1->rewind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Char c = fa1->get_char (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Char c = fa1->get_char (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (c != data.m_char1)
@@ -122,9 +122,9 @@ Test_DynStruct::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->next (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Long l = fa1->get_long (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Long l = fa1->get_long (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (l != data.m_long1)
@@ -132,16 +132,16 @@ Test_DynStruct::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->next (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      cc = fa1->current_component (TAO_ENV_SINGLE_ARG_PARAMETER);
+      cc = fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       cc->seek (1
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Short s = cc->get_short (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Short s = cc->get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (s != data.m_short1)
@@ -160,12 +160,12 @@ Test_DynStruct::run_test (void)
 
       DynamicAny::DynAny_var ftc1_base =
         dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_struct
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynStruct_var ftc1 =
         DynamicAny::DynStruct::_narrow (ftc1_base.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ftc1.in ()))
@@ -182,9 +182,9 @@ Test_DynStruct::run_test (void)
       CORBA_Any in_any2;
       in_any2 <<= ts;
       ftc1->from_any (in_any2
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA_Any_var out_any1 = ftc1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA_Any_var out_any1 = ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynAnyTests::test_struct* ts_out;
       out_any1.in () >>= ts_out;
@@ -203,10 +203,10 @@ Test_DynStruct::run_test (void)
                  "testing: current_member_name/current_member_kind\n"));
 
       ftc1->seek (2
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::FieldName_var fn =
-        ftc1->current_member_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ftc1->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp (fn.in (), "es"))
@@ -214,7 +214,7 @@ Test_DynStruct::run_test (void)
           ++this->error_count_;
         }
 
-      CORBA::TCKind tk = ftc1->current_member_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind tk = ftc1->current_member_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (tk != CORBA::tk_struct)
@@ -231,18 +231,18 @@ Test_DynStruct::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: get_members/set_members\n"));
 
-      DynamicAny::NameValuePairSeq_var nvps = fa1->get_members (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::NameValuePairSeq_var nvps = fa1->get_members (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::DynAny_var sm_base =
         dynany_factory->create_dyn_any_from_type_code (
             DynAnyTests::_tc_test_struct
-            TAO_ENV_ARG_PARAMETER
+            ACE_ENV_ARG_PARAMETER
           );
       ACE_TRY_CHECK;
 
       DynamicAny::DynStruct_var sm =
         DynamicAny::DynStruct::_narrow (sm_base.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (sm.in ()))
@@ -253,9 +253,9 @@ Test_DynStruct::run_test (void)
         }
 
       sm->set_members (nvps.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      DynamicAny::NameValuePairSeq_var gm = sm->get_members (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::NameValuePairSeq_var gm = sm->get_members (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::ULong index = 2;
 
@@ -264,11 +264,11 @@ Test_DynStruct::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      sm->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      sm->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index fb4ce42e20f..c12a5b576e4 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -58,12 +58,12 @@ Test_DynUnion::run_test (void)
 
       CORBA::Object_var factory_obj =
         this->orb_->resolve_initial_references ("DynAnyFactory"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynAnyFactory_var dynany_factory =
         DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (dynany_factory.in ()))
@@ -79,19 +79,19 @@ Test_DynUnion::run_test (void)
       in_any1 <<= tu;
       DynamicAny::DynAny_var dp1 =
         dynany_factory->create_dyn_any (in_any1
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::DynUnion_var fa1 =
         DynamicAny::DynUnion::_narrow (dp1.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       fa1->seek (1
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       fa1->insert_typecode (data.m_typecode1
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::TypeCode_var s_out1 = fa1->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var s_out1 = fa1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (s_out1.in ()->equal (data.m_typecode1))
@@ -107,16 +107,16 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      CORBA_Any_var out_any1 = fa1->to_any (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA_Any_var out_any1 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       DynamicAny::DynAny_var ftc1_base =
         dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       DynamicAny::DynUnion_var ftc1 =
         DynamicAny::DynUnion::_narrow (ftc1_base.in ()
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ftc1.in ()))
@@ -127,12 +127,12 @@ Test_DynUnion::run_test (void)
         }
 
       ftc1->from_any (out_any1.in ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ftc1->seek (1
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::TypeCode_var s_out2 = ftc1->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var s_out2 = ftc1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (s_out2.in ()->equal (data.m_typecode1))
@@ -148,15 +148,15 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing:discriminator/discriminator_kind\n"));
 
-      DynamicAny::DynAny_var dp2 = ftc1->get_discriminator (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var dp2 = ftc1->get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::TypeCode_var tc2 = dp2->type (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var tc2 = dp2->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::TCKind tc1kind = ftc1->discriminator_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind tc1kind = ftc1->discriminator_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::TCKind tc2kind = tc2->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind tc2kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (tc2kind == tc1kind)
@@ -172,13 +172,13 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing:member/member_kind/member_name\n"));
 
-      DynamicAny::DynAny_var dp3 = ftc1->member (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var dp3 = ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::String_var m_nm = ftc1->member_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::String_var m_nm = ftc1->member_name (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::TCKind tk = ftc1->member_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TCKind tk = ftc1->member_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::TypeCode_var tc3 = dp3->get_typecode (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::TypeCode_var tc3 = dp3->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!ACE_OS::strcmp (m_nm.in (), "tc")
@@ -198,17 +198,17 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: set_to_default_member\n"));
 
-      ftc1->set_to_default_member (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ftc1->set_to_default_member (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ftc1->seek (1
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ftc1->insert_short (data.m_short1
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      DynamicAny::DynAny_var mem = ftc1->member (TAO_ENV_SINGLE_ARG_PARAMETER);
+      DynamicAny::DynAny_var mem = ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      CORBA::Short out_s = mem->get_short (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Short out_s = mem->get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (out_s == data.m_short1)
@@ -221,9 +221,9 @@ Test_DynUnion::run_test (void)
           ++this->error_count_;
         }
 
-      fa1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      ftc1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Explicit_Event_Loop/client.cpp b/TAO/tests/Explicit_Event_Loop/client.cpp
index 984dcbc34c6..1b017101e10 100644
--- a/TAO/tests/Explicit_Event_Loop/client.cpp
+++ b/TAO/tests/Explicit_Event_Loop/client.cpp
@@ -29,14 +29,14 @@
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             ""
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check arguments.
@@ -49,7 +49,7 @@ main (int argc, char *argv[])
 
       // Destringify argv[1].
       CORBA::Object_var obj = orb->string_to_object (argv[1]
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if  (CORBA::is_nil (obj.in ()))
@@ -61,7 +61,7 @@ main (int argc, char *argv[])
 
       // Narrow.
       Time_var tm = Time::_narrow (obj.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if  (CORBA::is_nil (tm.in ()))
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
         }
 
       // Get time.
-      TimeOfDay tod = tm->get_gmt (TAO_ENV_SINGLE_ARG_PARAMETER);
+      TimeOfDay tod = tm->get_gmt (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp
index 7745b295325..5c25f97887d 100644
--- a/TAO/tests/Explicit_Event_Loop/server.cpp
+++ b/TAO/tests/Explicit_Event_Loop/server.cpp
@@ -57,7 +57,7 @@ parse_args (int argc, char *argv[])
 
 TimeOfDay
 Time_impl::
-get_gmt ( TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+get_gmt ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   time_t time_now = time (0);
@@ -83,14 +83,14 @@ void do_something_else()
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize orb
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             ""
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -101,31 +101,31 @@ main (int argc, char *argv[])
       // Get reference to Root POA.
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA"
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate POA manager.
       PortableServer::POAManager_var mgr
-        = poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        = poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create an object.
       Time_impl time_servant;
 
       // Write its stringified reference to stdout.
-      Time_var tm = time_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Time_var tm = time_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str = orb->object_to_string (tm.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -157,12 +157,12 @@ main (int argc, char *argv[])
       while (!done)
         {
           CORBA::Boolean pending =
-            orb->work_pending (TAO_ENV_SINGLE_ARG_PARAMETER);
+            orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (pending)
             {
-              orb->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
+              orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           do_something_else ();
diff --git a/TAO/tests/Explicit_Event_Loop/server.h b/TAO/tests/Explicit_Event_Loop/server.h
index 86d504ec72b..e5c19b27546 100644
--- a/TAO/tests/Explicit_Event_Loop/server.h
+++ b/TAO/tests/Explicit_Event_Loop/server.h
@@ -26,7 +26,7 @@
 class Time_impl : public virtual POA_Time
 {
 public:
-  virtual TimeOfDay get_gmt (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual TimeOfDay get_gmt (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp
index 02c51916335..4a707034563 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.cpp
+++ b/TAO/tests/Exposed_Policies/Counter_i.cpp
@@ -21,30 +21,30 @@ Counter_Servant::~Counter_Servant (void)
 // Counter Interface Methods Implementation.
 
 void
-Counter_Servant::increment (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Counter_Servant::increment (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++this->count_;
 }
 
 CORBA::Long
-Counter_Servant::get_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Counter_Servant::get_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->count_;
 }
 
 void
-Counter_Servant::reset (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Counter_Servant::reset (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->count_ = 0;
 }
 
 void
-Counter_Servant::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Counter_Servant::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->policy_tester_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->policy_tester_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_TRY_CHECK;
 }
diff --git a/TAO/tests/Exposed_Policies/Counter_i.h b/TAO/tests/Exposed_Policies/Counter_i.h
index 2ed503217ea..503d9cd3296 100644
--- a/TAO/tests/Exposed_Policies/Counter_i.h
+++ b/TAO/tests/Exposed_Policies/Counter_i.h
@@ -35,16 +35,16 @@ public:
 
   // = Counter Interface Methods Overloading.
 
-  virtual void increment (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void increment (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Long get_count (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Long get_count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual void reset (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+  virtual void reset (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index e8beea4ce17..e9b672afcff 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -28,38 +28,38 @@ Policy_Tester::~Policy_Tester (void)
 }
 
 void
-Policy_Tester::run (TAO_ENV_SINGLE_ARG_DECL)
+Policy_Tester::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POAManager_var poa_manager =
-    this->child_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->child_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 Policy_Tester::init (int argc,
                      char *argv[]
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   // ORB Initialization.
   this->orb_ =
     CORBA::ORB_init (argc, argv, ""
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get a reference to the RT-ORB.
   CORBA::Object_var object =
     this->orb_->resolve_initial_references ("RTORB"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Here we parse the command line paramether passed
@@ -74,13 +74,13 @@ Policy_Tester::init (int argc,
       if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile")))
         {
           this->rt_poa_properties_ =
-            RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER);
+            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
       else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile")))
         {
           this->rt_object_properties_ =
-            RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER);
+            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
       else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR")))
@@ -119,7 +119,7 @@ Policy_Tester::init (int argc,
     }
 
   int result =
-    this->create_objects (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->create_objects (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (result != 0)
@@ -142,7 +142,7 @@ Policy_Tester::check_reference (CORBA::Object_ptr object,
 
 
 int
-Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
+Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
 {
   CORBA::PolicyList poa_policy_list;
   poa_policy_list.length (3);
@@ -152,7 +152,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
   poa_policy_list[0] =
     this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
                                                  priority
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
       // Create priority Banded Connection Policy.
@@ -161,7 +161,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
 
   poa_policy_list[1] =
     this->rt_orb_->create_priority_banded_connection_policy (poa_priority_bands
-                                                             TAO_ENV_ARG_PARAMETER);
+                                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
       // Client Protocol Policy.
@@ -179,11 +179,11 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
     this->rt_orb_->create_client_protocol_policy (protocol_list);
 
   CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->poa_ =
-    PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   PortableServer::POAManager_var poa_mgr =
@@ -193,18 +193,18 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
     this->poa_->create_POA ("Child_POA",
                             poa_mgr.in (),
                             poa_policy_list
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->child_poa_ =
-    RTPortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+    RTPortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Create a Corba Object reference, using the policies
   // set at the POA level.
   object =
     this->child_poa_->create_reference ("IDL:Counter:1.0"
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -214,7 +214,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
                         "Unable to create Object!\n"))
     return -1;
 
-  Counter_var base_object = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+  Counter_var base_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (!check_reference (base_object.in(),
@@ -222,7 +222,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
     return -1;
 
   CORBA::String_var ior =
-    this->orb_->object_to_string (base_object.in () TAO_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (base_object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -248,7 +248,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
     this->child_poa_->create_reference_with_priority
     ("IDL:Counter:1.0",
      this->rt_object_properties_->priority ()
-     TAO_ENV_ARG_PARAMETER);
+     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -258,7 +258,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
                         "Unable to create a Counter Object!\n"))
     return -1;
 
-  Counter_var over_object = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+  Counter_var over_object = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (!check_reference (over_object.in(),
@@ -267,7 +267,7 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
 
 
   CORBA::String_var o_ior =
-    this->orb_->object_to_string (over_object.in () TAO_ENV_ARG_PARAMETER);
+    this->orb_->object_to_string (over_object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -286,8 +286,8 @@ Policy_Tester::create_objects (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Policy_Tester::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Policy_Tester::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.h b/TAO/tests/Exposed_Policies/Policy_Tester.h
index 86440cb829e..d2a0047ec94 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.h
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.h
@@ -35,17 +35,17 @@ public:
   Policy_Tester (void);
   ~Policy_Tester (void);
 
-  void run (TAO_ENV_SINGLE_ARG_DECL);
+  void run (ACE_ENV_SINGLE_ARG_DECL);
   // Runs the test.
 
   int init (int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 private:
   // Helper method used internally.
-  int create_objects (TAO_ENV_SINGLE_ARG_DECL);
+  int create_objects (ACE_ENV_SINGLE_ARG_DECL);
 
   CORBA::Boolean check_reference (CORBA::Object_ptr object,
                                    const char *msg);
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 8d2329cfa06..ca2c68986ce 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -19,10 +19,10 @@ Policy_Verifier::~Policy_Verifier (void)
 void
 Policy_Verifier::init (int argc,
                        char *argv[]
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   this->orb_ =
-    CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+    CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_Arg_Shifter arg_shifter (argc, argv);
@@ -34,7 +34,7 @@ Policy_Verifier::init (int argc,
       if ((arg = arg_shifter.get_the_parameter ("-POAConfigFile")))
         {
           this->rt_poa_properties_ =
-            RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER);
+            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
           this->priority_bands_ =
             this->rt_poa_properties_->priority_bands ().length ();
@@ -42,7 +42,7 @@ Policy_Verifier::init (int argc,
       else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile")))
         {
           this->rt_object_properties_ =
-            RT_Properties::read_from (arg TAO_ENV_ARG_PARAMETER);
+            RT_Properties::read_from (arg ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR")))
@@ -89,26 +89,26 @@ Policy_Verifier::init (int argc,
 
   // Get the Object references.
   CORBA::Object_var object = this->orb_->string_to_object (this->base_object_ref_
-                                                           TAO_ENV_ARG_PARAMETER);
+                                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n"))
     return;
 
-  this->base_object_ = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+  this->base_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!Policy_Verifier::check_reference (this->base_object_.in (),
                                          "Unable to convert the IOR to the proper object reference.\n"))
     return;
 
-  object = this->orb_->string_to_object (this->overridden_object_ref_ TAO_ENV_ARG_PARAMETER);
+  object = this->orb_->string_to_object (this->overridden_object_ref_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!Policy_Verifier::check_reference (object.in (), "Invalid IOR file!\n"))
     return;
 
-  this->overridden_object_ = Counter::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+  this->overridden_object_ = Counter::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!Policy_Verifier::check_reference (this->overridden_object_.in (),
@@ -118,30 +118,30 @@ Policy_Verifier::init (int argc,
 }
 
 void
-Policy_Verifier::run (TAO_ENV_SINGLE_ARG_DECL )
+Policy_Verifier::run (ACE_ENV_SINGLE_ARG_DECL )
 {
   this->verify_reference (this->base_object_.in (),
                           this->rt_poa_properties_
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->verify_reference (this->overridden_object_.in (),
                           this->rt_object_properties_
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Policy_Verifier::verify_reference (Counter_ptr object,
                                    RT_Properties *rt_properties
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
 
   ACE_TRY
     {
       CORBA::Policy_var policy_var =
         object->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (Policy_Verifier::check_reference (policy_var.in (), "Unable to get Priority Policy.\n"))
@@ -150,11 +150,11 @@ Policy_Verifier::verify_reference (Counter_ptr object,
             RTCORBA::PriorityModelPolicy::_narrow (policy_var.in ());
 
           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;
 
           RTCORBA::Priority priority =
-            priority_policy->server_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
+            priority_policy->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (priority_model == RTCORBA::SERVER_DECLARED)
@@ -175,14 +175,14 @@ Policy_Verifier::verify_reference (Counter_ptr object,
         }
 
       policy_var = object->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       if (Policy_Verifier::check_reference (policy_var.in (),
                                           "Unable to get Priority Banded Policy\n"))
         {
 
           RTCORBA::PriorityBandedConnectionPolicy_var priority_banded_policy =
             RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy_var.in ()
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
@@ -219,16 +219,16 @@ Policy_Verifier::verify_reference (Counter_ptr object,
             }
         }
       policy_var = object->_get_policy (RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       if (Policy_Verifier::check_reference (policy_var.in (),
                                             "Unable to get Client Protocol Policy\n"))
         {
           RTCORBA::ClientProtocolPolicy_var client_protocol_policy =
-            RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in () TAO_ENV_ARG_PARAMETER);
+            RTCORBA::ClientProtocolPolicy::_narrow (policy_var.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           RTCORBA::ProtocolList_var protocol_list =
-            client_protocol_policy->protocols (TAO_ENV_SINGLE_ARG_PARAMETER);
+            client_protocol_policy->protocols (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           for (unsigned int  i = 0; i < protocol_list->length (); i++)
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.h b/TAO/tests/Exposed_Policies/Policy_Verifier.h
index d533a32f64a..26afd3e9540 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.h
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.h
@@ -40,15 +40,15 @@ public:
 
   void init (int argc,
              char *argv[]
-             TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  void run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
 private:
   // -- Helper methods --
   void verify_reference (Counter_ptr counter,
                          RT_Properties *rt_properties
-                         TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   CORBA::Boolean check_reference (CORBA::Object_ptr object,
                                   const char *msg);
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index cff2300b0be..5f49c4bec7a 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -17,7 +17,7 @@ RT_Properties::~RT_Properties (void)
 
 RT_Properties *
 RT_Properties::read_from (const char *file_name
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   FILE *fp = ACE_OS::fopen (file_name, "r");
 
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.h b/TAO/tests/Exposed_Policies/RT_Properties.h
index 310c8c99174..35166b9d9fa 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.h
+++ b/TAO/tests/Exposed_Policies/RT_Properties.h
@@ -30,7 +30,7 @@ public:
   ~RT_Properties (void);
 
   static RT_Properties * read_from (const char *file_name
-                                    TAO_ENV_ARG_DECL);
+                                    ACE_ENV_ARG_DECL);
 
   // -- Accessor Methods --
   void priority (RTCORBA::Priority priority);
diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp
index 4859498b674..05ad6e1d8cb 100644
--- a/TAO/tests/Exposed_Policies/client.cpp
+++ b/TAO/tests/Exposed_Policies/client.cpp
@@ -14,16 +14,16 @@ ACE_RCSID(tao, client, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       Policy_Verifier policy_verifier;
 
-      policy_verifier.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      policy_verifier.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policy_verifier.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policy_verifier.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp
index 2903e49602e..ecc7d20d022 100644
--- a/TAO/tests/Exposed_Policies/server.cpp
+++ b/TAO/tests/Exposed_Policies/server.cpp
@@ -21,19 +21,19 @@ ACE_RCSID(tao, server, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       Policy_Tester policy_tester;
 
-      int result = policy_tester.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int result = policy_tester.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      policy_tester.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policy_tester.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
index 49072049238..d0c07a5748e 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -40,7 +40,7 @@ public:
   // Call show on all the window objects
 
   void parse_args (int argc, char *argv[]
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 
 private:
   static void x_cb (Fl_Widget *widget, void* cookie);
@@ -68,7 +68,7 @@ int 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;
 
       Fl_Window window (300, 100);
@@ -81,7 +81,7 @@ int main (int argc, char* argv[])
 
       client.show ();
 
-      client.parse_args (argc, argv TAO_ENV_ARG_PARAMETER);
+      client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Fl::run ();
@@ -149,7 +149,7 @@ Client::x_changed (void)
   ACE_TRY_NEW_ENV
     {
       CORBA::Long x = CORBA::Long (this->x_roller_->value ());
-      this->server_->set_x_angle (x TAO_ENV_ARG_PARAMETER);
+      this->server_->set_x_angle (x ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -165,7 +165,7 @@ Client::y_changed (void)
   ACE_TRY_NEW_ENV
     {
       CORBA::Long y = CORBA::Long (this->y_roller_->value ());
-      this->server_->set_y_angle (y TAO_ENV_ARG_PARAMETER);
+      this->server_->set_y_angle (y ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -177,7 +177,7 @@ Client::y_changed (void)
 
 void
 Client::parse_args (int argc, char *argv[]
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   const char *ior = "file://test.ior";
 
@@ -200,11 +200,11 @@ Client::parse_args (int argc, char *argv[]
       }
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+    this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->server_ =
-    Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+    Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 #endif /* ACE_HAS_FL */
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
index bd86b538654..c7ec9047999 100644
--- a/TAO/tests/FL_Cube/server.cpp
+++ b/TAO/tests/FL_Cube/server.cpp
@@ -61,7 +61,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;
 
       if (parse_args (argc, argv) != 0)
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
       sw.show ();
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -82,21 +82,21 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       Simple_Server_i server_impl (orb.in (), &sw);
 
       Simple_Server_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -114,7 +114,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (Fl::run () == -1)
diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp
index cac8329a03c..2995785d1c8 100644
--- a/TAO/tests/FL_Cube/test_i.cpp
+++ b/TAO/tests/FL_Cube/test_i.cpp
@@ -20,19 +20,19 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
 }
 
 void
-Simple_Server_i::set_x_angle (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::set_x_angle (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->window_->set_x_angle (x);
 }
 
 void
-Simple_Server_i::set_y_angle (CORBA::Long y TAO_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::set_y_angle (CORBA::Long y ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->window_->set_y_angle (y);
 }
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->orb_->shutdown (0);
 }
diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h
index 2ae0ae47de9..b90dbb78989 100644
--- a/TAO/tests/FL_Cube/test_i.h
+++ b/TAO/tests/FL_Cube/test_i.h
@@ -64,9 +64,9 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void set_x_angle (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED);
-  void set_y_angle (CORBA::Long y TAO_ENV_ARG_DECL_NOT_USED);
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void set_x_angle (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED);
+  void set_y_angle (CORBA::Long y ACE_ENV_ARG_DECL_NOT_USED);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
 private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index 0c2e85cca46..320a7e98043 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -71,11 +71,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -84,25 +84,25 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_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;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -116,14 +116,14 @@ main (int argc, char *argv[])
       Callback_i callback_impl (orb.in ());
 
       Callback_var callback =
-        callback_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != niterations; ++i)
         {
           CORBA::Long r =
             server->test_method (0, 0, callback.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (r != 0)
@@ -138,7 +138,7 @@ main (int argc, char *argv[])
         {
           ACE_TRY_EX(ABORT)
             {
-              server->shutdown_now (0 TAO_ENV_ARG_PARAMETER);
+              server->shutdown_now (0 ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK_EX(ABORT);
             }
           ACE_CATCH (CORBA::COMM_FAILURE, comm_failure)
@@ -153,7 +153,7 @@ main (int argc, char *argv[])
         {
           ACE_TRY_EX(CRASH)
             {
-              server->shutdown_now (1 TAO_ENV_ARG_PARAMETER);
+              server->shutdown_now (1 ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK_EX(CRASH);
             }
           ACE_CATCH (CORBA::COMM_FAILURE, comm_failure)
@@ -167,24 +167,24 @@ main (int argc, char *argv[])
       else if (do_suicide)
         {
           (void) server->test_method (1, 0, callback.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_DEBUG ((LM_DEBUG, "ERROR: client should have aborted\n"));
         }
       else if (do_self_shutdown)
         {
           (void) server->test_method (1, 1, callback.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       if (do_shutdown)
         {
-          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp
index 38d853b4cdb..5ffaeddbd26 100644
--- a/TAO/tests/Faults/middle.cpp
+++ b/TAO/tests/Faults/middle.cpp
@@ -51,11 +51,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -64,25 +64,25 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_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;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -97,11 +97,11 @@ main (int argc, char *argv[])
                             server.in ());
 
       Simple_Server_var middle =
-        middle_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        middle_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (middle.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (middle.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -119,12 +119,12 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp
index e3d5480d0a0..21d3b17c5bf 100644
--- a/TAO/tests/Faults/ping.cpp
+++ b/TAO/tests/Faults/ping.cpp
@@ -39,22 +39,22 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // create child poa with PERSISTENT policy
@@ -63,24 +63,24 @@ main (int argc, char *argv[])
       policies.length (2);
       policies[0] =
         root_poa->create_lifespan_policy(PortableServer::PERSISTENT
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       policies[1] =
         root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var persistent_poa =
         root_poa->create_POA("persistent",
                              poa_manager.in (),
                              policies
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policies[1]->destroy (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;
 
       if (parse_args (argc, argv) != 0)
@@ -90,11 +90,11 @@ main (int argc, char *argv[])
                           persistent_poa.in ());
 
       PingObject_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -112,15 +112,15 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      persistent_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp
index e8129cce447..c3526a74f73 100644
--- a/TAO/tests/Faults/ping_i.cpp
+++ b/TAO/tests/Faults/ping_i.cpp
@@ -10,27 +10,27 @@ ACE_RCSID(Faults, test_i, "$Id$")
 
 void
 PingObject_i::ping (PingObject_ptr callback
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  callback->pong (TAO_ENV_SINGLE_ARG_PARAMETER);
+  callback->pong (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-PingObject_i::pong (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+PingObject_i::pong (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-PingObject_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+PingObject_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);
 }
 
 PortableServer::POA_ptr
-PingObject_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+PingObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/tests/Faults/ping_i.h b/TAO/tests/Faults/ping_i.h
index 76ded91dcbf..d9a8dbab725 100644
--- a/TAO/tests/Faults/ping_i.h
+++ b/TAO/tests/Faults/ping_i.h
@@ -35,14 +35,14 @@ public:
 
   // = The PingObject interface methods
   void ping (PingObject_ptr callback
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  void pong (TAO_ENV_SINGLE_ARG_DECL)
+  void pong (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)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp
index 6165d7520c9..1a12c4acb14 100644
--- a/TAO/tests/Faults/pong.cpp
+++ b/TAO/tests/Faults/pong.cpp
@@ -56,7 +56,7 @@ void
 run_client (CORBA::ORB_ptr orb,
             PingObject_ptr server,
             PingObject_ptr callback
-            TAO_ENV_ARG_DECL)
+            ACE_ENV_ARG_DECL)
 {
   // Run the client requests in a separate routine to isolate the
   // exceptions...
@@ -68,11 +68,11 @@ run_client (CORBA::ORB_ptr orb,
       ACE_TRY
         {
           reason = "Exception during ping call";
-          server->ping (callback TAO_ENV_ARG_PARAMETER);
+          server->ping (callback ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Run for <period> milliseconds, to receive the reply
-          orb->run (tv TAO_ENV_ARG_PARAMETER);
+          orb->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Terminate the client if:
@@ -83,7 +83,7 @@ run_client (CORBA::ORB_ptr orb,
             {
               ACE_DEBUG ((LM_DEBUG, "Shutting down server\n"));
               reason = "Exception during server shutdown";
-              server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+              server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -115,22 +115,22 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // create child poa with PERSISTENT policy
@@ -139,36 +139,36 @@ main (int argc, char *argv[])
       policies.length (2);
       policies[0] =
         root_poa->create_lifespan_policy(PortableServer::PERSISTENT
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policies[1] =
         root_poa->create_implicit_activation_policy(PortableServer::IMPLICIT_ACTIVATION
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var persistent_poa =
         root_poa->create_POA("persistent",
                              poa_manager.in (),
                              policies
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policies[1]->destroy (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;
 
       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;
 
       PingObject_var server =
-        PingObject::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        PingObject::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -183,7 +183,7 @@ main (int argc, char *argv[])
                             persistent_poa.in ());
 
       PingObject_var callback =
-        callback_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        callback_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -191,13 +191,13 @@ main (int argc, char *argv[])
       run_client (orb.in (),
                   server.in (),
                   callback.in ()
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      persistent_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      persistent_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp
index dc8742840fa..847423380a6 100644
--- a/TAO/tests/Faults/server.cpp
+++ b/TAO/tests/Faults/server.cpp
@@ -39,11 +39,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -52,14 +52,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -76,11 +76,11 @@ main (int argc, char *argv[])
 
 
       Simple_Server_var server =
-        server_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -98,12 +98,12 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index ac290b81b1a..d35a7f275f6 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(Failure, test_i, "$Id$")
 
 void
 Callback_i::shutdown (CORBA::Boolean is_clean
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (is_clean == 0)
@@ -27,7 +27,7 @@ Callback_i::shutdown (CORBA::Boolean is_clean
       return;
     }
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 // ****************************************************************
@@ -36,14 +36,14 @@ CORBA::Long
 Simple_Server_i::test_method (CORBA::Boolean do_callback,
                               CORBA::Boolean is_clean,
                               Callback_ptr callback
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (do_callback)
     {
       ACE_DEBUG ((LM_DEBUG, "Callback to shutdown client (%d)\n",
                   is_clean));
-      callback->shutdown (is_clean TAO_ENV_ARG_PARAMETER);
+      callback->shutdown (is_clean ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   ACE_Time_Value tv (0, 20000);
@@ -53,7 +53,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback,
 
 void
 Simple_Server_i::shutdown_now (CORBA::Boolean is_clean
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (is_clean == 0)
@@ -68,14 +68,14 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean
     }
 
   ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_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);
 }
 
 // ****************************************************************
@@ -84,7 +84,7 @@ CORBA::Long
 Middle_i::test_method (CORBA::Boolean do_callback,
                        CORBA::Boolean is_clean,
                        Callback_ptr callback
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int i = 0;
@@ -93,14 +93,14 @@ Middle_i::test_method (CORBA::Boolean do_callback,
       this->server_->test_method (0,
                                   0,
                                   callback
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   this->server_->test_method (do_callback,
                               is_clean,
                               callback
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   for (; i != 10; ++i)
@@ -108,7 +108,7 @@ Middle_i::test_method (CORBA::Boolean do_callback,
       this->server_->test_method (0,
                                   0,
                                   callback
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -117,19 +117,19 @@ Middle_i::test_method (CORBA::Boolean do_callback,
 
 void
 Middle_i::shutdown_now (CORBA::Boolean is_clean
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->server_->shutdown_now (is_clean TAO_ENV_ARG_PARAMETER);
+  this->server_->shutdown_now (is_clean ACE_ENV_ARG_PARAMETER);
 }
 
 void
-Middle_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Middle_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      this->server_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->server_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -138,5 +138,5 @@ Middle_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
     }
   ACE_ENDTRY;
 
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h
index 87335c1adb3..bad1f05f2af 100644
--- a/TAO/tests/Faults/test_i.h
+++ b/TAO/tests/Faults/test_i.h
@@ -34,7 +34,7 @@ public:
   // ctor
 
   void shutdown (CORBA::Boolean is_clean
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // The callback method
 
@@ -59,14 +59,14 @@ public:
   CORBA::Long test_method (CORBA::Boolean do_callback,
                            CORBA::Boolean is_clean,
                            Callback_ptr callback
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void shutdown_now (CORBA::Boolean is_clean
-                     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:
@@ -91,14 +91,14 @@ public:
   CORBA::Long test_method (CORBA::Boolean do_callback,
                            CORBA::Boolean is_clean,
                            Callback_ptr callback
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void shutdown_now (CORBA::Boolean is_clean
-                     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:
diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp
index aec7d4a2464..7b96483a04a 100644
--- a/TAO/tests/File_IO/File_i.cpp
+++ b/TAO/tests/File_IO/File_i.cpp
@@ -24,9 +24,9 @@ FileImpl::System::System (PortableServer::POA_ptr poa)
     // Create the Default Descriptor Servant
     fd_servant_ (poa)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   // set the default servant of the POA
-  poa->set_servant (&this->fd_servant_ TAO_ENV_ARG_PARAMETER);
+  poa->set_servant (&this->fd_servant_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -35,7 +35,7 @@ FileImpl::System::~System (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::System::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+FileImpl::System::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -43,7 +43,7 @@ FileImpl::System::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 File::Descriptor_ptr
 FileImpl::System::open (const char *file_name,
                         CORBA::Long flags
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
@@ -73,12 +73,12 @@ FileImpl::System::open (const char *file_name,
   CORBA::Object_var obj =
     this->poa_->create_reference_with_id (oid.in (),
                                           "IDL:File/Descriptor:1.0"
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (File::Descriptor::_nil ());
 
   // Narrow the object reference to a File Descriptor
   File::Descriptor_var fd =
-    File::Descriptor::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+    File::Descriptor::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (File::Descriptor::_nil ());
 
@@ -96,26 +96,26 @@ FileImpl::Descriptor::~Descriptor (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::Descriptor::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+FileImpl::Descriptor::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 //Extracts the ACE_HANDLE from the passed object reference
 ACE_HANDLE
-FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL)
+FileImpl::Descriptor::fd (ACE_ENV_SINGLE_ARG_DECL)
 {
   //
   // One way of getting our id.
   //
 
   // Get a reference to myself
-  File::Descriptor_var me = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  File::Descriptor_var me = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   // Get the ObjectId from the reference
   PortableServer::ObjectId_var oid1 =
-    this->poa_->reference_to_id (me.in () TAO_ENV_ARG_PARAMETER);
+    this->poa_->reference_to_id (me.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   //
@@ -123,7 +123,7 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL)
   //
 
   PortableServer::ObjectId_var oid2 =
-    this->poa_->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    this->poa_->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   //
@@ -131,23 +131,23 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL)
   //
 
   int argc = 0;
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 TAO_ENV_ARG_PARAMETER);
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   // Get the POA Current object reference
   CORBA::Object_var obj =
     orb->resolve_initial_references ("POACurrent"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   // Narrow the object reference to a POA Current reference
   PortableServer::Current_var poa_current =
     PortableServer::Current::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   PortableServer::ObjectId_var oid3 =
-    poa_current->get_object_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+    poa_current->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
 
   ACE_ASSERT (oid1.in () == oid2.in ());
@@ -163,11 +163,11 @@ FileImpl::Descriptor::fd (TAO_ENV_SINGLE_ARG_DECL)
 
 CORBA::Long
 FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   const CORBA::Octet *data = &buffer[0];
@@ -183,11 +183,11 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer
 
 File::Descriptor::DataBuffer *
 FileImpl::Descriptor::read (CORBA::Long num_bytes
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes);
@@ -206,11 +206,11 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes
 CORBA::ULong
 FileImpl::Descriptor::lseek (CORBA::ULong offset,
                              CORBA::Long whence
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    File::IOError))
 {
-  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor,
@@ -223,11 +223,11 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset,
 }
 
 void
-FileImpl::Descriptor::destroy (TAO_ENV_SINGLE_ARG_DECL)
+FileImpl::Descriptor::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Get the ACE_HANDLE for this object reference
-  ACE_HANDLE file_descriptor = this->fd (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ACE_HANDLE file_descriptor = this->fd (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Close the file corresponding to this object reference.
diff --git a/TAO/tests/File_IO/File_i.h b/TAO/tests/File_IO/File_i.h
index 30c6c6f5e5b..ebe06fce403 100644
--- a/TAO/tests/File_IO/File_i.h
+++ b/TAO/tests/File_IO/File_i.h
@@ -34,35 +34,35 @@ public:
     ~Descriptor (void);
     // Destructor
 
-    PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+    PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
     // Returns the default POA of this object
 
     virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // write buffer to File corresponding to this Descriptor
 
     virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes
-                                                TAO_ENV_ARG_DECL)
+                                                ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
     // Reads num_bytes from the file and returns it
                        File::IOError));
 
     virtual CORBA::ULong lseek (CORBA::ULong offset,
                                 CORBA::Long whence
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // seek to the offset in file from whence
 
-    virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
     // closes the file corresponding to the requested ObjectID
 
   private:
 
-    ACE_HANDLE fd (TAO_ENV_SINGLE_ARG_DECL);
+    ACE_HANDLE fd (ACE_ENV_SINGLE_ARG_DECL);
     // Extracts the ACE_HANDLE from the objectID
 
     PortableServer::POA_var poa_;
@@ -80,12 +80,12 @@ public:
     ~System (void);
     //Destructor
 
-    PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
+    PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
     //Returns the default POA of this object
 
     File::Descriptor_ptr open (const char *file_name,
                                CORBA::Long flags
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        File::IOError));
     // Opens a file ,creates a Descriptor reference with the
diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp
index 11021da4b71..a08a3af6baf 100644
--- a/TAO/tests/File_IO/client.cpp
+++ b/TAO/tests/File_IO/client.cpp
@@ -75,41 +75,41 @@ parse_args (int argc, char **argv)
 static void *
 MTTEST (void *args)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_CString& ior = *(ACE_CString*)args;
   ACE_TRY
     {
     CORBA::Object_var object = orb->string_to_object (ior.c_str ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // Narrow the object reference to a File::System
     File::System_var file_system = File::System::_narrow (object.in ()
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     // Creat the file filename i.e "test"
     File::Descriptor_var fd = file_system->open (filename,
                                                  O_RDONLY
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     for( int i=0; i<loops; ++i)
     {
       //seek to the beginning of the file
       ACE_DEBUG((LM_DEBUG,"Making request number %d\n",i));
-      fd->lseek (0, SEEK_SET TAO_ENV_ARG_PARAMETER);
+      fd->lseek (0, SEEK_SET ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Read back the written message
       // Twice the size of the socket buffer
       File::Descriptor::DataBuffer_var data_received = fd->read (128*1024
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
     // close the file
-    fd->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+    fd->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -125,12 +125,12 @@ MTTEST (void *args)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+      orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the IOR
diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp
index 93faa6764d4..a68e753a6e9 100644
--- a/TAO/tests/File_IO/server.cpp
+++ b/TAO/tests/File_IO/server.cpp
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
   ACE_OS::write (handle, "", 1);
   ACE_OS::close (handle);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -91,16 +91,16 @@ main (int argc, char *argv[])
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference to a POA reference
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () 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 (5);
@@ -108,27 +108,27 @@ main (int argc, char *argv[])
 
       // ID Assignment Policy
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID TAO_ENV_ARG_PARAMETER);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy
       policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT TAO_ENV_ARG_PARAMETER);
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy
       policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT TAO_ENV_ARG_PARAMETER);
+        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Servant Retention Policy
       policies[3] =
-        root_poa->create_servant_retention_policy (PortableServer::RETAIN TAO_ENV_ARG_PARAMETER);
+        root_poa->create_servant_retention_policy (PortableServer::RETAIN ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Id Uniqueness Policy
       policies[4] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID TAO_ENV_ARG_PARAMETER);
+        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_CString name = "firstPOA";
@@ -136,7 +136,7 @@ main (int argc, char *argv[])
         root_poa->create_POA (name.c_str (),
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (CORBA::ULong i = 0;
@@ -144,7 +144,7 @@ main (int argc, char *argv[])
            ++i)
         {
           CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -156,16 +156,16 @@ main (int argc, char *argv[])
 
       first_poa->activate_object_with_id (file_system_oid.in (),
                                           &file_system_impl
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var file_system =
-        first_poa->id_to_reference (file_system_oid.in () TAO_ENV_ARG_PARAMETER);
+        first_poa->id_to_reference (file_system_oid.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the IOR for the "FileSystem" object
       CORBA::String_var file_system_ior =
-        orb->object_to_string (file_system.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (file_system.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,"%s\n",
@@ -182,7 +182,7 @@ main (int argc, char *argv[])
 
       // set the state of the poa_manager to active i.e ready to
       // process requests
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Worker worker (orb.in ());
@@ -217,12 +217,12 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Run the ORB for atmost 75 seconds
       ACE_Time_Value tv (75, 0);
-      this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
+      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp
index 528c3dfde2c..7d6eee99bb3 100644
--- a/TAO/tests/Forwarding/client.cpp
+++ b/TAO/tests/Forwarding/client.cpp
@@ -52,7 +52,7 @@ public:
   Worker (CORBA::ORB_ptr orb);
   // Constructor
 
-  virtual void run_test (TAO_ENV_SINGLE_ARG_DECL);
+  virtual void run_test (ACE_ENV_SINGLE_ARG_DECL);
   // The actual implementation of the test
 
   // = The Task_Base methods
@@ -69,7 +69,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;
 
       if (parse_args (argc, argv) != 0)
@@ -85,12 +85,12 @@ main (int argc, char *argv[])
 
       ACE_Time_Value tv (5, 0);
 
-      orb->run (tv TAO_ENV_ARG_PARAMETER);
+      orb->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now run a test in the main thread, just to confuse matters a
       // little more.
-      worker.run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      worker.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       worker.thr_mgr ()->wait ();
@@ -98,18 +98,18 @@ main (int argc, char *argv[])
       if (do_shutdown)
         {
           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;
 
           Simple_Server_var server =
-            Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+            Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->shutdown (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
@@ -135,7 +135,7 @@ Worker::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->run_test (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -149,16 +149,16 @@ Worker::svc (void)
 }
 
 void
-Worker::run_test (TAO_ENV_SINGLE_ARG_DECL)
+Worker::run_test (ACE_ENV_SINGLE_ARG_DECL)
 {
   for (int j = 0; j != niterations; ++j)
     {
       CORBA::Object_var object =
-        this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Boolean is_simple_server =
-        object->_is_a ("IDL:Simple_Server:1.0" TAO_ENV_ARG_PARAMETER);
+        object->_is_a ("IDL:Simple_Server:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       if (!is_simple_server)
         ACE_DEBUG ((LM_DEBUG,
@@ -166,11 +166,11 @@ Worker::run_test (TAO_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+    this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   Simple_Server_var server =
-    Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+    Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (server.in ()))
@@ -184,7 +184,7 @@ Worker::run_test (TAO_ENV_SINGLE_ARG_DECL)
   for (int i = 0; i != niterations; ++i)
     {
       CORBA::Boolean r =
-        server->test_is_a ("IDL:Foo:1.0" TAO_ENV_ARG_PARAMETER);
+        server->test_is_a ("IDL:Foo:1.0" ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (r != 0)
diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp
index 2b2acda8579..20260593cf9 100644
--- a/TAO/tests/Forwarding/server.cpp
+++ b/TAO/tests/Forwarding/server.cpp
@@ -40,15 +40,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (root_poa.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -56,7 +56,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -65,25 +65,25 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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;
 
       CORBA::Object_var table_object =
-        orb->resolve_initial_references("IORTable" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("IORTable" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var table =
-        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (table.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the IORTable.\n"),
                           1);
-      table->bind ("Simple_Server", ior.in () TAO_ENV_ARG_PARAMETER);
+      table->bind ("Simple_Server", ior.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -97,10 +97,10 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp
index ede8a267b1b..b110a24573e 100644
--- a/TAO/tests/Forwarding/test_i.cpp
+++ b/TAO/tests/Forwarding/test_i.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(Forwarding, test_i, "$Id$")
 
 CORBA::Boolean
 Simple_Server_i::test_is_a (const char * /* type */
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a %s\n", type));
@@ -18,8 +18,8 @@ Simple_Server_i::test_is_a (const char * /* type */
 }
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_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);
 }
diff --git a/TAO/tests/Forwarding/test_i.h b/TAO/tests/Forwarding/test_i.h
index e8ce284c368..01b273ba987 100644
--- a/TAO/tests/Forwarding/test_i.h
+++ b/TAO/tests/Forwarding/test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Boolean test_is_a (const char * type TAO_ENV_ARG_DECL_NOT_USED)
+  CORBA::Boolean test_is_a (const char * type 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:
diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp
index dc959b7650c..70af3ea8a11 100644
--- a/TAO/tests/Hello/Hello.cpp
+++ b/TAO/tests/Hello/Hello.cpp
@@ -11,15 +11,15 @@ Hello::Hello (CORBA::ORB_ptr orb)
 }
 
 char *
-Hello::get_string (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Hello there!");
 }
 
 void
-Hello::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Hello::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);
 }
diff --git a/TAO/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h
index 2222cb5236d..501584bd17d 100644
--- a/TAO/tests/Hello/Hello.h
+++ b/TAO/tests/Hello/Hello.h
@@ -25,10 +25,10 @@ public:
   Hello (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual char * get_string (TAO_ENV_SINGLE_ARG_DECL)
+  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp
index 3837dd04185..f85722246b5 100644
--- a/TAO/tests/Hello/client.cpp
+++ b/TAO/tests/Hello/client.cpp
@@ -39,18 +39,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 tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (hello.in ()))
@@ -62,16 +62,16 @@ main (int argc, char *argv[])
         }
 
       CORBA::String_var the_string =
-        hello->get_string (TAO_ENV_SINGLE_ARG_PARAMETER);
+        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
                   the_string.in ()));
 
-      hello->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      hello->shutdown (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/Hello/server.cpp b/TAO/tests/Hello/server.cpp
index a5e2ca1ea95..0b56e777eb6 100644
--- a/TAO/tests/Hello/server.cpp
+++ b/TAO/tests/Hello/server.cpp
@@ -41,15 +41,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -58,7 +58,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -71,11 +71,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(hello_impl);
 
       Test::Hello_var hello =
-        hello_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (hello.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
@@ -88,18 +88,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index d46d46e94ef..0d4954c42d8 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -50,17 +50,17 @@ main (int argc , char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             ""
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_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 (poa_object.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test of pragma prefix handling.
@@ -71,7 +71,7 @@ main (int argc , char *argv[])
 
       hello_i h;
 
-      obj = h._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      obj = h._this (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -86,7 +86,7 @@ main (int argc , char *argv[])
 
       goodbye_i g;
 
-      obj = g._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      obj = g._this (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -101,7 +101,7 @@ main (int argc , char *argv[])
 
       sayonara_i s;
 
-      obj = s._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      obj = s._this (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -116,7 +116,7 @@ main (int argc , char *argv[])
 
       ciao_i c;
 
-      obj = c._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      obj = c._this (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -131,7 +131,7 @@ main (int argc , char *argv[])
 
       aloha_i a;
 
-      obj = a._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      obj = a._this (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -173,7 +173,7 @@ main (int argc , char *argv[])
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp
index 0e8a36929f6..88b3cbf7307 100644
--- a/TAO/tests/IORManipulation/IORTest.cpp
+++ b/TAO/tests/IORManipulation/IORTest.cpp
@@ -32,14 +32,14 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
   ACE_DEBUG ((LM_DEBUG, "Running the IORManipulation Tests.\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Retrieve the ORB.
       CORBA::ORB_var orb_ = CORBA::ORB_init (argc,
                                              argv,
                                              ""
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **********************************************************************
@@ -47,12 +47,12 @@ main (int argc, char *argv[])
       // Get an object reference for the ORBs IORManipulation object!
       CORBA::Object_var IORM =
         orb_->resolve_initial_references ("IORManipulation"
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_IOP::TAO_IOR_Manipulation_var iorm =
         TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **********************************************************************
@@ -60,22 +60,22 @@ main (int argc, char *argv[])
       // Create a few fictitious IORs
       CORBA::Object_var name1 =
         orb_->string_to_object ("corbaloc:iiop:macarena.cs.wustl.edu:6060/xyz"
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       CORBA::Object_var name2 =
         orb_->string_to_object ("corbaloc:iiop:tango.cs.wustl.edu:7070/xyz"
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // **********************************************************************
 
       CORBA::String_var name1_ior =
-        orb_->object_to_string (name1.in () TAO_ENV_ARG_PARAMETER);
+        orb_->object_to_string (name1.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "\tFirst made up IOR = %s\n", name1_ior.in ()));
 
       CORBA::String_var name2_ior =
-        orb_->object_to_string (name2.in () TAO_ENV_ARG_PARAMETER);
+        orb_->object_to_string (name2.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "\tSecond made up IOR = %s\n", name2_ior.in ()));
 
@@ -87,21 +87,21 @@ main (int argc, char *argv[])
       iors [0] = name1;
       iors [1] = name2;
 
-      CORBA::Object_var merged = iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER);
+      CORBA::Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var merged_ior =
-        orb_->object_to_string (merged.in () TAO_ENV_ARG_PARAMETER);
+        orb_->object_to_string (merged.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::ULong count1 = iorm->get_profile_count (iors [0] TAO_ENV_ARG_PARAMETER);
+      CORBA::ULong count1 = iorm->get_profile_count (iors [0] ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::ULong count2 = iorm->get_profile_count (iors [1] TAO_ENV_ARG_PARAMETER);
+      CORBA::ULong count2 = iorm->get_profile_count (iors [1] ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ULong count = iorm->get_profile_count (merged.in ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count != (count1 + count2))
@@ -117,7 +117,7 @@ main (int argc, char *argv[])
       // IORs is NULL.
       CORBA::ULong in_count = iorm->is_in_ior (merged.in (),
                                                name1.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count1 != in_count)
@@ -128,7 +128,7 @@ main (int argc, char *argv[])
 
       in_count = iorm->is_in_ior (merged.in (),
                                   name2.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count2 != in_count)
@@ -142,14 +142,14 @@ main (int argc, char *argv[])
       // Verify ability to remove profiles from an IOR
       // First remove the second IOR from the merged IOR
       CORBA::Object_var just1 =
-        iorm->remove_profiles (merged.in (), name2.in () TAO_ENV_ARG_PARAMETER);
+        iorm->remove_profiles (merged.in (), name2.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var just1_ior =
-        orb_->object_to_string (just1.in () TAO_ENV_ARG_PARAMETER);
+        orb_->object_to_string (just1.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      count = iorm->get_profile_count (just1.in () TAO_ENV_ARG_PARAMETER);
+      count = iorm->get_profile_count (just1.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count1 != count)
@@ -162,7 +162,7 @@ main (int argc, char *argv[])
                   count,
                   just1_ior.in ()));
 
-      in_count = iorm->is_in_ior (just1.in (), name1.in () TAO_ENV_ARG_PARAMETER);
+      in_count = iorm->is_in_ior (just1.in (), name1.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count1 != in_count)
@@ -175,10 +175,10 @@ main (int argc, char *argv[])
 
       // Now try the add_profiles interface.
       CORBA::Object_var merged2 =
-        iorm->add_profiles (just1.in (), name2.in () TAO_ENV_ARG_PARAMETER);
+        iorm->add_profiles (just1.in (), name2.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      count = iorm->get_profile_count (merged2.in () TAO_ENV_ARG_PARAMETER);
+      count = iorm->get_profile_count (merged2.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count != (count1 + count2))
@@ -186,7 +186,7 @@ main (int argc, char *argv[])
                     "**ERROR: add_profile failed profile count test!\n"));
 
       CORBA::String_var merged2_ior =
-        orb_->object_to_string (merged2.in () TAO_ENV_ARG_PARAMETER);
+        orb_->object_to_string (merged2.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -196,7 +196,7 @@ main (int argc, char *argv[])
 
       // is_in_ior throws an exception if the intersection of the two
       // IORs is NULL.
-      in_count = iorm->is_in_ior (merged2.in (), name1. in () TAO_ENV_ARG_PARAMETER);
+      in_count = iorm->is_in_ior (merged2.in (), name1. in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count1 != in_count)
@@ -205,7 +205,7 @@ main (int argc, char *argv[])
                     "count bad (%d)!\n",
                     in_count));
 
-      in_count = iorm->is_in_ior (merged2.in (), name2.in () TAO_ENV_ARG_PARAMETER);
+      in_count = iorm->is_in_ior (merged2.in (), name2.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count2 != in_count)
@@ -216,14 +216,14 @@ main (int argc, char *argv[])
       // **********************************************************************
 
       CORBA::Object_var just2 =
-        iorm->remove_profiles (merged2.in (), name1.in () TAO_ENV_ARG_PARAMETER);
+        iorm->remove_profiles (merged2.in (), name1.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var just2_ior =
-        orb_->object_to_string (just2.in () TAO_ENV_ARG_PARAMETER);
+        orb_->object_to_string (just2.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      count = iorm->get_profile_count (just2.in () TAO_ENV_ARG_PARAMETER);
+      count = iorm->get_profile_count (just2.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count2 != count)
@@ -234,7 +234,7 @@ main (int argc, char *argv[])
                   count,
                   just2_ior.in ()));
 
-      in_count = iorm->is_in_ior (just2.in (), name2.in () TAO_ENV_ARG_PARAMETER);
+      in_count = iorm->is_in_ior (just2.in (), name2.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (count2 != in_count)
@@ -247,7 +247,7 @@ main (int argc, char *argv[])
       Status = 1;
       // Finally generate an exception and quit.
       // This will generate a NotFound exception.
-      in_count = iorm->is_in_ior (just2.in (), name1.in () TAO_ENV_ARG_PARAMETER);
+      in_count = iorm->is_in_ior (just2.in (), name1.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp
index 11028ad50b5..a3c0b51e25a 100644
--- a/TAO/tests/InterOp-Naming/INS_i.cpp
+++ b/TAO/tests/InterOp-Naming/INS_i.cpp
@@ -24,7 +24,7 @@ INS_i::orb (CORBA::ORB_ptr o)
 }
 
 char *
-INS_i::test_ins (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+INS_i::test_ins (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 ACE_THROW_SPEC (( CORBA::SystemException ))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/InterOp-Naming/INS_i.h b/TAO/tests/InterOp-Naming/INS_i.h
index 6fb278a0c90..38687ea246c 100644
--- a/TAO/tests/InterOp-Naming/INS_i.h
+++ b/TAO/tests/InterOp-Naming/INS_i.h
@@ -33,8 +33,8 @@ public:
   ~INS_i (void);
   // Destructor.
 
-  char * test_ins (TAO_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC (( CORBA::SystemException ));  
+  char * test_ins (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC (( CORBA::SystemException ));
   // test the INS.
 
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp
index 3e843c3a1c3..8c543b717c5 100644
--- a/TAO/tests/InterOp-Naming/INS_test_client.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp
@@ -8,14 +8,14 @@ main (int argc, char *argv[])
 {
   int i = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Retrieve a reference to the ORB.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (argc < 2)
@@ -33,7 +33,7 @@ main (int argc, char *argv[])
             {
               // List initial services
               CORBA::ORB::ObjectIdList_var list =
-                orb->list_initial_services (TAO_ENV_SINGLE_ARG_PARAMETER);
+                orb->list_initial_services (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               size_t length = list->length ();
@@ -64,7 +64,7 @@ main (int argc, char *argv[])
             }
           else
             {
-              objref = orb->resolve_initial_references (argv[i] TAO_ENV_ARG_PARAMETER);
+              objref = orb->resolve_initial_references (argv[i] ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (CORBA::is_nil (objref.in ()))
@@ -74,7 +74,7 @@ main (int argc, char *argv[])
                                   -1);
 
               INS_var server = INS::_narrow (objref.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
@@ -83,7 +83,7 @@ main (int argc, char *argv[])
                           orb->object_to_string (server.in ())));
 
               CORBA::String_var test_ins_result =
-                server->test_ins (TAO_ENV_SINGLE_ARG_PARAMETER);
+                server->test_ins (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp
index a65bffc9c54..c45f732a26f 100644
--- a/TAO/tests/InterOp-Naming/INS_test_server.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp
@@ -17,11 +17,11 @@ main (int argc, char *argv[])
     {
       if (server.init (argc,
                        argv
-                       TAO_ENV_ARG_PARAMETER) == -1)
+                       ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
         {
-          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp
index 6a5a08b94cf..3e0c31ad32b 100644
--- a/TAO/tests/InterOp-Naming/Server_i.cpp
+++ b/TAO/tests/InterOp-Naming/Server_i.cpp
@@ -78,14 +78,14 @@ Server_i::add_IOR_to_table (CORBA::String_var ior)
       CORBA::Object_var table_object =
         this->orb_manager_.orb ()->resolve_initial_references (
             "IORTable"
-            TAO_ENV_ARG_PARAMETER);
+            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
+        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      adapter->bind (this->ins_, ior.in () TAO_ENV_ARG_PARAMETER);
+      adapter->bind (this->ins_, ior.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, ex)
@@ -101,14 +101,14 @@ Server_i::add_IOR_to_table (CORBA::String_var ior)
 int
 Server_i::init (int argc,
                 char *argv[]
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
                                          "child_poa"
-                                         TAO_ENV_ARG_PARAMETER) == -1)
+                                         ACE_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -134,7 +134,7 @@ Server_i::init (int argc,
       CORBA::String_var str  =
         this->orb_manager_.activate_under_child_poa ("INS_servant",
                                                      &this->servant_
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -167,10 +167,10 @@ Server_i::init (int argc,
 }
 
 int
-Server_i::run (TAO_ENV_SINGLE_ARG_DECL)
+Server_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
                       -1);
diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h
index d15824c425b..76309d6a212 100644
--- a/TAO/tests/InterOp-Naming/Server_i.h
+++ b/TAO/tests/InterOp-Naming/Server_i.h
@@ -38,13 +38,13 @@ public:
 
   int init (int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Server state - parsing arguments and waiting.
 
   int add_IOR_to_table (CORBA::String_var ior);
   // Add an IOR to the ORB-IOR table.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb.
 
 protected:
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index 45efec07038..64a61e7b5ff 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -109,7 +109,7 @@ public:
 
   int svc (void)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
 
       ACE_TRY
         {
@@ -135,7 +135,7 @@ public:
                       work_from_this_thread));
 
           CORBA::ULong result = this->test_->method (work_from_this_thread
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (work_from_this_thread != result)
@@ -185,7 +185,7 @@ public:
 
   int svc (void)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
 
       ACE_TRY
         {
@@ -205,7 +205,7 @@ public:
           ACE_Time_Value timeout (0,
                                   event_loop_timeout_for_this_thread * 1000);
 
-          this->orb_->run (timeout TAO_ENV_ARG_PARAMETER);
+          this->orb_->run (timeout ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "Client: Event loop finished for thread %t @ %T\n"));
@@ -237,7 +237,7 @@ private:
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -246,7 +246,7 @@ main (int argc, char **argv)
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -256,12 +256,12 @@ main (int argc, char **argv)
 
       // Get an object reference from the argument string.
       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;
 
       // Try to narrow the object reference to a <server> reference.
       test_var server = test::_narrow (object.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Client_Task client_task (server.in ());
@@ -292,7 +292,7 @@ main (int argc, char **argv)
       // Shutdown server.
       if (shutdown_server)
         {
-          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp
index 6876d4a0b27..42575677363 100644
--- a/TAO/tests/Leader_Followers/server.cpp
+++ b/TAO/tests/Leader_Followers/server.cpp
@@ -54,11 +54,11 @@ public:
 
   int svc (void)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
 
       ACE_TRY
         {
-          this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -88,24 +88,24 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_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 (poa_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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -114,12 +114,12 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -147,7 +147,7 @@ main (int argc, char *argv[])
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp
index 342ea2ea087..e114456a10f 100644
--- a/TAO/tests/Leader_Followers/test_i.cpp
+++ b/TAO/tests/Leader_Followers/test_i.cpp
@@ -10,16 +10,16 @@ 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))
 {
   this->orb_->shutdown (0
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
 }
 
 CORBA::ULong
 test_i::method (CORBA::ULong work
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Leader_Followers/test_i.h b/TAO/tests/Leader_Followers/test_i.h
index 6395ac7eb07..b884d8b517f 100644
--- a/TAO/tests/Leader_Followers/test_i.h
+++ b/TAO/tests/Leader_Followers/test_i.h
@@ -26,10 +26,10 @@ public:
 
   // = The test interface methods.
   CORBA::ULong method (CORBA::ULong work
-                       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:
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index 712ed680558..6ca6f72ef38 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -15,7 +15,7 @@ void
 AMI_Manager::start_workers (CORBA::Short worker_count,
                             CORBA::Long milliseconds,
                             Test::Controller_ptr controller
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Thread_Manager thread_manager;
@@ -31,10 +31,10 @@ AMI_Manager::start_workers (CORBA::Short worker_count,
 }
 
 void
-AMI_Manager::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+AMI_Manager::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);
 }
 
 // ****************************************************************
@@ -54,7 +54,7 @@ int
 Worker::svc (void)
 {
   // ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       TAO_SYNCH_MUTEX mutex;
@@ -69,11 +69,11 @@ Worker::svc (void)
                         -1);
 
         PortableServer::ServantBase_var auto_destroy (handler_impl);
-        handler = handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        handler = handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
       this->controller_->sendc_worker_started (handler.in ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ACE_DEBUG ((LM_DEBUG, "Worker start reported\n"));
@@ -82,7 +82,7 @@ Worker::svc (void)
       ACE_OS::sleep (tv);
 
       this->controller_->sendc_worker_finished (handler.in ()
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n"));
@@ -90,7 +90,7 @@ Worker::svc (void)
       for (;;)
         {
           ACE_Time_Value tv (0, 1000 * this->milliseconds_);
-          this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
+          this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1);
@@ -117,7 +117,7 @@ Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex,
 }
 
 void
-Controller_Handler::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Controller_Handler::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
@@ -127,12 +127,12 @@ Controller_Handler::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Controller_Handler::worker_started_excep
     (Test::AMI_ControllerExceptionHolder* h
-     TAO_ENV_ARG_DECL)
+     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      h->raise_worker_started (TAO_ENV_SINGLE_ARG_PARAMETER);
+      h->raise_worker_started (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -145,7 +145,7 @@ Controller_Handler::worker_started_excep
 }
 
 void
-Controller_Handler::worker_finished (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Controller_Handler::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
@@ -155,12 +155,12 @@ Controller_Handler::worker_finished (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Controller_Handler::worker_finished_excep
     (Test::AMI_ControllerExceptionHolder *h
-     TAO_ENV_ARG_DECL)
+     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      h->raise_worker_finished (TAO_ENV_SINGLE_ARG_PARAMETER);
+      h->raise_worker_finished (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index 84ca8247dd5..a351e61d38d 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -25,9 +25,9 @@ public:
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
                               Test::Controller_ptr controller
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -70,15 +70,15 @@ public:
                       int *pending_replies);
   // Constructor
 
-  virtual void worker_started (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void worker_started (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void worker_started_excep (Test::AMI_ControllerExceptionHolder*
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_finished (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void worker_finished (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void worker_finished_excep (Test::AMI_ControllerExceptionHolder*
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp
index 2485ce0489f..94008f0a364 100644
--- a/TAO/tests/LongUpcalls/Controller.cpp
+++ b/TAO/tests/LongUpcalls/Controller.cpp
@@ -24,7 +24,7 @@ Controller::dump_results ()
 }
 
 void
-Controller::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Controller::worker_started (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -34,7 +34,7 @@ Controller::worker_started (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Controller::worker_finished (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Controller::worker_finished (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h
index 1ab48e7c104..47587760e7f 100644
--- a/TAO/tests/LongUpcalls/Controller.h
+++ b/TAO/tests/LongUpcalls/Controller.h
@@ -24,9 +24,9 @@ public:
   // Print out the results and any errors
 
   // = The skeleton methods
-  virtual void worker_started (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void worker_started (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void worker_finished (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void worker_finished (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp
index b9b9a2d1685..6151d64e7c6 100644
--- a/TAO/tests/LongUpcalls/Manager.cpp
+++ b/TAO/tests/LongUpcalls/Manager.cpp
@@ -15,7 +15,7 @@ void
 Manager::start_workers (CORBA::Short worker_count,
                         CORBA::Long milliseconds,
                         Test::Controller_ptr controller
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Thread_Manager thread_manager;
@@ -30,10 +30,10 @@ Manager::start_workers (CORBA::Short worker_count,
 }
 
 void
-Manager::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Manager::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);
 }
 
 
@@ -52,10 +52,10 @@ int
 Worker::svc (void)
 {
   // ACE_DEBUG ((LM_DEBUG, "Worker starts\n"));
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->controller_->worker_started (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->controller_->worker_started (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ACE_DEBUG ((LM_DEBUG, "Worker start reported\n"));
@@ -63,7 +63,7 @@ Worker::svc (void)
       ACE_Time_Value tv (0, 1000 * this->milliseconds_);
       ACE_OS::sleep (tv);
 
-      this->controller_->worker_finished (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->controller_->worker_finished (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // ACE_DEBUG ((LM_DEBUG, "Worker completion reported\n"));
diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h
index 31cf037ced8..9a73fac67ba 100644
--- a/TAO/tests/LongUpcalls/Manager.h
+++ b/TAO/tests/LongUpcalls/Manager.h
@@ -27,9 +27,9 @@ public:
   virtual void start_workers (CORBA::Short worker_count,
                               CORBA::Long milliseconds,
                               Test::Controller_ptr controller
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp
index a4ed57650f7..4223798dc86 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.cpp
+++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp
@@ -14,7 +14,7 @@ Manager_Handler::Manager_Handler (Test::Manager_ptr manager,
 }
 
 void
-Manager_Handler::start_workers (TAO_ENV_SINGLE_ARG_DECL)
+Manager_Handler::start_workers (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -22,7 +22,7 @@ Manager_Handler::start_workers (TAO_ENV_SINGLE_ARG_DECL)
       this->manager_->start_workers (CORBA::Short(10),
                                      CORBA::Long(1000),
                                      this->controller_.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -35,12 +35,12 @@ Manager_Handler::start_workers (TAO_ENV_SINGLE_ARG_DECL)
 
 void
 Manager_Handler::start_workers_excep (Test::AMI_ManagerExceptionHolder * holder
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_start_workers (TAO_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_start_workers (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h
index bc489e678b1..7ead1579196 100644
--- a/TAO/tests/LongUpcalls/Manager_Handler.h
+++ b/TAO/tests/LongUpcalls/Manager_Handler.h
@@ -25,10 +25,10 @@ public:
   // Constructor
 
   // = The skeleton methods
-  virtual void start_workers (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void start_workers (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual void start_workers_excep (Test::AMI_ManagerExceptionHolder*
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp
index 997c8871d2f..e22153a203d 100644
--- a/TAO/tests/LongUpcalls/ami_client.cpp
+++ b/TAO/tests/LongUpcalls/ami_client.cpp
@@ -39,11 +39,11 @@ 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;
 
       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;
 
       if (CORBA::is_nil (object.in ()))
@@ -52,11 +52,11 @@ main (int argc, char *argv[])
                           1);
 
       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;
 
       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;
 
       if (parse_args (argc, argv) != 0)
@@ -65,14 +65,14 @@ main (int argc, char *argv[])
       Controller controller_impl;
 
       Test::Controller_var controller =
-        controller_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        controller_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+      object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Manager_var manager =
-        Test::Manager::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (manager.in ()))
@@ -83,10 +83,10 @@ main (int argc, char *argv[])
       Manager_Handler handler_impl (manager.in (),
                                     controller.in ());
       Test::AMI_ManagerHandler_var handler =
-        handler_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        handler_impl._this (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;
 
       const CORBA::Short worker_count = 10;
@@ -94,22 +94,22 @@ main (int argc, char *argv[])
                                     worker_count,
                                     CORBA::Long (1000),
                                     controller.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (30, 0);
-      orb->run (tv TAO_ENV_ARG_PARAMETER);
+      orb->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       controller_impl.dump_results ();
 
-      manager->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      manager->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp
index 188afbd32d1..ed7307129f9 100644
--- a/TAO/tests/LongUpcalls/ami_server.cpp
+++ b/TAO/tests/LongUpcalls/ami_server.cpp
@@ -38,11 +38,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
       AMI_Manager manager_impl (orb.in ());
 
       Test::Manager_var manager =
-        manager_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        manager_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (manager.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -81,18 +81,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp
index b1e6cfa917a..b914c957950 100644
--- a/TAO/tests/LongUpcalls/blocking_client.cpp
+++ b/TAO/tests/LongUpcalls/blocking_client.cpp
@@ -38,11 +38,11 @@ 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;
 
       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;
 
       if (CORBA::is_nil (object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       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;
 
       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;
 
       if (parse_args (argc, argv) != 0)
@@ -64,14 +64,14 @@ main (int argc, char *argv[])
       Controller controller_impl;
 
       Test::Controller_var controller =
-        controller_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        controller_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+      object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Manager_var manager =
-        Test::Manager::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test::Manager::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (manager.in ()))
@@ -80,25 +80,25 @@ main (int argc, char *argv[])
                           1);
 
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const CORBA::Short worker_count = 10;
       manager->start_workers (worker_count,
                               CORBA::Long (1000),
                               controller.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       controller_impl.dump_results ();
 
-      manager->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      manager->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp
index 1c43c2468cc..eb5c55c3bf0 100644
--- a/TAO/tests/LongUpcalls/blocking_server.cpp
+++ b/TAO/tests/LongUpcalls/blocking_server.cpp
@@ -38,11 +38,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
       Manager manager_impl (orb.in ());
 
       Test::Manager_var manager =
-        manager_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        manager_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (manager.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (manager.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -81,18 +81,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index 0358a8aac7c..964d9dc23df 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -49,17 +49,17 @@ parse_args (int argc, char *argv[])
 
 void
 run_test (Simple_Server_ptr server
-          TAO_ENV_ARG_DECL);
+          ACE_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       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)
@@ -67,23 +67,23 @@ main (int argc, char *argv[])
 
       // Primary server
       CORBA::Object_var object_primary =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //Secondary server
       CORBA::Object_var object_secondary =
-        orb->string_to_object (name TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get an object reference for the ORBs IORManipultion object!
       CORBA_Object_ptr IORM =
         orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
                                          0
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM TAO_ENV_ARG_PARAMETER);
+        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       TAO_IOP::TAO_IOR_Manipulation::IORList iors (2);
@@ -91,12 +91,12 @@ main (int argc, char *argv[])
       iors [0] = object_primary;
       iors [1] = object_secondary;
 
-      CORBA_Object_var merged = iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER);
+      CORBA_Object_var merged = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Combined IOR stuff
       Simple_Server_var server =
-        Simple_Server::_narrow (merged.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (merged.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-      run_test (server.in () TAO_ENV_ARG_PARAMETER);
+      run_test (server.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
 }
 
 void run_test (Simple_Server_ptr server
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   for (int loop = 0; loop < 10; loop++)
     {
@@ -129,7 +129,7 @@ void run_test (Simple_Server_ptr server
           // Make a remote call
           cout << "Remote call "<<endl;
           CORBA::Long ret=
-            server->remote_call (TAO_ENV_SINGLE_ARG_PARAMETER);
+            server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           cout << "The retval is .. " << ret << endl;
diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp
index ac965b990ac..c2481225b94 100644
--- a/TAO/tests/MProfile/server.cpp
+++ b/TAO/tests/MProfile/server.cpp
@@ -38,11 +38,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,15 +51,15 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -68,11 +68,11 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -91,12 +91,12 @@ main (int argc, char *argv[])
         }
 
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::sleep (5);
diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp
index bbf7e7c0709..8135b51217d 100644
--- a/TAO/tests/MProfile/test_i.cpp
+++ b/TAO/tests/MProfile/test_i.cpp
@@ -17,7 +17,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 CORBA::Long
-Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -28,7 +28,7 @@ Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/tests/MProfile/test_i.h b/TAO/tests/MProfile/test_i.h
index f839fd3c6b4..f6d4df6ebee 100644
--- a/TAO/tests/MProfile/test_i.h
+++ b/TAO/tests/MProfile/test_i.h
@@ -34,10 +34,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Long remote_call (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:
diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp
index 1f394084e40..5019c94d019 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.cpp
+++ b/TAO/tests/MProfile_Forwarding/Manager.cpp
@@ -49,7 +49,7 @@ int
 main (int argc,
       char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   Manager manager;
 
@@ -58,19 +58,19 @@ main (int argc,
       // Initilaize the ORB, POA etc.
       manager.init (argc,
                     argv
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) == -1)
         return -1;
 
-      manager.activate_servant (TAO_ENV_SINGLE_ARG_PARAMETER);
+      manager.activate_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      manager.make_iors_register (TAO_ENV_SINGLE_ARG_PARAMETER);
+      manager.make_iors_register (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      manager.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      manager.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -94,30 +94,30 @@ Manager::Manager (void)
 int
 Manager::init (int argc,
                char *argv[]
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
                                 0
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
-    this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa_var =
-    PortableServer::POA::_narrow (obj_var.in () TAO_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (obj_var.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager_var =
-    root_poa_var->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    root_poa_var->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  poa_manager_var->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Policies for the childPOA to be created.
@@ -128,25 +128,25 @@ Manager::init (int argc,
   // Id Assignment Policy
   policies[0] =
     root_poa_var->create_id_assignment_policy (PortableServer::USER_ID
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Lifespan policy
   policies[1] =
     root_poa_var->create_lifespan_policy (PortableServer::PERSISTENT
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Tell the POA to use a servant manager
   policies[2] =
     root_poa_var->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Servant Retention Policy -> Use a locator
   policies[3] =
     root_poa_var->create_servant_retention_policy (PortableServer::NON_RETAIN
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_CString name = "newPOA";
@@ -155,7 +155,7 @@ Manager::init (int argc,
     root_poa_var->create_POA (name.c_str (),
                               poa_manager_var.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Creation of childPOAs is over. Destroy the Policy objects.
@@ -164,7 +164,7 @@ Manager::init (int argc,
        ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -173,7 +173,7 @@ Manager::init (int argc,
 
 
 int
-Manager::activate_servant (TAO_ENV_SINGLE_ARG_DECL)
+Manager::activate_servant (ACE_ENV_SINGLE_ARG_DECL)
 {
 
   ACE_NEW_THROW_EX (this->servant_locator_,
@@ -186,7 +186,7 @@ Manager::activate_servant (TAO_ENV_SINGLE_ARG_DECL)
   // Set ServantLocator object as the servant Manager of
   // secondPOA.
   this->new_poa_var_->set_servant_manager (this->servant_locator_
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Try to create a reference with user created ID in new_poa
@@ -197,7 +197,7 @@ Manager::activate_servant (TAO_ENV_SINGLE_ARG_DECL)
 
   this->new_manager_ior_ =
     new_poa_var_->create_reference_with_id (second_foo_oid_var.in (),
-                                            "IDL:Simple_Server:1.0" TAO_ENV_ARG_PARAMETER);
+                                            "IDL:Simple_Server:1.0" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -205,18 +205,18 @@ Manager::activate_servant (TAO_ENV_SINGLE_ARG_DECL)
 
 
 int
-Manager::make_iors_register (TAO_ENV_SINGLE_ARG_DECL)
+Manager::make_iors_register (ACE_ENV_SINGLE_ARG_DECL)
 {
   // First  server
   CORBA::Object_var object_primary =
     this->orb_->string_to_object (first_ior
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   //Second server
   CORBA::Object_var object_secondary =
     this->orb_->string_to_object (second_ior
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (third_ior == 0)
@@ -225,18 +225,18 @@ Manager::make_iors_register (TAO_ENV_SINGLE_ARG_DECL)
   // Third Server
   CORBA::Object_var object_tertiary =
     this->orb_->string_to_object (third_ior
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get an object reference for the ORBs IORManipultion object!
   CORBA_Object_ptr IORM =
     this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   TAO_IOP::TAO_IOR_Manipulation_ptr iorm =
-    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM TAO_ENV_ARG_PARAMETER);
+    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
@@ -249,7 +249,7 @@ Manager::make_iors_register (TAO_ENV_SINGLE_ARG_DECL)
 
   // Create a merged set 1;
   CORBA_Object_var merged_set1 =
-    iorm->merge_iors (iors TAO_ENV_ARG_PARAMETER);
+    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (object_secondary.in () == 0)
@@ -268,7 +268,7 @@ Manager::make_iors_register (TAO_ENV_SINGLE_ARG_DECL)
 
   // Create merged set 2
   CORBA_Object_var merged_set2 =
-    iorm->merge_iors (iors_again TAO_ENV_ARG_PARAMETER);
+    iorm->merge_iors (iors_again ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::String_var iorref1 =
@@ -293,9 +293,9 @@ Manager::make_iors_register (TAO_ENV_SINGLE_ARG_DECL)
 
 
 int
-Manager::run (TAO_ENV_SINGLE_ARG_DECL)
+Manager::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/tests/MProfile_Forwarding/Manager.h b/TAO/tests/MProfile_Forwarding/Manager.h
index 7c61379f133..6f14588b3a3 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.h
+++ b/TAO/tests/MProfile_Forwarding/Manager.h
@@ -14,19 +14,19 @@ class Manager
 
   int init (int argc,
             char *argv[]
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
 
   // Initialize the ORB, POA etc.
 
-  int init_register_name_service (TAO_ENV_SINGLE_ARG_DECL);
+  int init_register_name_service (ACE_ENV_SINGLE_ARG_DECL);
   // Initialize the Name service, tegister the combined IOR with it
 
-  int activate_servant (TAO_ENV_SINGLE_ARG_DECL);
+  int activate_servant (ACE_ENV_SINGLE_ARG_DECL);
   // Activate the servant etc.
 
-  int make_iors_register (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int make_iors_register (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the  ORB event loop..
  private:
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
index c3b52c4346b..574990b5072 100755
--- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
+++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp
@@ -42,7 +42,7 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
                             PortableServer::POA_ptr /* poa_ptr */,
                             const char * /*operation*/,
                             PortableServer::ServantLocator::Cookie & /* cookie */
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -59,7 +59,7 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid,
   // Combined IOR stuff
   Simple_Server_var server =
     Simple_Server::_narrow (this->objref_.in ()
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -80,7 +80,7 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &,
                              const char *,
                              PortableServer::ServantLocator::Cookie ,
                              PortableServer::Servant
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.h b/TAO/tests/MProfile_Forwarding/Servant_Locator.h
index ec8bc40be31..69964b46395 100755
--- a/TAO/tests/MProfile_Forwarding/Servant_Locator.h
+++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.h
@@ -39,7 +39,7 @@ public:
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
                                              PortableServer::ServantLocator::Cookie &the_cookie
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
   // This method is invoked by a POA whenever it receives a request
@@ -50,7 +50,7 @@ public:
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
                            PortableServer::Servant the_servant
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // This method is invoked whenever a MyFooServant completes a
   // request.
diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index 36b0dd3c49e..e0d3cc53969 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -35,17 +35,17 @@ parse_args (int argc, char *argv[])
 
 void
 run_test (Simple_Server_ptr server
-          TAO_ENV_ARG_DECL);
+          ACE_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       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) == -1)
@@ -63,7 +63,7 @@ main (int argc, char *argv[])
         }
 
       Simple_Server_var server =
-        Simple_Server::_narrow (objref.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (objref.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
                             -1);
         }
 
-      run_test (server.in () TAO_ENV_ARG_PARAMETER);
+      run_test (server.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -86,7 +86,7 @@ main (int argc, char *argv[])
 }
 
 void run_test (Simple_Server_ptr server
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
 {
   for (int loop = 0; loop < 10; loop++)
     {
@@ -97,7 +97,7 @@ void run_test (Simple_Server_ptr server
           ACE_OS::sleep (2);
 
           // Make a remote call
-          server->remote_call (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->remote_call (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           /*ACE_DEBUG ((LM_DEBUG,
@@ -106,7 +106,7 @@ void run_test (Simple_Server_ptr server
           ACE_DEBUG ((LM_DEBUG, " hope you did\n")); */
           ACE_DEBUG ((LM_DEBUG,
                       "I am going to shutdown \n"));
-          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_OS::sleep (23);
         }
diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp
index 4672bcd0a74..7d9ace8d48f 100755
--- a/TAO/tests/MProfile_Forwarding/server.cpp
+++ b/TAO/tests/MProfile_Forwarding/server.cpp
@@ -38,11 +38,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,15 +51,15 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -68,11 +68,11 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -91,12 +91,12 @@ main (int argc, char *argv[])
         }
 
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::sleep (5);
diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp
index 9866b7fb3a3..2cd5a649db2 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.cpp
+++ b/TAO/tests/MProfile_Forwarding/test_i.cpp
@@ -15,7 +15,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 void
-Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::remote_call (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -24,7 +24,7 @@ Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/tests/MProfile_Forwarding/test_i.h b/TAO/tests/MProfile_Forwarding/test_i.h
index f55d995e411..8c13fba4b4e 100644
--- a/TAO/tests/MProfile_Forwarding/test_i.h
+++ b/TAO/tests/MProfile_Forwarding/test_i.h
@@ -34,10 +34,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void remote_call (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:
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
index 61a155fc737..aaab6575632 100644
--- a/TAO/tests/MT_Client/client.cpp
+++ b/TAO/tests/MT_Client/client.cpp
@@ -64,7 +64,7 @@ public:
   // The thread entry point.
 
 private:
-  void validate_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void validate_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Validate the connection
 
 private:
@@ -81,18 +81,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->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -116,11 +116,11 @@ main (int argc, char *argv[])
 
       if (server_shutdown)
         {
-          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->shutdown (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
@@ -144,7 +144,7 @@ Client::Client (Simple_Server_ptr server,
 }
 
 void
-Client::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
+Client::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Ping the object 100 times, ignoring all exceptions.
   // It would be better to use validate_connection() but the test must
@@ -153,7 +153,7 @@ Client::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
     {
       ACE_TRY
         {
-          this->server_->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY {} ACE_ENDTRY;
@@ -165,12 +165,12 @@ Client::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i < this->niterations_; ++i)
         {
-          this->server_->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->server_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (TAO_debug_level > 0 && i % 100 == 0)
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
index 244d1a92ca2..6a6f1db233d 100644
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ b/TAO/tests/MT_Client/orb_creation.cpp
@@ -81,11 +81,11 @@ main (int argc, char *argv[])
         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;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
 
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -133,7 +133,7 @@ Client::Client (int niterations,
 int
 Client::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       for (int i = 0; i < this->niterations_; ++i)
@@ -144,15 +144,15 @@ Client::svc (void)
           CORBA::String_var argv0 = CORBA::string_dup ("dummy_argv");
           char* argv[1] = { argv0.inout () };
           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;
 
           CORBA::Object_var object =
-            orb->string_to_object (this->ior_ TAO_ENV_ARG_PARAMETER);
+            orb->string_to_object (this->ior_ ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           Simple_Server_var server =
-            Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+            Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (server.in ()))
@@ -163,7 +163,7 @@ Client::svc (void)
                                 1);
             }
 
-          server->test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           if (TAO_debug_level > 0 && i % 100 == 0)
             ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp
index 4d344552377..0718edf84e0 100644
--- a/TAO/tests/MT_Client/server.cpp
+++ b/TAO/tests/MT_Client/server.cpp
@@ -38,11 +38,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -86,18 +86,18 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp
index b10c633832d..61e2bf25496 100644
--- a/TAO/tests/MT_Client/test_i.cpp
+++ b/TAO/tests/MT_Client/test_i.cpp
@@ -9,14 +9,14 @@
 ACE_RCSID(MT_Client, test_i, "$Id$")
 
 void
-Simple_Server_i::test_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::test_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_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);
 }
diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h
index 295fe73af56..8e9f0794f76 100644
--- a/TAO/tests/MT_Client/test_i.h
+++ b/TAO/tests/MT_Client/test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server 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:
diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp
index a6c60fb78f9..3948231f376 100644
--- a/TAO/tests/MT_Server/client.cpp
+++ b/TAO/tests/MT_Server/client.cpp
@@ -51,18 +51,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->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -76,7 +76,7 @@ main (int argc, char *argv[])
       for (int i = 0; i != niterations; ++i)
         {
           CORBA::Long r =
-            server->test_method (i TAO_ENV_ARG_PARAMETER);
+            server->test_method (i ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (r != i)
@@ -89,7 +89,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp
index debba16f9e3..982fc2cbc28 100644
--- a/TAO/tests/MT_Server/server.cpp
+++ b/TAO/tests/MT_Server/server.cpp
@@ -66,11 +66,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -79,11 +79,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -92,11 +92,11 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -114,7 +114,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Worker worker (orb.in ());
@@ -149,10 +149,10 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp
index cd3bc2abbc3..062d4555b9f 100644
--- a/TAO/tests/MT_Server/test_i.cpp
+++ b/TAO/tests/MT_Server/test_i.cpp
@@ -10,7 +10,7 @@
 ACE_RCSID(MT_Server, test_i, "$Id$")
 
 CORBA::Long
-Simple_Server_i::test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED)
+Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -21,8 +21,8 @@ Simple_Server_i::test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED)
 }
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_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);
 }
diff --git a/TAO/tests/MT_Server/test_i.h b/TAO/tests/MT_Server/test_i.h
index 60fdc9a457b..65fa40ed8b2 100644
--- a/TAO/tests/MT_Server/test_i.h
+++ b/TAO/tests/MT_Server/test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Long x TAO_ENV_ARG_DECL_NOT_USED)
+  CORBA::Long test_method (CORBA::Long x 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:
diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp
index 5bf38b970dd..cc078fe6cc9 100644
--- a/TAO/tests/MT_Timeout/Client_Task.cpp
+++ b/TAO/tests/MT_Timeout/Client_Task.cpp
@@ -46,22 +46,22 @@ Client_Task::too_big_difference_calls (void) const
 int
 Client_Task::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   int successful_calls = 0;
   int timed_out_calls = 0;
 
   ACE_TRY
     {
-      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var 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;
 
       TimeBase::TimeT timeout_period = 10 * this->timeout_;
@@ -74,17 +74,17 @@ Client_Task::svc (void)
       policy_list[0] =
         this->orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                                    timeout_as_any
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policy_current->set_policy_overrides (policy_list,
                                             CORBA::ADD_OVERRIDE
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != this->iterations_; ++i)
         {
-          int retval = this->one_iteration (TAO_ENV_SINGLE_ARG_PARAMETER);
+          int retval = this->one_iteration (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (retval == 1)
@@ -118,13 +118,13 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
+Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       for (int i = 0; i != 100; ++i)
         {
-          (void) this->sleep_service_->go_to_sleep (0 TAO_ENV_ARG_PARAMETER);
+          (void) this->sleep_service_->go_to_sleep (0 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -137,14 +137,14 @@ Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Client_Task::one_iteration (TAO_ENV_SINGLE_ARG_DECL)
+Client_Task::one_iteration (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       ACE_Time_Value start = ACE_OS::gettimeofday ();
 
       this->sleep_service_->go_to_sleep (this->sleep_time_
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Time_Value end = ACE_OS::gettimeofday ();
diff --git a/TAO/tests/MT_Timeout/Client_Task.h b/TAO/tests/MT_Timeout/Client_Task.h
index 8b9ef41cc0e..6bc79a6c3ed 100644
--- a/TAO/tests/MT_Timeout/Client_Task.h
+++ b/TAO/tests/MT_Timeout/Client_Task.h
@@ -46,7 +46,7 @@ public:
   /// Return the total number of timed out calls
   int timed_out_calls (void) const;
 
-  /// Return the number of calls with a too huge difference in 
+  /// Return the number of calls with a too huge difference in
   /// timeout versus actual response arrival.
   int too_big_difference_calls (void) const;
 
@@ -55,10 +55,10 @@ public:
 
 private:
   /// Run one iteration of the test
-  int one_iteration (TAO_ENV_SINGLE_ARG_DECL);
+  int one_iteration (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Make sure that the thread has a connection available
-  void validate_connection (TAO_ENV_SINGLE_ARG_DECL);
+  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
   /// A reference to the ORB
diff --git a/TAO/tests/MT_Timeout/Server_Task.cpp b/TAO/tests/MT_Timeout/Server_Task.cpp
index 34c76abd7bf..863f5f50c64 100644
--- a/TAO/tests/MT_Timeout/Server_Task.cpp
+++ b/TAO/tests/MT_Timeout/Server_Task.cpp
@@ -18,10 +18,10 @@ Server_Task::Server_Task (ACE_Thread_Manager *thr_mgr,
 int
 Server_Task::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (this->running_time_ TAO_ENV_ARG_PARAMETER);
+      this->orb_->run (this->running_time_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp
index 0650e317c9e..b234cb0feb0 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.cpp
+++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp
@@ -12,7 +12,7 @@ Sleep_Service::Sleep_Service (CORBA::ORB_ptr orb)
 
 void
 Sleep_Service::go_to_sleep (CORBA::ULong microseconds
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong  secs = microseconds / 1000000;
@@ -23,9 +23,9 @@ Sleep_Service::go_to_sleep (CORBA::ULong microseconds
 }
 
 void
-Sleep_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Sleep_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n"));
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h
index b25ddd7a66d..8742185553f 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.h
+++ b/TAO/tests/MT_Timeout/Sleep_Service.h
@@ -26,10 +26,10 @@ public:
 
   // = The skeleton methods
   virtual void go_to_sleep (CORBA::ULong microseconds
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/MT_Timeout/client.cpp b/TAO/tests/MT_Timeout/client.cpp
index e8b3e285b7c..c2a1eae4ab6 100644
--- a/TAO/tests/MT_Timeout/client.cpp
+++ b/TAO/tests/MT_Timeout/client.cpp
@@ -51,18 +51,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 tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Sleep_Service_var sleep_service =
-        Test::Sleep_Service::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Sleep_Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (sleep_service.in ()))
@@ -95,13 +95,13 @@ main (int argc, char *argv[])
       ACE_Thread_Manager::instance ()->wait ();
 
       // Get back in sync with the server..
-      sleep_service->go_to_sleep (0 TAO_ENV_ARG_PARAMETER);
+      sleep_service->go_to_sleep (0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      sleep_service->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      sleep_service->shutdown (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_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp
index 2b60e0c130d..0f95a9e7194 100644
--- a/TAO/tests/MT_Timeout/server.cpp
+++ b/TAO/tests/MT_Timeout/server.cpp
@@ -39,15 +39,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(sleep_service_impl);
 
       Test::Sleep_Service_var process =
-        sleep_service_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        sleep_service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (process.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (process.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -86,7 +86,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Task server_task (ACE_Thread_Manager::instance (),
@@ -102,10 +102,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Multiple/Collocation_Tester.cpp b/TAO/tests/Multiple/Collocation_Tester.cpp
index 0723c2e42f8..1bc6df52672 100644
--- a/TAO/tests/Multiple/Collocation_Tester.cpp
+++ b/TAO/tests/Multiple/Collocation_Tester.cpp
@@ -39,7 +39,7 @@ Collocation_Tester::match_answer (const char *actual_answer,
 }
 
 int
-Collocation_Tester::test_top (TAO_ENV_SINGLE_ARG_DECL)
+Collocation_Tester::test_top (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n------------------------<TOP>-------------------------------\n")));
@@ -58,7 +58,7 @@ Collocation_Tester::test_top (TAO_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\nCalling all method supported by the Interface Top\n\n")));
 
-  CORBA::String_var msg = top->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var msg = top->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   failure += this->match_answer (Quote::top, msg.in (), "top_quote");
@@ -74,7 +74,7 @@ Collocation_Tester::test_top (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Collocation_Tester::test_right (TAO_ENV_SINGLE_ARG_DECL)
+Collocation_Tester::test_right (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n------------------------<RIGHT>-------------------------------\n")));
@@ -93,12 +93,12 @@ Collocation_Tester::test_right (TAO_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\nCalling all method supported by the Interface Right\n\n")));
 
-  CORBA::String_var msg = right->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var msg = right->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   failure += this->match_answer (Quote::top, msg.in (), "top_quote");
 
-  msg = right->right_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+  msg = right->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   failure += this->match_answer (Quote::right, msg.in (), "right_quote");
@@ -115,7 +115,7 @@ Collocation_Tester::test_right (TAO_ENV_SINGLE_ARG_DECL)
 
 
 int
-Collocation_Tester::test_left (TAO_ENV_SINGLE_ARG_DECL)
+Collocation_Tester::test_left (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n------------------------<LEFT>-------------------------------\n")));
@@ -135,12 +135,12 @@ Collocation_Tester::test_left (TAO_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\nCalling all method supported by the Interface Left\n\n")));
 
-  CORBA::String_var msg = left->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var msg = left->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   failure += this->match_answer (Quote::top, msg.in (), "top_quote");
 
-  msg = left->left_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+  msg = left->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN(1);
 
   failure += this->match_answer (Quote::left, msg.in (), "left_quote");
@@ -157,7 +157,7 @@ Collocation_Tester::test_left (TAO_ENV_SINGLE_ARG_DECL)
 
 
 int
-Collocation_Tester::test_bottom (TAO_ENV_SINGLE_ARG_DECL)
+Collocation_Tester::test_bottom (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("\n-----------------------<BOTTOM>-------------------------------\n")));
@@ -177,22 +177,22 @@ Collocation_Tester::test_bottom (TAO_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\nCalling all method supported by the Interface Bottom\n\n")));
 
-  CORBA::String_var msg = bottom->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var msg = bottom->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN(1);
 
   failure += this->match_answer (Quote::top, msg.in (), "top_quote");
 
-  msg = bottom->left_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+  msg = bottom->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   failure += this->match_answer (Quote::left, msg.in (), "left_quote");
 
-  msg = bottom->right_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+  msg = bottom->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN(1);
 
   failure += this->match_answer (Quote::right, msg.in (), "right_quote");
 
-  msg = bottom->bottom_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+  msg = bottom->bottom_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN(1);
 
   failure += this->match_answer (Quote::bottom, msg.in (), "bottom_quote");
@@ -208,7 +208,7 @@ Collocation_Tester::test_bottom (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Collocation_Tester::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Collocation_Tester::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   Multiple::Top_var top =
     Multiple::Top::_narrow (this->object_.in ());
@@ -223,23 +223,23 @@ Collocation_Tester::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("\n\nCalling ShutDown on Top.\n\n")));
 
-  top->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  top->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-Collocation_Tester::run (TAO_ENV_SINGLE_ARG_DECL)
+Collocation_Tester::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  int failure_num =   this->test_top (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int failure_num =   this->test_top (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  failure_num += this->test_left (TAO_ENV_SINGLE_ARG_PARAMETER);
+  failure_num += this->test_left (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  failure_num += this->test_right (TAO_ENV_SINGLE_ARG_PARAMETER);
+  failure_num += this->test_right (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  failure_num += this->test_bottom (TAO_ENV_SINGLE_ARG_PARAMETER);
+  failure_num += this->test_bottom (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (failure_num)
@@ -249,5 +249,5 @@ Collocation_Tester::run (TAO_ENV_SINGLE_ARG_DECL)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("\n\nThe Test Completed Successfully. Congratulations! ")));
 
-  this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Multiple/Collocation_Tester.h b/TAO/tests/Multiple/Collocation_Tester.h
index 766242232bc..5a22ad55ace 100644
--- a/TAO/tests/Multiple/Collocation_Tester.h
+++ b/TAO/tests/Multiple/Collocation_Tester.h
@@ -39,7 +39,7 @@ public:
   ~Collocation_Tester ();
 
   // -- Command --
-  void run (TAO_ENV_SINGLE_ARG_DECL);
+  void run (ACE_ENV_SINGLE_ARG_DECL);
   // Runs the test.
 
 
@@ -47,19 +47,19 @@ private:
 
   // -- Helper Methods --
 
-  int  test_top (TAO_ENV_SINGLE_ARG_DECL);
+  int  test_top (ACE_ENV_SINGLE_ARG_DECL);
   // Tests the method accessible thru the
   // Top interface.
 
-  int test_right (TAO_ENV_SINGLE_ARG_DECL);
+  int test_right (ACE_ENV_SINGLE_ARG_DECL);
   // Tests the method accessible thru the
   // Right interface.
 
-  int test_left (TAO_ENV_SINGLE_ARG_DECL);
+  int test_left (ACE_ENV_SINGLE_ARG_DECL);
   // Tests the method accessible thru the
   // Left interface.
 
-  int test_bottom (TAO_ENV_SINGLE_ARG_DECL);
+  int test_bottom (ACE_ENV_SINGLE_ARG_DECL);
   // Tests the method accessible thru the
   // Bottom interface.
 
@@ -72,7 +72,7 @@ private:
   // is no match (actually 1 is returned if there is
   // no match.
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL);
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 private:
   CORBA::Object_var object_;
 };
diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp
index d65dfde3c07..54e95ead3e1 100644
--- a/TAO/tests/Multiple/Multiple_Impl.cpp
+++ b/TAO/tests/Multiple/Multiple_Impl.cpp
@@ -20,38 +20,38 @@ Bottom_Impl::~Bottom_Impl (void)
 }
 
 char *
-Bottom_Impl::top_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
+Bottom_Impl::top_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::top);
 }
 
 char *
-Bottom_Impl::left_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
+Bottom_Impl::left_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::left);
 }
 
 char *
-Bottom_Impl::right_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
+Bottom_Impl::right_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::right);
 }
 
 char *
-Bottom_Impl::bottom_quote (TAO_ENV_SINGLE_ARG_DECL_NOT_USED )
+Bottom_Impl::bottom_quote (ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup(Quote::bottom);
 }
 
 void
-Bottom_Impl::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Bottom_Impl::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);
 }
 
 ///////////////////////////////////////////////////////////
@@ -70,64 +70,64 @@ Delegated_Bottom_Impl::~Delegated_Bottom_Impl (void)
 }
 
 char *
-Delegated_Bottom_Impl::top_quote (TAO_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::top_quote (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <top_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->top_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->delegate_->top_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return msg._retn ();
 }
 
 char *
-Delegated_Bottom_Impl::left_quote (TAO_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::left_quote (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
     ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <left_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->left_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->delegate_->left_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return msg._retn ();
 }
 
 char *
-Delegated_Bottom_Impl::right_quote (TAO_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::right_quote (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <right_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->right_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->delegate_->right_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return msg._retn ();
 }
 
 char *
-Delegated_Bottom_Impl::bottom_quote (TAO_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::bottom_quote (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating the call: <bottom_quote>\n")));
 
   CORBA::String_var msg =
-    this->delegate_->bottom_quote (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->delegate_->bottom_quote (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
   return msg._retn ();
 }
 
 void
-Delegated_Bottom_Impl::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Delegated_Bottom_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Delegating Shut-Down.\n")));
-  this->delegate_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
-  //this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->delegate_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  //this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h
index e0a563896bc..e97f97ca80e 100644
--- a/TAO/tests/Multiple/Multiple_Impl.h
+++ b/TAO/tests/Multiple/Multiple_Impl.h
@@ -40,27 +40,27 @@ public:
   virtual ~Bottom_Impl (void);
 
   // IDL Interface Methods
-  virtual char * top_quote (TAO_ENV_SINGLE_ARG_DECL)
+  virtual char * top_quote (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual char * left_quote (TAO_ENV_SINGLE_ARG_DECL)
+  virtual char * left_quote (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual char * right_quote (TAO_ENV_SINGLE_ARG_DECL)
+  virtual char * right_quote (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual char * bottom_quote (TAO_ENV_SINGLE_ARG_DECL)
+  virtual char * bottom_quote (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
@@ -89,24 +89,24 @@ public:
   virtual ~Delegated_Bottom_Impl (void);
 
   // IDL Interface Methods.
-  virtual char * top_quote (TAO_ENV_SINGLE_ARG_DECL)
+  virtual char * top_quote (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
-  virtual char * left_quote (TAO_ENV_SINGLE_ARG_DECL)
+  virtual char * left_quote (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
-  virtual char * right_quote (TAO_ENV_SINGLE_ARG_DECL)
+  virtual char * right_quote (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
-  virtual char * bottom_quote (TAO_ENV_SINGLE_ARG_DECL)
+  virtual char * bottom_quote (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((
                      CORBA::SystemException
                      ));
diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp
index 796976b3470..8a2d499abce 100644
--- a/TAO/tests/Multiple/client.cpp
+++ b/TAO/tests/Multiple/client.cpp
@@ -6,18 +6,18 @@ ACE_RCSID (tests, client, "$Id$")
 
 int main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // ORB Initialization
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" TAO_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object;
 
       // Get The IOR from a file
-      object = orb->string_to_object ("file://s.ior" TAO_ENV_ARG_PARAMETER);
+      object = orb->string_to_object ("file://s.ior" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -27,7 +27,7 @@ int main (int argc, char *argv[])
         }
 
       Collocation_Tester tester (object.in ());
-      tester.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      tester.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp
index 403530d1b21..4bbaa563fac 100644
--- a/TAO/tests/Multiple/server.cpp
+++ b/TAO/tests/Multiple/server.cpp
@@ -7,24 +7,24 @@ ACE_RCSID (tests, server, "$Id$")
 int main (int argc, char *argv[])
 {
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Orb Initialization
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" TAO_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object;
-      object = orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+      object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      PortableServer::POA_var poa = PortableServer::POA::_narrow(object.in() TAO_ENV_ARG_PARAMETER);
+      PortableServer::POA_var poa = PortableServer::POA::_narrow(object.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
       // Get the POAManager
-      PortableServer::POAManager_var poa_manager = poa->the_POAManager(TAO_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::POAManager_var poa_manager = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the servant.
@@ -41,7 +41,7 @@ int main (int argc, char *argv[])
 
       // Now we stringfy the object reference.
       CORBA::String_var ior =
-        orb->object_to_string (bottom.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (bottom.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -58,7 +58,7 @@ int main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Activate the POAManager
-      poa_manager->activate(TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       orb->run();
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index 87e8cbe8611..da21a7210b2 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -9,22 +9,22 @@ class Multiple_Inheritance_i : public POA_D
 public:
   Multiple_Inheritance_i (void);
 
-  virtual char* method1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* method1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method1");
     }
-  virtual char* method2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* method2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method2");
     }
-  virtual char* method3 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* method3 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method3");
     }
-  virtual char* method4 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* method4 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method4");
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index 465cf0e591b..3041b64478e 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -69,12 +69,12 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the IOR
@@ -102,60 +102,60 @@ main (int argc, char **argv)
         }
 
       // Get the object reference with the IOR
-      CORBA::Object_var object = orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+      CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var string;
 
       // Narrow the object reference
-      A_var a = A::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+      A_var a = A::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference
-      B_var b = B::_narrow (a.in () TAO_ENV_ARG_PARAMETER);
+      B_var b = B::_narrow (a.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference
-      C_var c = C::_narrow (a.in () TAO_ENV_ARG_PARAMETER);
+      C_var c = C::_narrow (a.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference
-      D_var d = D::_narrow (c.in () TAO_ENV_ARG_PARAMETER);
+      D_var d = D::_narrow (c.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      string = a->method1 (TAO_ENV_SINGLE_ARG_PARAMETER);
+      string = a->method1 (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = b->method1 (TAO_ENV_SINGLE_ARG_PARAMETER);
+      string = b->method1 (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = b->method2 (TAO_ENV_SINGLE_ARG_PARAMETER);
+      string = b->method2 (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = c->method1 (TAO_ENV_SINGLE_ARG_PARAMETER);
+      string = c->method1 (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = c->method3 (TAO_ENV_SINGLE_ARG_PARAMETER);
+      string = c->method3 (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method1 (TAO_ENV_SINGLE_ARG_PARAMETER);
+      string = d->method1 (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method2 (TAO_ENV_SINGLE_ARG_PARAMETER);
+      string = d->method2 (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method3 (TAO_ENV_SINGLE_ARG_PARAMETER);
+      string = d->method3 (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method4 (TAO_ENV_SINGLE_ARG_PARAMETER);
+      string = d->method4 (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
     }
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index 4fa16427905..e970bcd85c8 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -48,13 +48,13 @@ main (int argc, char **argv)
   TAO_ORB_Manager orb_manager;
 
   ACE_DEBUG ((LM_DEBUG, "\n\tMultiple Inheritance Server\n\n"));
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       orb_manager.init_child_poa (argc,
                                   argv,
                                   "child_poa"
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -63,7 +63,7 @@ main (int argc, char **argv)
       CORBA::String_var ior =
         orb_manager.activate_under_child_poa ("my_object",
                                               &servant
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "%s\n",
@@ -82,7 +82,7 @@ main (int argc, char **argv)
           ACE_OS::fclose (output_file);
         }
 
-      orb_manager.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb_manager.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/tests/Muxing/Client_Task.cpp b/TAO/tests/Muxing/Client_Task.cpp
index 52a2ea3a368..01960176f11 100644
--- a/TAO/tests/Muxing/Client_Task.cpp
+++ b/TAO/tests/Muxing/Client_Task.cpp
@@ -27,12 +27,12 @@ Client_Task::svc (void)
   for (CORBA::ULong j = 0; j != payload.length (); ++j)
     payload[j] = (j % 256);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       for (int i = 0; i != this->event_count_; ++i)
         {
-          this->receiver_->receive_data (payload TAO_ENV_ARG_PARAMETER);
+          this->receiver_->receive_data (payload ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp
index ddeb77de007..6ffff418f91 100644
--- a/TAO/tests/Muxing/Receiver.cpp
+++ b/TAO/tests/Muxing/Receiver.cpp
@@ -24,7 +24,7 @@ Receiver::dump_results ()
 
 void
 Receiver::receive_data (const Test::Payload &payload
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
@@ -33,7 +33,7 @@ Receiver::receive_data (const Test::Payload &payload
 }
 
 CORBA::Long
-Receiver::get_event_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Receiver::get_event_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h
index 227c4c785a7..25a45a17d46 100644
--- a/TAO/tests/Muxing/Receiver.h
+++ b/TAO/tests/Muxing/Receiver.h
@@ -32,9 +32,9 @@ public:
 
   // = The skeleton methods
   virtual void receive_data (const Test::Payload &payload
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual CORBA::Long get_event_count (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long get_event_count (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp
index e23e16908a2..828f010158d 100644
--- a/TAO/tests/Muxing/Server_Task.cpp
+++ b/TAO/tests/Muxing/Server_Task.cpp
@@ -17,12 +17,12 @@ int
 Server_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // run the test for at most 120 seconds...
       ACE_Time_Value tv (120, 0);
-      this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
+      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index f9bc046097b..01e0b962d78 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -38,18 +38,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 tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Receiver_var receiver =
-        Test::Receiver::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (receiver.in ()))
@@ -72,13 +72,13 @@ main (int argc, char *argv[])
         }
       ACE_Thread_Manager::instance ()->wait ();
 
-      CORBA::Long count = receiver->get_event_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Long count = receiver->get_event_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P) - Receiver got %d messages\n",
                   count));
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp
index e2e54be6e31..06a120b2183 100644
--- a/TAO/tests/Muxing/server.cpp
+++ b/TAO/tests/Muxing/server.cpp
@@ -39,11 +39,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -52,11 +52,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl);
 
       Test::Receiver_var receiver =
-        receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (receiver.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (receiver.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -86,7 +86,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Task server_task (orb.in (),
@@ -100,10 +100,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Now terminating test\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
index 14d564729cf..c9037a1145b 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp
@@ -38,7 +38,7 @@ MT_Object_i::~MT_Object_i (void)
 CORBA::Long
 MT_Object_i::yadda (CORBA::Long hop_count,
                        MT_Object_ptr partner
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -49,8 +49,8 @@ MT_Object_i::yadda (CORBA::Long hop_count,
   {
     if (partner != 0)
       return partner->yadda (hop_count + 1,
-                             this->_this (TAO_ENV_SINGLE_ARG_PARAMETER)
-                             TAO_ENV_ARG_PARAMETER) + 1;
+                             this->_this (ACE_ENV_SINGLE_ARG_PARAMETER)
+                             ACE_ENV_ARG_PARAMETER) + 1;
   }
 
   return 0;
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
index ccfad73f3ab..de5d9893297 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h
@@ -37,7 +37,7 @@ public:
 
   virtual CORBA::Long yadda (CORBA::Long hop_count,
                              MT_Object_ptr partner
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index 61eef4524e8..ad0435e280a 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -146,7 +146,7 @@ MT_Client::parse_args (void)
 int
 MT_Client::run (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       for (unsigned long i = 0; i < this->iterations_; i++)
@@ -160,7 +160,7 @@ MT_Client::run (void)
           // testing
           this->mT_Object_var_->yadda (0,
                                        0
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -198,7 +198,7 @@ MT_Client::init (int argc, char **argv,
 
   this->client_number_ = client_number;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       char buf[64];
@@ -208,7 +208,7 @@ MT_Client::init (int argc, char **argv,
         CORBA::ORB_init (this->argc_,
                          this->argv_,
                          buf
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -223,7 +223,7 @@ MT_Client::init (int argc, char **argv,
 
       CORBA::Object_var object_var =
         this->orb_var_->string_to_object (this->object_key_
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object_var.in()))
@@ -232,7 +232,7 @@ MT_Client::init (int argc, char **argv,
                             -1);
 
       this->mT_Object_var_ = MT_Object::_narrow (object_var.in()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->mT_Object_var_.in()))
@@ -246,7 +246,7 @@ MT_Client::init (int argc, char **argv,
         ACE_DEBUG ((LM_DEBUG, "We have a proper reference to the Object.\n"));
 
       CORBA::Object_var poa_object =
-        this->orb_var_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        this->orb_var_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -255,14 +255,14 @@ MT_Client::init (int argc, char **argv,
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -282,14 +282,14 @@ MT_Client::init (int argc, char **argv,
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       TAO_ORB_Manager orb_manager;
 
       int r = orb_manager.init (argc,
                                 argv
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r != 0)
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index fff693f2e46..6f83e38af9f 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -142,7 +142,7 @@ MT_Server::init (int argc,
                        "MT_Server::init: ORB_Manager is nil!\n"),
                        -1);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Call the init of TAO_ORB_Manager to create a child POA
@@ -150,7 +150,7 @@ MT_Server::init (int argc,
       this->orb_manager_ptr_->init_child_poa (argc,
                                               argv,
                                               "child_poa"
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -160,7 +160,7 @@ MT_Server::init (int argc,
       this->str_  =
         this->orb_manager_ptr_->activate_under_child_poa ("MT",
                                                           &this->mT_Object_i_
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -185,7 +185,7 @@ MT_Server::init (int argc,
 
       CORBA::Object_var object_var =
         orb_var->string_to_object (this->object_key_
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object_var.in()))
@@ -194,7 +194,7 @@ MT_Server::init (int argc,
                           -1);
 
       this->mT_Object_var_ = MT_Object::_narrow (object_var.in()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->mT_Object_var_.in()))
@@ -220,10 +220,10 @@ MT_Server::init (int argc,
 int
 MT_Server::run ()
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int r = this->orb_manager_ptr_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      int r = this->orb_manager_ptr_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
@@ -245,12 +245,12 @@ MT_Server::~MT_Server (void)
   if (this->object_key_ != 0)
     ACE_OS::free (this->object_key_);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       if (this->orb_manager_ptr_)
         this->orb_manager_ptr_->deactivate_under_child_poa (this->str_.in ()
-                                                            TAO_ENV_ARG_PARAMETER);
+                                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -266,7 +266,7 @@ MT_Server::run_ORB_briefly (void)
 {
   if (this->iterations_ > 0)
     {
-      TAO_ENV_DECLARE_NEW_ENV;
+      ACE_DECLARE_NEW_CORBA_ENV;
       ACE_TRY
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -276,12 +276,12 @@ MT_Server::run_ORB_briefly (void)
           for (unsigned int i = 0; i < this->iterations_; i++)
             {
               MT_Object_var tmp =
-                this->mT_Object_i_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+                this->mT_Object_i_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               this->mT_Object_var_->yadda (0,
                                            tmp.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
index a259d0c2f74..2fe47240f78 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
@@ -64,14 +64,14 @@ MT_Object_Server::parse_args (void)
 int
 MT_Object_Server::init (int argc,
                        char** argv
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
                                      "child_poa"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->argc_ = argc;
@@ -83,7 +83,7 @@ MT_Object_Server::init (int argc,
   CORBA::String_var str;
   str = this->orb_manager_.activate_under_child_poa ("MT_Object",
                                                      &this->mT_Object_i_
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -104,9 +104,9 @@ MT_Object_Server::init (int argc,
 
 
 int
-MT_Object_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+MT_Object_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "NestedUpCalls_Server::run"),
                       -1);
@@ -125,17 +125,17 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int r = MT_Object_Server.init (argc,argv TAO_ENV_ARG_PARAMETER);
+      int r = MT_Object_Server.init (argc,argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
         return 1;
       else
         {
-          MT_Object_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          MT_Object_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
index b8d72823b9e..0ae8e9d6633 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
@@ -49,10 +49,10 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 63e789b52b3..33dc4890f6a 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -50,7 +50,7 @@ Client_Task::svc (void)
       // Now, we can invoke an operation on the remote side.
       this->server_->start (this->client_.in (),
                             call_count
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -121,7 +121,7 @@ main (int argc,
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc,
@@ -130,34 +130,34 @@ main (int argc,
         return result;
 
       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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (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;
 
       server_var server = server::_narrow (object.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create an client object to hand to the other side...
       client_i client_servant (quiet,
                                server.in ());
 
-      client_var client_object = client_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      client_var client_object = client_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Client_Task client_tasks (client_object.in (),
@@ -167,13 +167,13 @@ main (int argc,
 
       if (shutdown_server)
         {
-          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/NestedUpcall/Simple/client_i.cpp b/TAO/tests/NestedUpcall/Simple/client_i.cpp
index 3e1d975fb28..af61f40ba94 100644
--- a/TAO/tests/NestedUpcall/Simple/client_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client_i.cpp
@@ -11,7 +11,7 @@ client_i::client_i (int quiet,
 
 void
 client_i::ping (CORBA::UShort time_to_live
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!this->quiet_)
@@ -24,7 +24,7 @@ client_i::ping (CORBA::UShort time_to_live
   if (time_to_live > 0)
     {
       this->server_->ping (time_to_live
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/tests/NestedUpcall/Simple/client_i.h b/TAO/tests/NestedUpcall/Simple/client_i.h
index d384e305791..c90a070e907 100644
--- a/TAO/tests/NestedUpcall/Simple/client_i.h
+++ b/TAO/tests/NestedUpcall/Simple/client_i.h
@@ -10,7 +10,7 @@ public:
   // Constructor.
 
   void ping (CORBA::UShort time_to_live
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
index 75312958193..59b29310415 100644
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server.cpp
@@ -33,10 +33,10 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 int
 Server_Task::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -121,7 +121,7 @@ main (int argc,
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc,
@@ -130,29 +130,29 @@ main (int argc,
         return result;
 
       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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       server_i server_servant (quiet,
                                orb.in ());
 
-      server_var server_object = server_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server_var server_object = server_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior = orb->object_to_string (server_object.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       result = write_ior_to_file (ior.in ());
@@ -174,7 +174,7 @@ main (int argc,
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp
index 9bf81230998..6e6a9b7ade4 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp
@@ -12,12 +12,12 @@ server_i::server_i (int quiet,
 void
 server_i::start (client_ptr c,
                  CORBA::UShort time_to_live
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->client_ = client::_duplicate (c);
   this->ping (time_to_live
-              TAO_ENV_ARG_PARAMETER);
+              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   return;
@@ -25,7 +25,7 @@ server_i::start (client_ptr c,
 
 void
 server_i::ping (CORBA::UShort time_to_live
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!this->quiet_)
@@ -38,16 +38,16 @@ server_i::ping (CORBA::UShort time_to_live
   if (time_to_live > 0)
     {
       this->client_->ping (time_to_live
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 void
-server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+server_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/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h
index 805606b8a32..a92ecc85d08 100644
--- a/TAO/tests/NestedUpcall/Simple/server_i.h
+++ b/TAO/tests/NestedUpcall/Simple/server_i.h
@@ -9,15 +9,15 @@ public:
             CORBA::ORB_ptr orb);
 
   void ping (CORBA::UShort time_to_live
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void start (client_ptr c,
               CORBA::UShort time_to_live
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_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));
 
 private:
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
index ed8c279cd01..a014035dc5e 100644
--- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -53,7 +53,7 @@ Client_Task::svc (void)
       // Now, we can invoke an operation on the remote side.
       this->server_->start (this->client_.in (),
                             call_count
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -130,7 +130,7 @@ main (int argc,
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc,
@@ -139,34 +139,34 @@ main (int argc,
         return result;
 
       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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (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;
 
       server_var server = server::_narrow (object.in ()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create an client object to hand to the other side...
       client_i client_servant (quiet,
                                server.in ());
 
-      client_var client_object = client_servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      client_var client_object = client_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Client_Task client_tasks (client_object.in (),
@@ -177,13 +177,13 @@ main (int argc,
 
       if (shutdown_server)
         {
-          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
index 67053270013..2b525bac4ea 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp
@@ -36,7 +36,7 @@ Initiator_i::~Initiator_i (void)
 }
 
 void
-Initiator_i::foo_object_B (TAO_ENV_SINGLE_ARG_DECL)
+Initiator_i::foo_object_B (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -45,7 +45,7 @@ Initiator_i::foo_object_B (TAO_ENV_SINGLE_ARG_DECL)
   ACE_TRY
     {
       this->object_B_var_->foo (this->object_A_var_.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Initiator_i::foo_object_B: Returned from call.\n"));
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
index ab5133bbb28..50f01bf658f 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h
@@ -35,7 +35,7 @@ public:
   virtual ~Initiator_i (void);
   // Destructor.
 
-  virtual void foo_object_B (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void foo_object_B (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
index ec7adc6c3f4..f113dd6e48a 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp
@@ -39,7 +39,7 @@ Object_A_i::~Object_A_i (void)
 
 void
 Object_A_i::foo (Initiator_ptr theInitiator_ptr
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -47,7 +47,7 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr
 
   ACE_TRY
     {
-      theInitiator_ptr->foo_object_B (TAO_ENV_SINGLE_ARG_PARAMETER);
+      theInitiator_ptr->foo_object_B (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       while (!this->finish_two_way_call_)
@@ -64,7 +64,7 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr
 }
 
 void
-Object_A_i::finish (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Object_A_i::finish (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
index 6831a81039b..83c771f5a6f 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h
@@ -35,10 +35,10 @@ public:
   // Destructor.
 
   virtual void foo (Initiator_ptr theInitiator_ptr
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void finish (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void finish (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   unsigned long finish_two_way_call_;
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
index 94654d06bd5..2373ce9b400 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
@@ -36,7 +36,7 @@ Object_B_i::~Object_B_i (void)
 
 void
 Object_B_i::foo (Object_A_ptr theObject_A_ptr
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -48,7 +48,7 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) BEGIN Object_B_i::foo: Trying to call Object A\n"));
 
-      theObject_A_ptr->finish (TAO_ENV_SINGLE_ARG_PARAMETER);
+      theObject_A_ptr->finish (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Start to wait on this variable, it is set to true
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
index d4468a9372c..c76b4d2ab80 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h
@@ -35,7 +35,7 @@ public:
   // Destructor.
 
   virtual void foo(Object_A_ptr theObject_A_ptr
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index 78bb62a8a1b..e4011a3a2e5 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -120,14 +120,14 @@ Initiator_Server::parse_args (void)
 int
 Initiator_Server::init (int argc,
                        char** argv
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
                                      "child_poa"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   this->argc_ = argc;
@@ -148,11 +148,11 @@ Initiator_Server::init (int argc,
 
       CORBA::Object_var object_A_obj_var =
         this->orb_manager_.orb()->string_to_object (this->object_A_key_
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->object_A_var_ =
-        Object_A::_narrow (object_A_obj_var.in() TAO_ENV_ARG_PARAMETER);
+        Object_A::_narrow (object_A_obj_var.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->object_A_var_.in ()))
@@ -170,11 +170,11 @@ Initiator_Server::init (int argc,
 
       CORBA::Object_var object_B_obj_var =
         this->orb_manager_.orb()->string_to_object (this->object_B_key_
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->object_B_var_ =
-        Object_B::_narrow (object_B_obj_var.in() TAO_ENV_ARG_PARAMETER);
+        Object_B::_narrow (object_B_obj_var.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->object_B_var_.in ()))
@@ -188,7 +188,7 @@ Initiator_Server::init (int argc,
                   this->object_A_key_));
       ACE_DEBUG ((LM_DEBUG, "Object B received OK\n"));
 
-      this->orb_manager_.activate_poa_manager (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->orb_manager_.activate_poa_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
@@ -210,7 +210,7 @@ Initiator_Server::init (int argc,
 
   this->str_ =
     this->orb_manager_.activate (this->initiator_i_ptr_
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
               this->str_.in ()));
@@ -221,7 +221,7 @@ Initiator_Server::init (int argc,
 
 
 int
-Initiator_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+Initiator_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -230,10 +230,10 @@ Initiator_Server::run (TAO_ENV_SINGLE_ARG_DECL)
                   "foo on Object A\n"));
 
       Initiator_var initiator =
-        this->initiator_i_ptr_->_this(TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->initiator_i_ptr_->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->object_A_var_->foo (initiator.in () TAO_ENV_ARG_PARAMETER);
+      this->object_A_var_->foo (initiator.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       ACE_DEBUG ((LM_DEBUG,
                   "Initiator_Server::run: Returned from invoke "
@@ -261,11 +261,11 @@ Initiator_Server::~Initiator_Server (void)
   if (this->object_B_key_ != 0)
     ACE_OS::free (this->object_B_key_);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       this->orb_manager_.deactivate (this->str_.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -285,18 +285,18 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Initiator Server \n \n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       int retval =
-        initiator_Server.init (argc, argv TAO_ENV_ARG_PARAMETER);
+        initiator_Server.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
         return 1;
       else
         {
-          initiator_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          initiator_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
index c67ca955c21..897729b0d41 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
@@ -52,10 +52,10 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the Initiator_Server state - parsing arguments and ...
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
index e43921d9291..1311c2ffb48 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
@@ -64,14 +64,14 @@ Object_A_Server::parse_args (void)
 int
 Object_A_Server::init (int argc,
                        char** argv
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
                                      "child_poa"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
   this->argc_ = argc;
@@ -83,7 +83,7 @@ Object_A_Server::init (int argc,
   CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("object_A",
                                                  &this->object_A_i_
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -104,9 +104,9 @@ Object_A_Server::init (int argc,
 
 
 int
-Object_A_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+Object_A_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  int r = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+  int r = this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (r == -1)
@@ -128,18 +128,18 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Object A Server \n \n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       int retval =
-        object_A_Server.init (argc,argv TAO_ENV_ARG_PARAMETER);
+        object_A_Server.init (argc,argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
         return 1;
       else
         {
-          object_A_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          object_A_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
index b2722bb822f..289a0e9970a 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
@@ -49,10 +49,10 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
index 5a692acab73..e9a59878311 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
@@ -64,14 +64,14 @@ Object_B_Server::parse_args (void)
 int
 Object_B_Server::init (int argc,
                        char** argv
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   // Call the init of TAO_ORB_Manager to create a child POA
   // under the root POA.
   this->orb_manager_.init_child_poa (argc,
                                      argv,
                                      "child_poa"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
   this->argc_ = argc;
@@ -83,7 +83,7 @@ Object_B_Server::init (int argc,
   CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("object_B",
                                                  &this->object_B_i_
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -103,9 +103,9 @@ Object_B_Server::init (int argc,
 
 
 int
-Object_B_Server::run (TAO_ENV_SINGLE_ARG_DECL)
+Object_B_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
+  if (this->orb_manager_.run (ACE_ENV_SINGLE_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Object_B_Server::run"),
                       -1);
@@ -124,17 +124,17 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Object B Server \n \n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int retval = object_B_Server.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      int retval = object_B_Server.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
         return 1;
       else
         {
-          object_B_Server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+          object_B_Server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
index 783eaa652a2..5e445e3d39e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
@@ -49,10 +49,10 @@ public:
 
   int init (int argc,
             char **argv
-            TAO_ENV_ARG_DECL);
+            ACE_ENV_ARG_DECL);
   // Initialize the NestedUpCalls_Server state - parsing arguments and ...
 
-  int run (TAO_ENV_SINGLE_ARG_DECL);
+  int run (ACE_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/tests/Nested_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp
index f10cf46ab27..ac198b31bd6 100644
--- a/TAO/tests/Nested_Event_Loop/client.cpp
+++ b/TAO/tests/Nested_Event_Loop/client.cpp
@@ -70,7 +70,7 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -79,7 +79,7 @@ main (int argc, char **argv)
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -89,48 +89,48 @@ main (int argc, char **argv)
 
       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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get an object reference from the argument string.
       object = orb->string_to_object (IOR
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a <server> reference.
       server_var server_object = server::_narrow (object.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       client_i servant (server_object.in ());
 
       servant.loop (event_loop_depth,
                     event_loop_iterations
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Shutdown server.
       if (shutdown_server)
         {
-          server_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp
index 869da38609d..134bd31f46a 100644
--- a/TAO/tests/Nested_Event_Loop/server.cpp
+++ b/TAO/tests/Nested_Event_Loop/server.cpp
@@ -44,21 +44,21 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_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 (poa_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;
 
       if (parse_args (argc, argv) != 0)
@@ -67,12 +67,12 @@ main (int argc, char *argv[])
       server_i servant (orb.in ());
 
       server_var server_object =
-        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (server_object.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -86,17 +86,17 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp
index 2f1fca6d3e6..e75585b0e46 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.cpp
+++ b/TAO/tests/Nested_Event_Loop/test_i.cpp
@@ -13,7 +13,7 @@ void
 server_i::loop (client_ptr remote_partner,
                 CORBA::ULong event_loop_depth,
                 CORBA::ULong event_loop_iterations
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -23,27 +23,27 @@ server_i::loop (client_ptr remote_partner,
 
   this->run_no_ops (remote_partner,
                     event_loop_iterations / 2
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (--event_loop_depth != 0)
     {
       remote_partner->loop (event_loop_depth,
                             event_loop_iterations
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   this->run_no_ops (remote_partner,
                     event_loop_iterations / 2
-                    TAO_ENV_ARG_PARAMETER);
+                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 server_i::run_no_ops (client_ptr remote_partner,
                       CORBA::ULong iterations
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   while (iterations != 0)
@@ -72,12 +72,12 @@ server_i::run_no_ops (client_ptr remote_partner,
 
       remote_partner->oneway_no_op (act_for_iterations,
                                     act_for_flag
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       while (!got_reply)
         {
-          this->orb_->perform_work (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -87,7 +87,7 @@ void
 server_i::no_op (client_ptr remote_partner,
                  const act &act_for_iterations,
                  const act &act_for_flag
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong *pointer_to_iterations = 0;
@@ -110,16 +110,16 @@ server_i::no_op (client_ptr remote_partner,
 
   *pointer_to_flag = 1;
 
-  remote_partner->twoway_no_op (TAO_ENV_SINGLE_ARG_PARAMETER);
+  remote_partner->twoway_no_op (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
 }
 
 client_i::client_i (server_ptr remote_partner)
@@ -130,7 +130,7 @@ client_i::client_i (server_ptr remote_partner)
 void
 client_i::loop (CORBA::ULong event_loop_depth,
                 CORBA::ULong event_loop_iterations
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -138,18 +138,18 @@ client_i::loop (CORBA::ULong event_loop_depth,
               event_loop_depth,
               event_loop_iterations));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       client_var self =
-        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->remote_partner_->loop (self.in (),
                                    event_loop_depth,
                                    event_loop_iterations
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -163,21 +163,21 @@ client_i::loop (CORBA::ULong event_loop_depth,
 void
 client_i::oneway_no_op (const act &act_for_iterations,
                         const act &act_for_flag
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       client_var self =
-        this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->remote_partner_->no_op (self.in (),
                                     act_for_iterations,
                                     act_for_flag
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -189,7 +189,7 @@ client_i::oneway_no_op (const act &act_for_iterations,
 }
 
 void
-client_i::twoway_no_op (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+client_i::twoway_no_op (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h
index 6a4f6afef7c..37d1b80f541 100644
--- a/TAO/tests/Nested_Event_Loop/test_i.h
+++ b/TAO/tests/Nested_Event_Loop/test_i.h
@@ -10,21 +10,21 @@ public:
   void loop (client_ptr remote_partner,
              CORBA::ULong event_loop_depth,
              CORBA::ULong event_loop_iterations
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void run_no_ops (client_ptr remote_partner,
                    CORBA::ULong iterations
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void no_op (client_ptr remote_partner,
               const act &act_for_iterations,
               const act &act_for_flag
-              TAO_ENV_ARG_DECL_NOT_USED)
+              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -38,15 +38,15 @@ public:
 
   void loop (CORBA::ULong event_loop_depth,
              CORBA::ULong event_loop_iterations
-             TAO_ENV_ARG_DECL_NOT_USED)
+             ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void oneway_no_op (const act &act_for_iterations,
                      const act &act_for_flag
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void twoway_no_op (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void twoway_no_op (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp
index a72282b7b70..93bdea4f54e 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.cpp
+++ b/TAO/tests/OBV/Any/AnyS_impl.cpp
@@ -13,7 +13,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb)
 CORBA::Any*
 Test_impl::get_something (
     CORBA::Boolean need_vb
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any_var ret_val;
@@ -47,8 +47,8 @@ Test_impl::get_something (
 }
 
 void
-Test_impl::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_impl::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);
 }
diff --git a/TAO/tests/OBV/Any/AnyS_impl.h b/TAO/tests/OBV/Any/AnyS_impl.h
index 1a22a2ae45c..d33df851ddc 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.h
+++ b/TAO/tests/OBV/Any/AnyS_impl.h
@@ -33,10 +33,10 @@ public:
 
   virtual CORBA::Any * get_something (
       CORBA::Boolean need_vb
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Any/client.cpp b/TAO/tests/OBV/Any/client.cpp
index e66581f45f7..d05b02b2331 100644
--- a/TAO/tests/OBV/Any/client.cpp
+++ b/TAO/tests/OBV/Any/client.cpp
@@ -42,45 +42,45 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test started.\n"));
 
       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;
 
-      // Create and register factories. 
-     
-      OBV_AnyTest::VA_init *va_factory = 0; 
-      ACE_NEW_RETURN (va_factory, 
+      // Create and register factories.
+
+      OBV_AnyTest::VA_init *va_factory = 0;
+      ACE_NEW_RETURN (va_factory,
                       OBV_AnyTest::VA_init,
                       1); // supplied by mapping
 
       orb->register_value_factory (va_factory->tao_repository_id (),
                                    va_factory
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       va_factory->_remove_ref (); // release ownership
 
 
-      OBV_AnyTest::VB_init *vb_factory = 0; 
-      ACE_NEW_RETURN (vb_factory, 
+      OBV_AnyTest::VB_init *vb_factory = 0;
+      ACE_NEW_RETURN (vb_factory,
                       OBV_AnyTest::VB_init,
                       1); // supplied by mapping
 
       orb->register_value_factory (vb_factory->tao_repository_id (),
                                    vb_factory
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       vb_factory->_remove_ref (); // release ownership
 
       // Obtain reference to the object
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       OBV_AnyTest::Test_var test =
-        OBV_AnyTest::Test::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        OBV_AnyTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (test.in ()))
@@ -93,7 +93,7 @@ main (int argc, char *argv[])
 
       // Do local test
 
-      OBV_AnyTest::VA_var va1, va2; 
+      OBV_AnyTest::VA_var va1, va2;
       ACE_NEW_RETURN (va1, OBV_OBV_AnyTest::VA, 1);
       ACE_NEW_RETURN (va2, OBV_OBV_AnyTest::VA, 1);
 
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
 
       // Test both copying and non-copying version of operator<<=
       a1 <<= va1.in ();
-      
+
       OBV_AnyTest::VA *pva = va2._retn();
       a2 <<= &pva;
 
@@ -114,29 +114,29 @@ main (int argc, char *argv[])
 
       if (!(a1 >>= dst) || dst->id () != magic)
         {
-          ACE_ERROR_RETURN ((LM_DEBUG, 
+          ACE_ERROR_RETURN ((LM_DEBUG,
                              "(%P|%t) client - test failed.\n"),
                             1);
         }
 
       if (!(a2 >>= dst) || dst->id () != magic)
         {
-          ACE_ERROR_RETURN ((LM_DEBUG, 
+          ACE_ERROR_RETURN ((LM_DEBUG,
                              "(%P|%t) client - test failed.\n"),
                             1);
         }
 
       // Now do remote test
-      
+
       // STEP 1.
       CORBA::Any_var result = test->get_something (
           0
-          TAO_ENV_ARG_PARAMETER);
+          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!(*result >>= dst) || dst->id () != magic)
         {
-          ACE_ERROR_RETURN ((LM_DEBUG, 
+          ACE_ERROR_RETURN ((LM_DEBUG,
                              "(%P|%t) client - test failed.\n"),
                             1);
         }
@@ -145,20 +145,20 @@ main (int argc, char *argv[])
       OBV_AnyTest::VB* dst_vb = 0;
       result = test->get_something (
           1
-          TAO_ENV_ARG_PARAMETER);
+          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!(*result >>= dst_vb) || dst_vb->id () != magic)
         {
-          ACE_ERROR_RETURN ((LM_DEBUG, 
+          ACE_ERROR_RETURN ((LM_DEBUG,
                              "(%P|%t) client - test failed.\n"),
                             1);
         }
 
-      test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test->shutdown (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_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished.\n"));
diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp
index 43e37869510..7b8ac3453bb 100644
--- a/TAO/tests/OBV/Any/server.cpp
+++ b/TAO/tests/OBV/Any/server.cpp
@@ -39,15 +39,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -70,11 +70,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       OBV_AnyTest::Test_var test =
-        test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -87,20 +87,20 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop started.\n"));
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished.\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
index c317f605e8b..49bd2e9401b 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp
@@ -12,7 +12,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb)
 }
 
 OBV_FactoryTest::BaseValue *
-Test_impl::get_base_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   OBV_FactoryTest::BaseValue* ret_val = 0;
@@ -24,7 +24,7 @@ Test_impl::get_base_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 OBV_FactoryTest::Value1 *
-Test_impl::get_value1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   OBV_FactoryTest::Value1* ret_val = 0;
@@ -36,7 +36,7 @@ Test_impl::get_value1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 OBV_FactoryTest::Value2 *
-Test_impl::get_value2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_impl::get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   OBV_FactoryTest::Value2* ret_val = 0;
@@ -48,8 +48,8 @@ Test_impl::get_value2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Test_impl::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_impl::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);
 }
diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.h b/TAO/tests/OBV/Factory/FactoryS_impl.h
index 00c41b901d3..8a1e97a6a5a 100644
--- a/TAO/tests/OBV/Factory/FactoryS_impl.h
+++ b/TAO/tests/OBV/Factory/FactoryS_impl.h
@@ -31,16 +31,16 @@ public:
   Test_impl (CORBA::ORB_ptr orb);
   // ctor
 
-  virtual OBV_FactoryTest::BaseValue * get_base_value (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual OBV_FactoryTest::BaseValue * get_base_value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual OBV_FactoryTest::Value1 * get_value1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual OBV_FactoryTest::Value1 * get_value1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual OBV_FactoryTest::Value2 * get_value2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual OBV_FactoryTest::Value2 * get_value2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index 2d73e319292..1ccfce1b4a2 100644
--- a/TAO/tests/OBV/Factory/client.cpp
+++ b/TAO/tests/OBV/Factory/client.cpp
@@ -40,59 +40,59 @@ 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;
 
-      // Create factories. 
-     
-      OBV_FactoryTest::BaseValue_init *base_factory = 0; 
-      ACE_NEW_RETURN (base_factory, 
+      // Create factories.
+
+      OBV_FactoryTest::BaseValue_init *base_factory = 0;
+      ACE_NEW_RETURN (base_factory,
                       OBV_FactoryTest::BaseValue_init,
                       1); // supplied by mapping
 
       orb->register_value_factory (base_factory->tao_repository_id (),
-                                   base_factory 
-                                   TAO_ENV_ARG_PARAMETER);
+                                   base_factory
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       base_factory->_remove_ref (); // release ownership
 
 
 
       OBV_FactoryTest::Value1_init *value1_factory = 0;
-      ACE_NEW_RETURN (value1_factory, 
+      ACE_NEW_RETURN (value1_factory,
                       OBV_FactoryTest::Value1_init,
                       1); // supplied by mapping
 
       orb->register_value_factory (value1_factory->tao_repository_id (),
                                    value1_factory
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       value1_factory->_remove_ref ();
-      
+
 
 
       OBV_FactoryTest::Value2_init *value2_factory = 0;
-      ACE_NEW_RETURN (value2_factory, 
+      ACE_NEW_RETURN (value2_factory,
                       Value2_init_impl,
                       1); // custom implementation
 
       orb->register_value_factory (value2_factory->tao_repository_id (),
-                                   value2_factory 
-                                   TAO_ENV_ARG_PARAMETER);
+                                   value2_factory
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       value2_factory->_remove_ref ();
 
 
       // Obtain reference to the object
       CORBA::Object_var tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       OBV_FactoryTest::Test_var test =
-        OBV_FactoryTest::Test::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        OBV_FactoryTest::Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (test.in ()))
@@ -103,22 +103,22 @@ main (int argc, char *argv[])
                           1);
       }
 
-      // Now perform the test. I don't check return values. 
+      // Now perform the test. I don't check return values.
       // I just hope to get MARSHAL.
-      OBV_FactoryTest::BaseValue_var base_value = 
-        test->get_base_value (TAO_ENV_SINGLE_ARG_PARAMETER);
+      OBV_FactoryTest::BaseValue_var base_value =
+        test->get_base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      OBV_FactoryTest::Value1_var value1 = 
-        test->get_value1 (TAO_ENV_SINGLE_ARG_PARAMETER);
+      OBV_FactoryTest::Value1_var value1 =
+        test->get_value1 (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      OBV_FactoryTest::Value2_var value2 = 
-        test->get_value2 (TAO_ENV_SINGLE_ARG_PARAMETER);
+      OBV_FactoryTest::Value2_var value2 =
+        test->get_value2 (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Test factories.
-      
+
       value2 = value2_factory->create_default (1);
 
       OBV_FactoryTest::BaseValue::BV_Data data;
@@ -128,10 +128,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
 
-      test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test->shutdown (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/OBV/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp
index 00b6d8d8eb2..af5c6e5ce19 100644
--- a/TAO/tests/OBV/Factory/server.cpp
+++ b/TAO/tests/OBV/Factory/server.cpp
@@ -39,15 +39,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -70,11 +70,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
       OBV_FactoryTest::Test_var test =
-        test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -87,18 +87,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp
index 207f1cbce9a..bfc72998512 100644
--- a/TAO/tests/OBV/Forward/Test_impl.cpp
+++ b/TAO/tests/OBV/Forward/Test_impl.cpp
@@ -31,7 +31,7 @@ reflect_node (BaseNode_ptr bn)
 
 TreeController *
 Test_impl::reflect (TreeController * tc
-                    TAO_ENV_ARG_DECL_NOT_USED)
+                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (tc != 0)
@@ -43,8 +43,8 @@ Test_impl::reflect (TreeController * tc
 }
 
 void
-Test_impl::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Test_impl::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);
 }
diff --git a/TAO/tests/OBV/Forward/Test_impl.h b/TAO/tests/OBV/Forward/Test_impl.h
index 50b172bdf4f..745f255ad87 100644
--- a/TAO/tests/OBV/Forward/Test_impl.h
+++ b/TAO/tests/OBV/Forward/Test_impl.h
@@ -33,10 +33,10 @@ public:
 
   virtual TreeController * reflect (
       TreeController * tc
-      TAO_ENV_ARG_DECL_NOT_USED)
+      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index cb4860dae7c..b71178be956 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -37,7 +37,7 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-void 
+void
 dump_node (BaseNode_ptr bn, int indent)
 {
   if (bn == 0) return;
@@ -51,29 +51,29 @@ dump_node (BaseNode_ptr bn, int indent)
   {
     ACE_DEBUG ((LM_DEBUG, "%x <StringNode> %s\n",
                bn,
-               sn->name ())); 
+               sn->name ()));
   }
   else
   {
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
                 "%x <BaseNode> \n",
-                bn)); 
+                bn));
   }
 
   dump_node (bn->left (), indent + 1);
   dump_node (bn->right (), indent + 1);
 }
 
-void 
+void
 dump_tree (TreeController_ptr tc)
 {
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) start tree dump <%x>\n",
               tc));
 
   dump_node (tc->root (), 1);
 
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) end tree dump <%x>\n",
               tc));
 }
@@ -85,7 +85,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;
 
       if (parse_args (argc, argv) != 0)
@@ -95,38 +95,38 @@ main (int argc, char *argv[])
       // compiler so we just to put everything in a right order.
 
       // Create and register factory for BaseNode.
-      BaseNode_init *bn_factory = 0; 
-      ACE_NEW_RETURN (bn_factory, 
+      BaseNode_init *bn_factory = 0;
+      ACE_NEW_RETURN (bn_factory,
                       BaseNode_init,
                       1);
 
       orb->register_value_factory (bn_factory->tao_repository_id (),
-                                   bn_factory 
-                                   TAO_ENV_ARG_PARAMETER);
+                                   bn_factory
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       bn_factory->_remove_ref (); // release ownership
 
       // Create and register factory for TreeController.
-      TreeController_init *tc_factory = 0; 
-      ACE_NEW_RETURN (tc_factory, 
+      TreeController_init *tc_factory = 0;
+      ACE_NEW_RETURN (tc_factory,
                       TreeController_init,
                       1);
 
       orb->register_value_factory (tc_factory->tao_repository_id (),
-                                   tc_factory 
-                                   TAO_ENV_ARG_PARAMETER);
+                                   tc_factory
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       tc_factory->_remove_ref (); // release ownership
 
       // Create and register factory for StringNode.
-      StringNode_init *sn_factory = 0; 
-      ACE_NEW_RETURN (sn_factory, 
+      StringNode_init *sn_factory = 0;
+      ACE_NEW_RETURN (sn_factory,
                       StringNode_init,
                       1);
 
       orb->register_value_factory (sn_factory->tao_repository_id (),
-                                   sn_factory 
-                                   TAO_ENV_ARG_PARAMETER);
+                                   sn_factory
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       sn_factory->_remove_ref (); // release ownership
 
@@ -134,10 +134,10 @@ main (int argc, char *argv[])
 
       // Obtain reference to the object.
       CORBA::Object_var tmp =
-        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(tmp.in () TAO_ENV_ARG_PARAMETER);
+      Test_var test = Test::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (test.in ()))
@@ -149,16 +149,16 @@ main (int argc, char *argv[])
       }
 
       // Now build simple graph (tree in our case).
-      
+
       TreeController_var tc;
-      ACE_NEW_RETURN (tc, 
+      ACE_NEW_RETURN (tc,
                       OBV_TreeController,
                       1);
 
       // Create the root node.
       {
         StringNode_var sn;
-        ACE_NEW_RETURN (sn, 
+        ACE_NEW_RETURN (sn,
                         OBV_StringNode,
                         1);
         sn->name ((const char*)("RootNode"));
@@ -167,17 +167,17 @@ main (int argc, char *argv[])
         // Create the left leaf.
         {
           StringNode_var dummy;
-          ACE_NEW_RETURN (dummy, 
+          ACE_NEW_RETURN (dummy,
                           OBV_StringNode,
                           1);
           dummy->name ((const char*)("LeftNode"));
-          sn->left (dummy);          
+          sn->left (dummy);
         }
 
         // Create the right leaf.
         {
           StringNode_var dummy;
-          ACE_NEW_RETURN (dummy, 
+          ACE_NEW_RETURN (dummy,
                           OBV_StringNode,
                           1);
           dummy->name ((const char*)("RightNode"));
@@ -186,23 +186,23 @@ main (int argc, char *argv[])
           // dummy->right (sn); // ;-)
         }
       }
-      
+
       // Dump the tree.
       dump_tree (tc.in ());
 
-      TreeController_var result_tc = 
-        test->reflect (tc.in () TAO_ENV_ARG_PARAMETER);
+      TreeController_var result_tc =
+        test->reflect (tc.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Dump the resulting tree.
       dump_tree (result_tc.in ());
 
-      test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp
index afd06f22f66..f1935936260 100644
--- a/TAO/tests/OBV/Forward/server.cpp
+++ b/TAO/tests/OBV/Forward/server.cpp
@@ -43,56 +43,56 @@ 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;
 
       // All factories are kindly provided by
       // compiler so we just to put everything in a right order.
 
       // Create and register factory for BaseNode.
-      BaseNode_init *bn_factory = 0; 
-      ACE_NEW_RETURN (bn_factory, 
+      BaseNode_init *bn_factory = 0;
+      ACE_NEW_RETURN (bn_factory,
                       BaseNode_init,
                       1);
 
       orb->register_value_factory (bn_factory->tao_repository_id (),
                                    bn_factory
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       bn_factory->_remove_ref (); // release ownership
 
       // Create and register factory for TreeController.
-      TreeController_init *tc_factory = 0; 
-      ACE_NEW_RETURN (tc_factory, 
+      TreeController_init *tc_factory = 0;
+      ACE_NEW_RETURN (tc_factory,
                       TreeController_init,
                       1);
 
       orb->register_value_factory (tc_factory->tao_repository_id (),
-                                   tc_factory 
-                                   TAO_ENV_ARG_PARAMETER);
+                                   tc_factory
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       tc_factory->_remove_ref (); // release ownership
 
       // Create and register factory for StringNode.
-      StringNode_init *sn_factory = 0; 
-      ACE_NEW_RETURN (sn_factory, 
+      StringNode_init *sn_factory = 0;
+      ACE_NEW_RETURN (sn_factory,
                       StringNode_init,
                       1);
 
       orb->register_value_factory (sn_factory->tao_repository_id (),
-                                   sn_factory 
-                                   TAO_ENV_ARG_PARAMETER);
+                                   sn_factory
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       sn_factory->_remove_ref (); // release ownership
 
       //Well, done with factories.
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -101,7 +101,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -114,11 +114,11 @@ main (int argc, char *argv[])
 
       PortableServer::ServantBase_var owner_transfer(test_impl);
 
-      Test_var test = test_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Test_var test = test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (test.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -131,18 +131,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp
index 40cfa51f3b0..193375498ab 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.cpp
+++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp
@@ -28,39 +28,39 @@ test_with_regular_poa_manager (int argc,
                                int destroy_orb,
                                int destroy_poa)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, orb_name TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (destroy_poa)
         {
-          root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+          root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       if (destroy_orb)
         {
-          orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -83,42 +83,42 @@ test_with_funky_poa_manager (int argc,
                              int destroy_poa,
                              int funky_poa_manager)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, orb_name TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (funky_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;
 
-          poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+          poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       if (destroy_poa)
         {
-          root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+          root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       if (destroy_orb)
         {
-          orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/ORB_init/ORB_init.cpp b/TAO/tests/ORB_init/ORB_init.cpp
index 77814057eb1..7ffb4d68189 100644
--- a/TAO/tests/ORB_init/ORB_init.cpp
+++ b/TAO/tests/ORB_init/ORB_init.cpp
@@ -17,7 +17,7 @@ main (int argc, char *argv[])
 {
   CORBA::ORB_var orb;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       const char orbid[] = "mighty_orb";
@@ -25,7 +25,7 @@ main (int argc, char *argv[])
       CORBA::ORB_ptr my_orb = CORBA::ORB::_nil();
 
       {
-        CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         my_orb = orb.in ();
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
       // used in that scope.
       // -------------------------------------------------------------
 
-      orb = CORBA::ORB_init (argc, argv, orbid TAO_ENV_ARG_PARAMETER);
+      orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This isn't portable, but TAO implements an ORB_ptr as a
@@ -77,10 +77,10 @@ main (int argc, char *argv[])
       // attempt to initialize a new ORB with the same ORBid.
       // -------------------------------------------------------------
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb = CORBA::ORB_init (argc, argv, orbid TAO_ENV_ARG_PARAMETER);
+      orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This isn't portable, but TAO implements an ORB_ptr as a
@@ -116,7 +116,7 @@ main (int argc, char *argv[])
       // -------------------------------------------------------------
 
       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;
 
       // -------------------------------------------------------------
@@ -125,11 +125,11 @@ main (int argc, char *argv[])
       // clean-up.
       // -------------------------------------------------------------
       CORBA::ORB_var orb2 =
-        CORBA::ORB_init (argc, argv, "ORB number 2" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "ORB number 2" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb3 =
-        CORBA::ORB_init (argc, argv, "ORB number 3" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "ORB number 3" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // -------------------------------------------------------------
@@ -139,11 +139,11 @@ main (int argc, char *argv[])
       // ORB itself break when the last ORB is released.
       // -------------------------------------------------------------
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If we get here, then something went wrong.  A
diff --git a/TAO/tests/ORB_init/Portspan/server.cpp b/TAO/tests/ORB_init/Portspan/server.cpp
index 1c3be70c827..e93543879ed 100644
--- a/TAO/tests/ORB_init/Portspan/server.cpp
+++ b/TAO/tests/ORB_init/Portspan/server.cpp
@@ -9,30 +9,30 @@ main( int argc, char *argv[] )
     {
 
       CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj = orb->resolve_initial_references("RootPOA"
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa = PortableServer::POA::_narrow(obj.in()
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      PortableServer::POAManager_var man = poa->the_POAManager(TAO_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::POAManager_var man = poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      man->activate(TAO_ENV_SINGLE_ARG_PARAMETER);
+      man->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       simple_i simp;
 
       PortableServer::ObjectId_var objId = poa->activate_object(&simp
-                                                                TAO_ENV_ARG_PARAMETER);
+                                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run(TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
 
diff --git a/TAO/tests/ORB_init/Portspan/simpleI.cpp b/TAO/tests/ORB_init/Portspan/simpleI.cpp
index 6e7d6a4dd69..6a7620307a6 100644
--- a/TAO/tests/ORB_init/Portspan/simpleI.cpp
+++ b/TAO/tests/ORB_init/Portspan/simpleI.cpp
@@ -32,7 +32,7 @@ simple_i::~simple_i (void)
   }
 
 void simple_i::test (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/tests/ORB_init/Portspan/simpleI.h b/TAO/tests/ORB_init/Portspan/simpleI.h
index 6cf337231f1..23faf5eb717 100644
--- a/TAO/tests/ORB_init/Portspan/simpleI.h
+++ b/TAO/tests/ORB_init/Portspan/simpleI.h
@@ -39,7 +39,7 @@ public:
   virtual ~simple_i (void);
 
 virtual void test (
-    TAO_ENV_SINGLE_ARG_DECL
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
index 9efa44bb399..0cf6b2ee705 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
@@ -15,14 +15,14 @@ ORT_test_IORInterceptor::ORT_test_IORInterceptor ()
 }
 
 char *
-ORT_test_IORInterceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ORT_test_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ORT_IORInterceptor");
 }
 
 void
-ORT_test_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ORT_test_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -30,11 +30,11 @@ ORT_test_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 ORT_test_IORInterceptor::establish_components (
     PortableInterceptor::IORInfo_ptr /* info */
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++this->establish_count_;
-  
+
   ACE_DEBUG ((LM_DEBUG,
               "Establish_Components is invoked %d times till now\n",
               this->establish_count_));
@@ -46,7 +46,7 @@ components_established (PortableInterceptor::IORInfo_ptr /* ior_info */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ++this->components_establish_count_;
-  
+
   ACE_DEBUG ((LM_DEBUG,
               "Components Established is invoked %d times till now\n",
               this->establish_count_));
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h
index fd945e7ab04..cbfd83f23c9 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.h
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h
@@ -36,42 +36,42 @@ class ORT_test_IORInterceptor :
    */
   //@{
   /// Return the name of this IORInterceptor.
-  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));
 
   /// Cleanup resources acquired by this IORInterceptor.
-  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));
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
       PortableInterceptor::IORInfo_ptr info
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void components_established (
       PortableInterceptor::IORInfo_ptr info
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
       PortableInterceptor::AdapterManagerId id,
       PortableInterceptor::AdapterState state
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
       PortableInterceptor::AdapterState state
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
      ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
 
  private:
-  
+
   CORBA::Long establish_count_;
-  
+
   CORBA::Long components_establish_count_;
 };
 
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.cpp
index 9ca7443b52c..bdc039aa6e2 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.cpp
@@ -11,7 +11,7 @@ ACE_RCSID (ORT,
 void
 ORT_test_IORInterceptor_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -19,7 +19,7 @@ ORT_test_IORInterceptor_ORBInitializer::pre_init (
 void
 ORT_test_IORInterceptor_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::IORInterceptor_ptr ort_test_interceptor;
@@ -36,7 +36,7 @@ ORT_test_IORInterceptor_ORBInitializer::post_init (
     ort_test_interceptor;
 
   info->add_ior_interceptor (ior_interceptor.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.h b/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.h
index 347170309a3..2920818bce1 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.h
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor_ORBInitializer.h
@@ -28,12 +28,12 @@ class ORT_test_IORInterceptor_ORBInitializer
   //@{
   /// The pre-initialization hook.
   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));
 
   /// The post-initialization hook.
   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/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp
index bd8aff07e3e..d8a676db4e7 100644
--- a/TAO/tests/ORT/ORT_test_i.cpp
+++ b/TAO/tests/ORT/ORT_test_i.cpp
@@ -11,7 +11,7 @@ ORT_test_i::ORT_test_i ()
 }
 
 CORBA::Boolean
-ORT_test_i::request_server (TAO_ENV_SINGLE_ARG_DECL)
+ORT_test_i::request_server (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
diff --git a/TAO/tests/ORT/ORT_test_i.h b/TAO/tests/ORT/ORT_test_i.h
index 9b8dc6f2c4a..572bb62fb06 100644
--- a/TAO/tests/ORT/ORT_test_i.h
+++ b/TAO/tests/ORT/ORT_test_i.h
@@ -25,7 +25,7 @@ class ORT_test_i : public virtual POA_ObjectReferenceTemplate::ORT_test
   /// Constructor
   ORT_test_i ();
 
-  CORBA::Boolean request_server (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::Boolean request_server (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/tests/ORT/client.cpp b/TAO/tests/ORT/client.cpp
index 6dbb98ce4d1..64c4dbab2ae 100644
--- a/TAO/tests/ORT/client.cpp
+++ b/TAO/tests/ORT/client.cpp
@@ -40,19 +40,19 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "client_sum_orb" TAO_ENV_ARG_DECL);
+        CORBA::ORB_init (argc, argv, "client_sum_orb" ACE_ENV_ARG_DECL);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior TAO_ENV_ARG_DECL);
+        orb->string_to_object (ior ACE_ENV_ARG_DECL);
       ACE_TRY_CHECK;
 
       ObjectReferenceTemplate::ORT_test_var server =
         ObjectReferenceTemplate::ORT_test::_narrow (obj.in ()
-                                                    TAO_ENV_ARG_DECL);
+                                                    ACE_ENV_ARG_DECL);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -68,7 +68,7 @@ main (int argc, char *argv[])
       //    No need initialize twice.
       CORBA::Boolean result = 1;
 
-      result = server->request_server (TAO_ENV_SINGLE_ARG_DECL);
+      result = server->request_server (ACE_ENV_SINGLE_ARG_DECL);
       ACE_TRY_CHECK;
 
       if (result == 0)
diff --git a/TAO/tests/ORT/server.cpp b/TAO/tests/ORT/server.cpp
index a949f34dc79..4e66588b2de 100644
--- a/TAO/tests/ORT/server.cpp
+++ b/TAO/tests/ORT/server.cpp
@@ -53,7 +53,7 @@ int main (int argc, char *argv[])
         orb_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer_var.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
@@ -62,7 +62,7 @@ int main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             ""
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -70,13 +70,13 @@ int main (int argc, char *argv[])
 
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check for nil references
@@ -87,18 +87,18 @@ int main (int argc, char *argv[])
 
       // Get poa_manager reference
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (TAO_ENV_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // Activate it.
-      poa_manager->activate (TAO_ENV_ARG_PARAMETER);
+      /// Activate it.
+      poa_manager->activate (ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //@}
 
       // First lets check if the new -ORBId, -ORBServerId options are
       // working correctly.
-      // @@ Priyanka, use "orb->id (TAO_ENV_SINGLE_ARG_PARAMETER)"
+      // @@ Priyanka, use "orb->id (ACE_ENV_SINGLE_ARG_PARAMETER)"
       //    here.  It is standard and portable.  Don't forget the
       //    ACE_TRY_CHECK.
       // @@ On second thought.  The ORB_init test already tests the
@@ -130,40 +130,40 @@ int main (int argc, char *argv[])
         root_poa->create_POA ("FIRST_POA",
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var second_poa =
         root_poa->create_POA ("SECOND_POA",
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var third_poa =
         first_poa->create_POA ("THIRD_POA",
-                               poa_manager.in (),
-                               policies
-                               TAO_ENV_ARG_PARAMETER);
+                              poa_manager.in (),
+                              policies
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var fourth_poa =
         second_poa->create_POA ("FOURTH_POA",
                                 poa_manager.in (),
                                 policies
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ORT_test_i ort_test_impl;
 
-      // Activate
-      obj = ort_test_impl._this (TAO_ENV_ARG_PARAMETER);
+      /// Activate
+      obj = ort_test_impl._this (ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow it down.
       ObjectReferenceTemplate::ORT_test_var ort_test =
         ObjectReferenceTemplate::ORT_test::_narrow (obj.in ()
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check for nil reference
@@ -176,7 +176,7 @@ int main (int argc, char *argv[])
 
       // Convert the object reference to a string format.
       CORBA::String_var ior =
-        orb->object_to_string (ort_test.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (ort_test.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the IOR to it.
@@ -193,7 +193,7 @@ int main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (TAO_ENV_ARG_PARAMETER);
+      orb->run (ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp
index 8c2f2c62553..792ccb496a4 100644
--- a/TAO/tests/Object_Loader/Loader.cpp
+++ b/TAO/tests/Object_Loader/Loader.cpp
@@ -17,24 +17,24 @@ CORBA::Object_ptr
 Loader::create_object (CORBA::ORB_ptr orb,
                        int,
                        char * []
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var mgr =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      mgr->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i *test;
@@ -42,7 +42,7 @@ Loader::create_object (CORBA::ORB_ptr orb,
                       CORBA::Object::_nil ());
 
       PortableServer::ServantBase_var tmp = test;
-      obj = test->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      obj = test->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return obj._retn ();
diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h
index 7dbcbed351d..7451744993f 100644
--- a/TAO/tests/Object_Loader/Loader.h
+++ b/TAO/tests/Object_Loader/Loader.h
@@ -33,7 +33,7 @@ public:
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            char *argv []
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Create a new instance
 };
diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp
index 2bdf3980984..af7f919ab6c 100644
--- a/TAO/tests/Object_Loader/Test_i.cpp
+++ b/TAO/tests/Object_Loader/Test_i.cpp
@@ -18,28 +18,28 @@ Test_i::Test_i (PortableServer::POA_ptr poa)
 }
 
 CORBA::Long
-Test_i::instance_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_i::instance_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Test_i::instance_count_;
 }
 
 void
-Test_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Test_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_var poa =
-    this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (oid.in () 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)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h
index 4c9a9ad70d3..83adb188234 100644
--- a/TAO/tests/Object_Loader/Test_i.h
+++ b/TAO/tests/Object_Loader/Test_i.h
@@ -37,13 +37,13 @@ public:
   Test_i (PortableServer::POA_ptr poa);
   // ctor
 
-  CORBA::Long instance_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Long instance_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp
index 5cf0f232ce8..2d2ee3842a0 100644
--- a/TAO/tests/Object_Loader/driver.cpp
+++ b/TAO/tests/Object_Loader/driver.cpp
@@ -22,20 +22,20 @@ main (int, char *[])
 
               int argc = 0;
               CORBA::ORB_var orb =
-                CORBA::ORB_init (argc, 0, buf TAO_ENV_ARG_PARAMETER);
+                CORBA::ORB_init (argc, 0, buf ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::Object_var object =
                 orb->string_to_object ("DLL:Test_Object"
-                                       TAO_ENV_ARG_PARAMETER);
+                                       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;
 
               CORBA::Long count =
-                test->instance_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+                test->instance_count (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (count != norbs*i + j + 1)
@@ -45,7 +45,7 @@ main (int, char *[])
                               "(%d != %d)\n",
                               count, norbs * i + j + 1));
                 }
-              test->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+              test->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -57,22 +57,22 @@ main (int, char *[])
 
           int argc = 0;
           CORBA::ORB_var orb =
-            CORBA::ORB_init (argc, 0, buf TAO_ENV_ARG_PARAMETER);
+            CORBA::ORB_init (argc, 0, buf ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Object_var obj =
             orb->resolve_initial_references ("RootPOA"
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           PortableServer::POA_var poa =
-            PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+            PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+          poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp
index 6ab217974cb..28ad3472bef 100644
--- a/TAO/tests/Objref_Sequence_Test/client.cpp
+++ b/TAO/tests/Objref_Sequence_Test/client.cpp
@@ -34,7 +34,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv [])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
 
 
@@ -44,7 +44,7 @@ main (int argc, char *argv [])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) == -1)
@@ -53,11 +53,11 @@ main (int argc, char *argv [])
       // Connect to the server
       CORBA::Object_var tmp =
         orb->string_to_object(ior
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_var server = Server::_narrow (tmp.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create object instances
@@ -83,7 +83,7 @@ main (int argc, char *argv [])
 
           server->CreateExtra (iAddSize,
                                vAddition.out ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
@@ -113,12 +113,12 @@ main (int argc, char *argv [])
                   "(%P|%t) Call delete on the server \n"));
 
       server->DeleteExtra (vServers.in ()
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Calling shutdown \n"));
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp
index e4899d1bd61..a8654295711 100644
--- a/TAO/tests/Objref_Sequence_Test/server.cpp
+++ b/TAO/tests/Objref_Sequence_Test/server.cpp
@@ -13,14 +13,14 @@ public:
 
   void CreateExtra (CORBA::ULong length,
                     ServerSequence_out seq
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void DeleteExtra (const ServerSequence &seq
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_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));
 
 private:
@@ -43,7 +43,7 @@ ServerServant::ServerServant (PortableServer::POA_ptr poa,
 void
 ServerServant::CreateExtra (CORBA::ULong len,
                             ServerSequence_out seq
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -79,7 +79,7 @@ ServerServant::CreateExtra (CORBA::ULong len,
 
 void
 ServerServant::DeleteExtra (const ServerSequence &seq
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -108,10 +108,10 @@ ServerServant::DeleteExtra (const ServerSequence &seq
 }
 
 void
-ServerServant::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+ServerServant::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);
 }
 
 /******************************************************/
@@ -147,7 +147,7 @@ int
 main (int argc, char *argv [])
 
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   if (parse_args (argc, argv) == -1)
     return -1;
@@ -159,17 +159,17 @@ main (int argc, char *argv [])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var vRootPOABase =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (vRootPOABase.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -178,7 +178,7 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POAManager_ptr pRootPOAManager =
-        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate the server
@@ -192,13 +192,13 @@ main (int argc, char *argv [])
       PortableServer::ServantBase_var owner_transfer(servant);
 
       Server_var server =
-        servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Announce the server
       CORBA::String_var obj_ref =
         orb->object_to_string (server.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
@@ -211,18 +211,18 @@ main (int argc, char *argv [])
       ACE_OS::fprintf (output_file, "%s", obj_ref.in ());
       ACE_OS::fclose (output_file);
 
-      pRootPOAManager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      pRootPOAManager->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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp
index ed40d39c960..bbf7b834f51 100644
--- a/TAO/tests/OctetSeq/OctetSeq.cpp
+++ b/TAO/tests/OctetSeq/OctetSeq.cpp
@@ -161,13 +161,13 @@ run (char* buf, size_t bufsize,
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int n = 64;
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp
index 0af72bbd4ae..e01eefd717f 100644
--- a/TAO/tests/OctetSeq/client.cpp
+++ b/TAO/tests/OctetSeq/client.cpp
@@ -57,18 +57,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->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Database_var server =
-        Test::Database::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test::Database::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -113,7 +113,7 @@ main (int argc, char *argv[])
                                elements[j],
                                token,
                                returned_token
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   if (token != returned_token)
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
             }
 
           CORBA::ULong crc_remote =
-            server->get_crc (idx TAO_ENV_ARG_PARAMETER);
+            server->get_crc (idx ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ULong crc_local =
@@ -149,10 +149,10 @@ main (int argc, char *argv[])
 
         }
 
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (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/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp
index 8dfbfe81e03..905f1963676 100644
--- a/TAO/tests/OctetSeq/server.cpp
+++ b/TAO/tests/OctetSeq/server.cpp
@@ -38,11 +38,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -66,11 +66,11 @@ main (int argc, char *argv[])
                                 128); // @@ TODO
 
         Test::Database_var server =
-          server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         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", ior.in ()));
@@ -88,19 +88,19 @@ main (int argc, char *argv[])
             ACE_OS::fclose (output_file);
           }
 
-        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, "event loop finished\n"));
 
-        root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+        root_poa->destroy (1, 1 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/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp
index 29614b938e3..c02f16a8fdf 100644
--- a/TAO/tests/OctetSeq/test_i.cpp
+++ b/TAO/tests/OctetSeq/test_i.cpp
@@ -18,7 +18,7 @@ Database_i::set (Test::Index i,
                  const Test::OctetSeq& seq,
                  CORBA::Double verification_token,
                  CORBA::Double_out returned_token
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((Test::OutOfRange))
 {
   if (i >= this->max_range_)
@@ -45,7 +45,7 @@ Database_i::set (Test::Index i,
 
 Test::OctetSeq*
 Database_i::get (Test::Index i
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange))
 {
   if (i >= this->max_range_)
@@ -61,7 +61,7 @@ Database_i::get (Test::Index i
 
 CORBA::ULong
 Database_i::get_crc (Test::Index i
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange))
 {
   if (i >= this->max_range_)
@@ -73,7 +73,7 @@ Database_i::get_crc (Test::Index i
 }
 
 void
-Database_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Database_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h
index 08843c32828..ade6a84e861 100644
--- a/TAO/tests/OctetSeq/test_i.h
+++ b/TAO/tests/OctetSeq/test_i.h
@@ -36,18 +36,18 @@ public:
             const Test::OctetSeq& seq,
             CORBA::Double verification_token,
             CORBA::Double_out returned_token
-            TAO_ENV_ARG_DECL_NOT_USED)
+            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((Test::OutOfRange));
 
   Test::OctetSeq* get (Test::Index i
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange));
 
   CORBA::ULong get_crc (Test::Index i
-                        TAO_ENV_ARG_DECL_NOT_USED)
+                        ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
index f12cbec55dd..9942c6020d6 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp
@@ -14,28 +14,28 @@ Oneway_Buffering::Oneway_Buffering (CORBA::ORB_ptr orb,
 
 void
 Oneway_Buffering::receive_data (const Test::Payload &the_payload
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->admin_->request_received (the_payload.length () TAO_ENV_ARG_PARAMETER);
+  this->admin_->request_received (the_payload.length () ACE_ENV_ARG_PARAMETER);
 }
 
 void
-Oneway_Buffering::flush (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Oneway_Buffering::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Oneway_Buffering::sync (TAO_ENV_SINGLE_ARG_DECL)
+Oneway_Buffering::sync (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->admin_->flush (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->admin_->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Oneway_Buffering::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Oneway_Buffering::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);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
index 4ea1dd52b64..67ad60edbf3 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h
@@ -27,16 +27,16 @@ public:
 
   // = The skeleton methods
   virtual void receive_data (const Test::Payload &the_payload
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void flush (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void flush (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void sync (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void sync (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
index bf3413506f7..a04178e6012 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp
@@ -13,14 +13,14 @@ Oneway_Buffering_Admin::Oneway_Buffering_Admin (CORBA::ORB_ptr orb)
 }
 
 CORBA::ULong
-Oneway_Buffering_Admin::request_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Oneway_Buffering_Admin::request_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->request_count_;
 }
 
 CORBA::ULong
-Oneway_Buffering_Admin::bytes_received_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Oneway_Buffering_Admin::bytes_received_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->bytes_received_count_;
@@ -28,7 +28,7 @@ Oneway_Buffering_Admin::bytes_received_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->request_count_++;
@@ -36,14 +36,14 @@ Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length
 }
 
 void
-Oneway_Buffering_Admin::flush (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Oneway_Buffering_Admin::flush (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Oneway_Buffering_Admin::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Oneway_Buffering_Admin::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);
 }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
index bce8067204a..bb425d7c6f2 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h
@@ -25,20 +25,20 @@ public:
   Oneway_Buffering_Admin (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual CORBA::ULong request_count (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong request_count (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong bytes_received_count (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::ULong bytes_received_count (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void request_received (CORBA::ULong payload_length
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void flush (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void flush (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp
index 874f6f9c508..58bf8444817 100644
--- a/TAO/tests/Oneway_Buffering/admin.cpp
+++ b/TAO/tests/Oneway_Buffering/admin.cpp
@@ -39,15 +39,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(oneway_buffering_admin_impl);
 
       Test::Oneway_Buffering_Admin_var oneway_buffering_admin =
-        oneway_buffering_admin_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        oneway_buffering_admin_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (oneway_buffering_admin.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (oneway_buffering_admin.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -86,18 +86,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) admin - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index b7dfdc27606..7eda2b53f00 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -88,25 +88,25 @@ int
 run_message_count (CORBA::ORB_ptr orb,
                    Test::Oneway_Buffering_ptr oneway_buffering,
                    Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 
 int
 run_timeout (CORBA::ORB_ptr orb,
              Test::Oneway_Buffering_ptr oneway_buffering,
              Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-             TAO_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL);
 
 int
 run_timeout_reactive (CORBA::ORB_ptr orb,
                       Test::Oneway_Buffering_ptr oneway_buffering,
                       Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                      TAO_ENV_ARG_DECL);
+                      ACE_ENV_ARG_DECL);
 
 int
 run_buffer_size (CORBA::ORB_ptr orb,
                  Test::Oneway_Buffering_ptr oneway_buffering,
                  Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                 TAO_ENV_ARG_DECL);
+                 ACE_ENV_ARG_DECL);
 
 int
 main (int argc, char *argv[])
@@ -115,18 +115,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 tmp =
-        orb->string_to_object(server_ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Oneway_Buffering_var oneway_buffering =
-        Test::Oneway_Buffering::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Oneway_Buffering::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (oneway_buffering.in ()))
@@ -138,11 +138,11 @@ main (int argc, char *argv[])
         }
 
       tmp =
-        orb->string_to_object(admin_ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(admin_ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Oneway_Buffering_Admin_var oneway_buffering_admin =
-        Test::Oneway_Buffering_Admin::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Oneway_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (oneway_buffering_admin.in ()))
@@ -161,7 +161,7 @@ main (int argc, char *argv[])
             run_message_count (orb.in (),
                                oneway_buffering.in (),
                                oneway_buffering_admin.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (run_timeout_test)
@@ -172,7 +172,7 @@ main (int argc, char *argv[])
             run_timeout (orb.in (),
                          oneway_buffering.in (),
                          oneway_buffering_admin.in ()
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (run_timeout_reactive_test)
@@ -183,7 +183,7 @@ main (int argc, char *argv[])
             run_timeout_reactive (orb.in (),
                                   oneway_buffering.in (),
                                   oneway_buffering_admin.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (run_buffer_size_test)
@@ -194,7 +194,7 @@ main (int argc, char *argv[])
             run_buffer_size (orb.in (),
                              oneway_buffering.in (),
                              oneway_buffering_admin.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -203,13 +203,13 @@ main (int argc, char *argv[])
                       "ERROR: No test was configured\n"));
         }
 
-      oneway_buffering->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      oneway_buffering->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      oneway_buffering_admin->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      oneway_buffering_admin->shutdown (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
@@ -228,14 +228,14 @@ configure_policies (CORBA::ORB_ptr orb,
                     const TAO::BufferingConstraint &buffering_constraint,
                     Test::Oneway_Buffering_ptr oneway_buffering,
                     Test::Oneway_Buffering_out flusher
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   CORBA::Object_var object =
-    orb->resolve_initial_references ("PolicyCurrent" TAO_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::PolicyCurrent_var policy_current =
-    CORBA::PolicyCurrent::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+    CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (policy_current.in ()))
@@ -253,21 +253,21 @@ configure_policies (CORBA::ORB_ptr orb,
   policies[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                         scope_as_any
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   policies[1] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
                         buffering_as_any
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
-  policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   TAO::BufferingConstraint flush_constraint;
@@ -281,20 +281,20 @@ configure_policies (CORBA::ORB_ptr orb,
   policies[0] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
                         buffering_as_any
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   object =
     oneway_buffering->_set_policy_overrides (policies,
                                              CORBA::ADD_OVERRIDE
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   flusher =
-    Test::Oneway_Buffering::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+    Test::Oneway_Buffering::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
@@ -302,12 +302,12 @@ configure_policies (CORBA::ORB_ptr orb,
 
 void
 sync_server (Test::Oneway_Buffering_ptr flusher
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
 {
   // Get back in sync with the server...
-  flusher->flush (TAO_ENV_SINGLE_ARG_PARAMETER);
+  flusher->flush (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  flusher->sync (TAO_ENV_SINGLE_ARG_PARAMETER);
+  flusher->sync (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -315,16 +315,16 @@ int
 run_liveness_test (Test::Oneway_Buffering_ptr oneway_buffering,
                    Test::Oneway_Buffering_ptr flusher,
                    Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, ".... checking for liveness\n"));
   int test_failed = 0;
 
-  sync_server (flusher TAO_ENV_ARG_PARAMETER);
+  sync_server (flusher ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::ULong send_count =
-    oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+    oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   int liveness_test_iterations = int(send_count);
@@ -337,12 +337,12 @@ run_liveness_test (Test::Oneway_Buffering_ptr oneway_buffering,
   int depth = 0;
   for (int i = 0; i != liveness_test_iterations; ++i)
     {
-      oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER);
+      oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
       send_count++;
 
       CORBA::ULong receive_count =
-        oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+        oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       // Once the system has sent enough messages we don't
@@ -360,13 +360,13 @@ run_liveness_test (Test::Oneway_Buffering_ptr oneway_buffering,
                       "expected %u\n",
                       i, receive_count, expected));
 
-          sync_server (flusher TAO_ENV_ARG_PARAMETER);
+          sync_server (flusher ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
 
       if (depth++ == LIVENESS_MAX_DEPTH)
         {
-          sync_server (flusher TAO_ENV_ARG_PARAMETER);
+          sync_server (flusher ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           depth = 0;
@@ -381,7 +381,7 @@ int
 run_message_count (CORBA::ORB_ptr orb,
                    Test::Oneway_Buffering_ptr oneway_buffering,
                    Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_MESSAGE_COUNT;
@@ -393,7 +393,7 @@ run_message_count (CORBA::ORB_ptr orb,
   int test_failed =
     configure_policies (orb, buffering_constraint,
                         oneway_buffering, flusher.out ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -407,11 +407,11 @@ run_message_count (CORBA::ORB_ptr orb,
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (flusher.in () TAO_ENV_ARG_PARAMETER);
+      sync_server (flusher.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_receive_count =
-        oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+        oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_receive_count != send_count)
@@ -424,12 +424,12 @@ run_message_count (CORBA::ORB_ptr orb,
 
       while (1)
         {
-          oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER);
+          oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           send_count++;
 
           CORBA::ULong receive_count =
-            oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+            oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           CORBA::ULong iteration_count =
@@ -467,7 +467,7 @@ run_message_count (CORBA::ORB_ptr orb,
     run_liveness_test (oneway_buffering,
                        flusher.in (),
                        oneway_buffering_admin
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
@@ -480,7 +480,7 @@ int
 run_timeout (CORBA::ORB_ptr orb,
               Test::Oneway_Buffering_ptr oneway_buffering,
               Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_TIMEOUT;
@@ -492,7 +492,7 @@ run_timeout (CORBA::ORB_ptr orb,
   int test_failed =
     configure_policies (orb, buffering_constraint,
                         oneway_buffering, flusher.out ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -506,11 +506,11 @@ run_timeout (CORBA::ORB_ptr orb,
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (flusher.in () TAO_ENV_ARG_PARAMETER);
+      sync_server (flusher.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_receive_count =
-        oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+        oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_receive_count != send_count)
@@ -524,12 +524,12 @@ run_timeout (CORBA::ORB_ptr orb,
       ACE_Time_Value start = ACE_OS::gettimeofday ();
       while (1)
         {
-          oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER);
+          oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           send_count++;
 
           CORBA::ULong receive_count =
-            oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+            oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start;
@@ -567,7 +567,7 @@ run_timeout (CORBA::ORB_ptr orb,
     run_liveness_test (oneway_buffering,
                        flusher.in (),
                        oneway_buffering_admin
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
@@ -581,7 +581,7 @@ int
 run_timeout_reactive (CORBA::ORB_ptr orb,
                       Test::Oneway_Buffering_ptr oneway_buffering,
                       Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_TIMEOUT;
@@ -593,7 +593,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   int test_failed =
     configure_policies (orb, buffering_constraint,
                         oneway_buffering, flusher.out ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -607,11 +607,11 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
   CORBA::ULong send_count = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (flusher.in () TAO_ENV_ARG_PARAMETER);
+      sync_server (flusher.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_receive_count =
-        oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+        oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_receive_count != send_count)
@@ -625,18 +625,18 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
       ACE_Time_Value start = ACE_OS::gettimeofday ();
       for (int j = 0; j != 20; ++j)
         {
-          oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER);
+          oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           send_count++;
         }
       while (1)
         {
           CORBA::ULong receive_count =
-            oneway_buffering_admin->request_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+            oneway_buffering_admin->request_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_Time_Value sleep (0, 10000);
-          orb->run (sleep TAO_ENV_ARG_PARAMETER);
+          orb->run (sleep ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start;
@@ -674,7 +674,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
     run_liveness_test (oneway_buffering,
                        flusher.in (),
                        oneway_buffering_admin
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
@@ -688,7 +688,7 @@ int
 run_buffer_size (CORBA::ORB_ptr orb,
                  Test::Oneway_Buffering_ptr oneway_buffering,
                  Test::Oneway_Buffering_Admin_ptr oneway_buffering_admin
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
 {
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint.mode = TAO::BUFFER_MESSAGE_BYTES;
@@ -700,7 +700,7 @@ run_buffer_size (CORBA::ORB_ptr orb,
   int test_failed =
     configure_policies (orb, buffering_constraint,
                         oneway_buffering, flusher.out ()
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (test_failed != 0)
@@ -714,11 +714,11 @@ run_buffer_size (CORBA::ORB_ptr orb,
   CORBA::ULong bytes_sent = 0;
   for (int i = 0; i != iterations; ++i)
     {
-      sync_server (flusher.in () TAO_ENV_ARG_PARAMETER);
+      sync_server (flusher.in () ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CORBA::ULong initial_bytes_received =
-        oneway_buffering_admin->bytes_received_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+        oneway_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (initial_bytes_received != bytes_sent)
@@ -731,12 +731,12 @@ run_buffer_size (CORBA::ORB_ptr orb,
 
       while (1)
         {
-          oneway_buffering->receive_data (payload TAO_ENV_ARG_PARAMETER);
+          oneway_buffering->receive_data (payload ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
           bytes_sent += PAYLOAD_LENGTH;
 
           CORBA::ULong bytes_received =
-            oneway_buffering_admin->bytes_received_count (TAO_ENV_SINGLE_ARG_PARAMETER);
+            oneway_buffering_admin->bytes_received_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           CORBA::ULong payload_delta =
@@ -779,7 +779,7 @@ run_buffer_size (CORBA::ORB_ptr orb,
     run_liveness_test (oneway_buffering,
                        flusher.in (),
                        oneway_buffering_admin
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (liveness_test_failed)
diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp
index 047b841e608..c13787ce522 100644
--- a/TAO/tests/Oneway_Buffering/server.cpp
+++ b/TAO/tests/Oneway_Buffering/server.cpp
@@ -45,15 +45,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -62,18 +62,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;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Oneway_Buffering_Admin_var admin =
-        Test::Oneway_Buffering_Admin::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Oneway_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (admin.in ()))
@@ -92,11 +92,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(oneway_buffering_impl);
 
       Test::Oneway_Buffering_var oneway_buffering =
-        oneway_buffering_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        oneway_buffering_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (oneway_buffering.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (oneway_buffering.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -109,18 +109,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Oneways_Invoking_Twoways/Client_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
index 60599eb6d4c..8f76444fb40 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp
@@ -21,7 +21,7 @@ Client_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       for (int i = 0; i != 1; ++i)
@@ -30,7 +30,7 @@ Client_Task::svc (void)
                       "TAO (%P|%t) sending oneways...\n"));
 
           this->sender_->send_ready_message (this->us_.in ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
index a615bc0fa09..e33c63186f9 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp
@@ -19,20 +19,20 @@ Receiver_i::~Receiver_i (void)
 
 
 CORBA::Long
-Receiver_i::receive_call (TAO_ENV_SINGLE_ARG_DECL)
+Receiver_i::receive_call (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t)  Doing a ping... \n"));
 
-  this->sender_->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->sender_->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return this->no_calls_++;
 }
 
 CORBA::Long
-Receiver_i::get_call_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Receiver_i::get_call_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->iteration_;
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
index bc133c6d926..3a8df239209 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h
@@ -41,11 +41,11 @@ public:
   virtual ~Receiver_i (void);
 
   // = The skeleton methods
-  virtual CORBA::Long receive_call (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long receive_call (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Retun the number of calls that every thread would make...
-  virtual CORBA::Long get_call_count (TAO_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Long get_call_count (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
index 43f09655404..8ac983b0163 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp
@@ -16,7 +16,7 @@ Sender_i::~Sender_i (void)
 
 void
 Sender_i::active_objects (CORBA::Short no_threads
-                          TAO_ENV_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER */ )
+                          ACE_ENV_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER */ )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->active_objects_ = no_threads;
@@ -25,7 +25,7 @@ Sender_i::active_objects (CORBA::Short no_threads
 
 void
 Sender_i::send_ready_message (Test::Receiver_ptr receiver
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -38,14 +38,14 @@ Sender_i::send_ready_message (Test::Receiver_ptr receiver
        i < this->number_;
        ++i)
     {
-      receiver->receive_call (TAO_ENV_SINGLE_ARG_PARAMETER);
+      receiver->receive_call (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
 }
 
 void
-Sender_i::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Sender_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
index b878806fb08..fffc668d58b 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
+++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h
@@ -42,14 +42,14 @@ public:
 
   // = The skeleton methods
   virtual void active_objects (CORBA::Short ao
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_ready_message (Test::Receiver_ptr receiver
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void ping (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
index 1338704fc0d..db7a0b5a63a 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp
@@ -17,12 +17,12 @@ int
 Server_Task::svc (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n"));
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // run the test for at most 60 seconds...
       ACE_Time_Value tv (60, 0);
-      this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
+      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
index be485765c03..9d2b4cc90e8 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
@@ -40,11 +40,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -53,11 +53,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -65,11 +65,11 @@ main (int argc, char *argv[])
 
       // Get the sender reference..
       CORBA::Object_var tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Sender_var sender =
-        Test::Sender::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Sender::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (sender.in ()))
@@ -90,11 +90,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(receiver_impl);
 
       Test::Receiver_var receiver =
-        receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate poa manager
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Client_Task client_task (sender.in (),
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
 
       // Before creating threads we will let the sender know that we
       // will have two threads that would make invocations..
-      sender->active_objects ((CORBA::Short) 2 TAO_ENV_ARG_PARAMETER);
+      sender->active_objects ((CORBA::Short) 2 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (server_task.activate (THR_NEW_LWP | THR_JOINABLE, 2,1) == -1)
@@ -124,7 +124,7 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "Event Loop finished \n"));
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
index 50d503f6736..2c3131b2cda 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
@@ -39,11 +39,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -52,11 +52,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -70,11 +70,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_owner_transfer(sender_impl);
 
       Test::Sender_var sender =
-        sender_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        sender_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (sender.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (sender.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -87,7 +87,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Task server_task (orb.in (),
@@ -101,10 +101,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Now terminating test\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp
index 4a171233145..5abe5d8d0ff 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.cpp
+++ b/TAO/tests/POA/Etherealization/Etherealization.cpp
@@ -22,7 +22,7 @@
 class test_i : public POA_test
 {
 public:
-  void method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+  void method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
@@ -37,7 +37,7 @@ class test_i_with_reference_counting : public virtual PortableServer::RefCountSe
                                        public virtual POA_test
 {
 public:
-  void method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
@@ -53,7 +53,7 @@ class Servant_Activator : public PortableServer::ServantActivator
 public:
   PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
                                      PortableServer::POA_ptr poa
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableServer::ForwardRequest));
 
@@ -62,14 +62,14 @@ public:
                     PortableServer::Servant servant,
                     CORBA::Boolean cleanup_in_progress,
                     CORBA::Boolean remaining_activations
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 PortableServer::Servant
 Servant_Activator::incarnate (const PortableServer::ObjectId &id,
                               PortableServer::POA_ptr
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
@@ -94,7 +94,7 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id,
                                 PortableServer::Servant servant,
                                 CORBA::Boolean,
                                 CORBA::Boolean
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::String_var object_name =
@@ -114,7 +114,7 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id,
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -122,24 +122,24 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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 (3);
@@ -148,29 +148,29 @@ main (int argc, char **argv)
       // ID Assignment Policy
       policies[0] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Lifespan Policy
       policies[1] =
         root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Request Processing Policy
       policies[2] =
         root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("child",
                               poa_manager.in (),
                               policies
-                              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;
 
       // Create servant activator.
@@ -179,7 +179,7 @@ main (int argc, char **argv)
 
       // Set servant_activator as the servant_manager of child POA.
       child_poa->set_servant_manager (servant_manager.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       {
@@ -191,19 +191,19 @@ main (int argc, char **argv)
         object =
           child_poa->create_reference_with_id (id.in (),
                                                "IDL:test:1.0"
-                                               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;
 
-        test->method (TAO_ENV_SINGLE_ARG_PARAMETER);
+        test->method (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         child_poa->deactivate_object (id.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
@@ -216,19 +216,19 @@ main (int argc, char **argv)
         object =
           child_poa->create_reference_with_id (id.in (),
                                                "IDL:test:1.0"
-                                               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;
 
-        test->method (TAO_ENV_SINGLE_ARG_PARAMETER);
+        test->method (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         child_poa->deactivate_object (id.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
 
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
index 127ae92a099..7880507c3fa 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
@@ -24,10 +24,10 @@
 class test_i : public POA_test
 {
 public:
-  void deactivate_self (TAO_ENV_SINGLE_ARG_DECL)
+  void deactivate_self (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);
 
   PortableServer::POA_var poa_;
 
@@ -35,17 +35,17 @@ public:
 };
 
 PortableServer::POA_ptr
-test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::deactivate_self (TAO_ENV_SINGLE_ARG_DECL)
+test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->poa_->deactivate_object (this->id_
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Exception flag
@@ -54,7 +54,7 @@ test_i::deactivate_self (TAO_ENV_SINGLE_ARG_DECL)
   ACE_TRY
     {
       this->poa_->deactivate_object (this->id_
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
@@ -79,7 +79,7 @@ test_i::deactivate_self (TAO_ENV_SINGLE_ARG_DECL)
 void
 test_object_deactivation (PortableServer::POA_ptr poa,
                           const PortableServer::ObjectId &id
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   test_i servant;
   int expected_exception_raised = 0;
@@ -90,7 +90,7 @@ test_object_deactivation (PortableServer::POA_ptr poa,
   ACE_TRY_EX (invalid_id)
     {
       poa->deactivate_object (invalid_id.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (invalid_id);
     }
   ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
@@ -114,11 +114,11 @@ test_object_deactivation (PortableServer::POA_ptr poa,
 
   poa->activate_object_with_id (id,
                                 &servant
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   poa->deactivate_object (id
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Reset flag
@@ -127,7 +127,7 @@ test_object_deactivation (PortableServer::POA_ptr poa,
   ACE_TRY_EX (double_deactivate)
     {
       poa->deactivate_object (id
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (double_deactivate);
     }
   ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
@@ -149,7 +149,7 @@ test_object_deactivation (PortableServer::POA_ptr poa,
 
   poa->activate_object_with_id (id,
                                 &servant
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   servant.poa_ =
@@ -158,10 +158,10 @@ test_object_deactivation (PortableServer::POA_ptr poa,
   servant.id_ = id;
 
   test_var test =
-    servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  test->deactivate_self (TAO_ENV_SINGLE_ARG_PARAMETER);
+  test->deactivate_self (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // ACE_ASSERT dissappears in non-debug builds
@@ -172,7 +172,7 @@ test_object_deactivation (PortableServer::POA_ptr poa,
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -180,24 +180,24 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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 empty_policies;
@@ -205,32 +205,32 @@ main (int argc, char **argv)
         root_poa->create_POA ("child",
                               poa_manager.in (),
                               empty_policies
-                              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;
 
       obj =
         root_poa->create_reference ("IDL:test:1.0"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
         root_poa->reference_to_id (obj.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_object_deactivation (root_poa.in (),
                                 id.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       id = PortableServer::string_to_ObjectId ("good id");
 
       test_object_deactivation (child_poa.in (),
                                 id.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp
index 4a9fec96cce..e13fb2f7333 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/tests/POA/Identity/Identity.cpp
@@ -30,7 +30,7 @@ public:
     {
     }
 
-  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     }
@@ -47,22 +47,22 @@ create_poas (PortableServer::POA_ptr root_poa,
              PortableServer::POA_out second_poa,
              PortableServer::POA_out third_poa,
              PortableServer::POA_out forth_poa
-             TAO_ENV_ARG_DECL)
+             ACE_ENV_ARG_DECL)
 {
   // Policies for the new POAs
   CORBA::PolicyList policies (3);
   policies.length (3);
 
   policies[0] = root_poa->create_lifespan_policy (lifespan_policy
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   policies[2] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Creation of the firstPOA
@@ -70,14 +70,14 @@ create_poas (PortableServer::POA_ptr root_poa,
   first_poa = root_poa->create_POA (name.c_str (),
                                     PortableServer::POAManager::_nil (),
                                     policies
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Creation of the secondPOA
@@ -85,14 +85,14 @@ create_poas (PortableServer::POA_ptr root_poa,
   second_poa = root_poa->create_POA (name.c_str (),
                                      PortableServer::POAManager::_nil (),
                                      policies
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  policies[2]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  policies[2]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Creation of the thirdPOA
@@ -100,14 +100,14 @@ create_poas (PortableServer::POA_ptr root_poa,
   third_poa = root_poa->create_POA (name.c_str (),
                                     PortableServer::POAManager::_nil (),
                                     policies
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  policies[1]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Creation of the forthPOA
@@ -115,7 +115,7 @@ create_poas (PortableServer::POA_ptr root_poa,
   forth_poa = root_poa->create_POA (name.c_str (),
                                     PortableServer::POAManager::_nil (),
                                     policies
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Creation of the new POAs over, so destroy the policies
@@ -123,7 +123,7 @@ create_poas (PortableServer::POA_ptr root_poa,
        i < policies.length ();
        ++i)
     {
-      policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -136,48 +136,48 @@ test_poas (CORBA::ORB_ptr orb,
            PortableServer::POA_ptr third_poa,
            PortableServer::POA_ptr forth_poa,
            int perform_deactivation_test
-           TAO_ENV_ARG_DECL)
+           ACE_ENV_ARG_DECL)
 {
   {
     test_i servant (root_poa);
 
     CORBA::Object_var obj = root_poa->create_reference ("IDL:test:1.0"
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in ()
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     root_poa->activate_object_with_id (id.in (),
                                        &servant
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     obj = root_poa->id_to_reference (id.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference =
       root_poa->reference_to_servant (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     PortableServer::Servant servant_from_id =
       root_poa->id_to_servant (id.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (servant_from_reference != servant_from_id
@@ -189,49 +189,49 @@ test_poas (CORBA::ORB_ptr orb,
       }
 
     obj = root_poa->servant_to_reference (&servant
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id_from_servant = root_poa->servant_to_id (&servant
-                                                                            TAO_ENV_ARG_PARAMETER);
+                                                                            ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_ASSERT (id_from_servant.in () == id.in ());
 
     root_poa->deactivate_object (id.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (perform_deactivation_test)
       {
         root_poa->activate_object_with_id (id.in (),
                                            &servant
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         servant_from_reference = root_poa->reference_to_servant (obj.in ()
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         ACE_ASSERT (servant_from_reference == &servant);
 
         root_poa->deactivate_object (id.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -240,32 +240,32 @@ test_poas (CORBA::ORB_ptr orb,
     test_i servant (root_poa);
 
     PortableServer::ObjectId_var id = root_poa->activate_object (&servant
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CORBA::Object_var obj = root_poa->id_to_reference (id.in ()
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = root_poa->create_reference_with_id (id.in (),
                                               "IDL:test:1.0"
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     root_poa->deactivate_object (id.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -273,42 +273,42 @@ test_poas (CORBA::ORB_ptr orb,
     test_i servant (first_poa);
 
     CORBA::Object_var obj = first_poa->create_reference ("IDL:test:1.0"
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in ()
-                                                                  TAO_ENV_ARG_PARAMETER);
+                                                                  ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     first_poa->activate_object_with_id (id.in (),
                                         &servant
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     obj = first_poa->id_to_reference (id.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference =
       first_poa->reference_to_servant (obj.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     PortableServer::Servant servant_from_id =
       first_poa->id_to_servant (id.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (servant_from_reference != servant_from_id
@@ -320,24 +320,24 @@ test_poas (CORBA::ORB_ptr orb,
       }
 
     first_poa->deactivate_object (id.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (perform_deactivation_test)
       {
         first_poa->activate_object_with_id (id.in (),
                                             &servant
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         servant_from_reference = first_poa->reference_to_servant (obj.in ()
-                                                                  TAO_ENV_ARG_PARAMETER);
+                                                                  ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         ACE_ASSERT (servant_from_reference == &servant);
 
         first_poa->deactivate_object (id.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -346,32 +346,32 @@ test_poas (CORBA::ORB_ptr orb,
     test_i servant (first_poa);
 
     PortableServer::ObjectId_var id = first_poa->activate_object (&servant
-                                                                  TAO_ENV_ARG_PARAMETER);
+                                                                  ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CORBA::Object_var obj = first_poa->id_to_reference (id.in ()
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = first_poa->create_reference_with_id (id.in (),
                                                "IDL:test:1.0"
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     first_poa->deactivate_object (id.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -379,42 +379,42 @@ test_poas (CORBA::ORB_ptr orb,
     test_i servant (second_poa);
 
     CORBA::Object_var obj = second_poa->create_reference ("IDL:test:1.0"
-                                                          TAO_ENV_ARG_PARAMETER);
+                                                          ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in ()
-                                                                   TAO_ENV_ARG_PARAMETER);
+                                                                   ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     second_poa->activate_object_with_id (id.in (),
                                          &servant
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     obj = second_poa->id_to_reference (id.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference =
       second_poa->reference_to_servant (obj.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     PortableServer::Servant servant_from_id =
       second_poa->id_to_servant (id.in ()
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (servant_from_reference != servant_from_id
@@ -426,49 +426,49 @@ test_poas (CORBA::ORB_ptr orb,
       }
 
     obj = second_poa->servant_to_reference (&servant
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id_from_servant = second_poa->servant_to_id (&servant
-                                                                              TAO_ENV_ARG_PARAMETER);
+                                                                              ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_ASSERT (id_from_servant.in () == id.in ());
 
     second_poa->deactivate_object (id.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (perform_deactivation_test)
       {
         second_poa->activate_object_with_id (id.in (),
                                              &servant
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         servant_from_reference = second_poa->reference_to_servant (obj.in ()
-                                                                   TAO_ENV_ARG_PARAMETER);
+                                                                   ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         ACE_ASSERT (servant_from_reference == &servant);
 
         second_poa->deactivate_object (id.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -477,32 +477,32 @@ test_poas (CORBA::ORB_ptr orb,
     test_i servant (second_poa);
 
     PortableServer::ObjectId_var id = second_poa->activate_object (&servant
-                                                                   TAO_ENV_ARG_PARAMETER);
+                                                                   ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CORBA::Object_var obj = second_poa->id_to_reference (id.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     obj = second_poa->create_reference_with_id (id.in (),
                                                 "IDL:test:1.0"
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     second_poa->deactivate_object (id.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
@@ -512,17 +512,17 @@ test_poas (CORBA::ORB_ptr orb,
 
     CORBA::Object_var obj = third_poa->create_reference_with_id (id.in (),
                                                                  "IDL:test:1.0"
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id_from_reference = third_poa->reference_to_id (obj.in ()
-                                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                                 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = PortableServer::ObjectId_to_string (id_from_reference.in ());
@@ -532,27 +532,27 @@ test_poas (CORBA::ORB_ptr orb,
 
     third_poa->activate_object_with_id (id.in (),
                                         &servant
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     obj = third_poa->id_to_reference (id.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference =
       third_poa->reference_to_servant (obj.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     PortableServer::Servant servant_from_id =
       third_poa->id_to_servant (id.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (servant_from_reference != servant_from_id
@@ -564,26 +564,26 @@ test_poas (CORBA::ORB_ptr orb,
       }
 
     obj = third_poa->servant_to_reference (&servant
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-    obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id_from_servant = third_poa->servant_to_id (&servant
-                                                                             TAO_ENV_ARG_PARAMETER);
+                                                                             ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = PortableServer::ObjectId_to_string (id_from_servant.in ());
@@ -592,24 +592,24 @@ test_poas (CORBA::ORB_ptr orb,
     ACE_ASSERT (id_from_servant.in () == id.in ());
 
     third_poa->deactivate_object (id.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (perform_deactivation_test)
       {
         third_poa->activate_object_with_id (id.in (),
                                             &servant
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         servant_from_reference = third_poa->reference_to_servant (obj.in ()
-                                                                  TAO_ENV_ARG_PARAMETER);
+                                                                  ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         ACE_ASSERT (servant_from_reference == &servant);
 
         third_poa->deactivate_object (id.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -620,17 +620,17 @@ test_poas (CORBA::ORB_ptr orb,
 
     CORBA::Object_var obj = forth_poa->create_reference_with_id (id.in (),
                                                                  "IDL:test:1.0"
-                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     CORBA::String_var string = orb->object_to_string (obj.in ()
-                                                      TAO_ENV_ARG_PARAMETER);
+                                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::ObjectId_var id_from_reference = forth_poa->reference_to_id (obj.in ()
-                                                                                 TAO_ENV_ARG_PARAMETER);
+                                                                                 ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = PortableServer::ObjectId_to_string (id_from_reference.in ());
@@ -640,27 +640,27 @@ test_poas (CORBA::ORB_ptr orb,
 
     forth_poa->activate_object_with_id (id.in (),
                                         &servant
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     obj = forth_poa->id_to_reference (id.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     string = orb->object_to_string (obj.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
     PortableServer::Servant servant_from_reference =
       forth_poa->reference_to_servant (obj.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     PortableServer::Servant servant_from_id =
       forth_poa->id_to_servant (id.in ()
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
     if (servant_from_reference != servant_from_id
@@ -677,17 +677,17 @@ test_poas (CORBA::ORB_ptr orb,
       {
         forth_poa->activate_object_with_id (id.in (),
                                             &servant
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         servant_from_reference = forth_poa->reference_to_servant (obj.in ()
-                                                                  TAO_ENV_ARG_PARAMETER);
+                                                                  ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         ACE_ASSERT (servant_from_reference == &servant);
 
         forth_poa->deactivate_object (id.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -696,22 +696,22 @@ test_poas (CORBA::ORB_ptr orb,
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ()
-                                                                       TAO_ENV_ARG_PARAMETER);
+                                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters
@@ -730,7 +730,7 @@ main (int argc, char **argv)
                    second_poa.out (),
                    third_poa.out (),
                    forth_poa.out ()
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_poas (orb.in (),
@@ -740,27 +740,27 @@ main (int argc, char **argv)
                  third_poa.in (),
                  forth_poa.in (),
                  perform_deactivation_test
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       first_poa->destroy (1,
                           1
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       second_poa->destroy (1,
                            1
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       third_poa->destroy (1,
                           1
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       forth_poa->destroy (1,
                           1
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       create_poas (root_poa.in (),
@@ -769,7 +769,7 @@ main (int argc, char **argv)
                    second_poa.out (),
                    third_poa.out (),
                    forth_poa.out ()
-                   TAO_ENV_ARG_PARAMETER);
+                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_poas (orb.in (),
@@ -779,12 +779,12 @@ main (int argc, char **argv)
                  third_poa.in (),
                  forth_poa.in (),
                  perform_deactivation_test
-                 TAO_ENV_ARG_PARAMETER);
+                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
index 1507a34bb43..c56375436b5 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
@@ -51,17 +51,17 @@ test_i::~test_i (void)
     {
       ACE_TRY_NEW_ENV
         {
-          PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+          PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           PortableServer::ObjectId_var id = poa->servant_to_id (this->other_
-                                                                TAO_ENV_ARG_PARAMETER);
+                                                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating other servant\n"));
 
           poa->deactivate_object (id.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -82,27 +82,27 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_i *servant1 = new test_i (0);
@@ -110,7 +110,7 @@ main (int argc, char **argv)
 
       PortableServer::ObjectId_var id1 =
         root_poa->activate_object (servant1
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Give ownership to POA.
@@ -118,19 +118,19 @@ main (int argc, char **argv)
 
       PortableServer::ObjectId_var id2 =
         root_poa->activate_object (servant2
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Give ownership to POA.
       servant2->_remove_ref ();
 
       root_poa->deactivate_object (id2.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
index 454cd4c1d5c..f63e474e459 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
@@ -25,7 +25,7 @@ class test_i : public POA_test
 public:
   test_i (ACE_Auto_Event &event);
 
-  void deactivate_self (TAO_ENV_SINGLE_ARG_DECL)
+  void deactivate_self (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -38,19 +38,19 @@ test_i::test_i (ACE_Auto_Event &event)
 }
 
 void
-test_i::deactivate_self (TAO_ENV_SINGLE_ARG_DECL)
+test_i::deactivate_self (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "(%t) Deactivating servant\n"));
   poa->deactivate_object (id.in ()
-                          TAO_ENV_ARG_PARAMETER);
+                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "(%t) Deactivation complete: signaling main thread and going to sleep\n"));
@@ -114,14 +114,14 @@ Activator::svc (void)
         {
           PortableServer::ObjectId_var id =
             this->poa_->activate_object (this->servant_
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
         {
           this->poa_->activate_object_with_id (this->id_,
                                                this->servant_
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -157,7 +157,7 @@ Deactivator::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->test_->deactivate_self (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->test_->deactivate_self (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -173,7 +173,7 @@ Deactivator::svc (void)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -181,27 +181,27 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Auto_Event event1;
@@ -210,10 +210,10 @@ main (int argc, char **argv)
       ACE_Auto_Event event2;
       test_i servant2 (event2);
 
-      test_var test_object1 = servant1._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test_var test_object1 = servant1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test_var test_object2 = servant2._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test_var test_object2 = servant2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id1 =
@@ -255,7 +255,7 @@ main (int argc, char **argv)
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
index 36800f959a1..a35208aa000 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
@@ -22,29 +22,29 @@
 class test_i : public POA_test
 {
 public:
-  void destroy_poa (TAO_ENV_SINGLE_ARG_DECL)
+  void destroy_poa (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
 void
-test_i::destroy_poa (TAO_ENV_SINGLE_ARG_DECL)
+test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Boolean etherealize_objects = 1;
   CORBA::Boolean wait_for_completion = 0;
   poa->destroy (etherealize_objects,
                 wait_for_completion
-                TAO_ENV_ARG_PARAMETER);
+                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -52,35 +52,35 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_i servant;
 
-      test_var test_object = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test_var test_object = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test_object->destroy_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
index ecee66581cc..41c06881c76 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
@@ -27,10 +27,10 @@ class test_i : public virtual POA_test
 public:
   test_i (PortableServer::POA_ptr poa);
 
-  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);
 
 private:
   PortableServer::POA_var poa_;
@@ -44,7 +44,7 @@ test_i::test_i (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::method (TAO_ENV_SINGLE_ARG_DECL)
+test_i::method (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -62,16 +62,16 @@ test_i::method (TAO_ENV_SINGLE_ARG_DECL)
       ACE_DEBUG ((LM_DEBUG,
                   "Calling self from %t\n"));
 
-      test_var self = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test_var self = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      self->method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      self->method (ACE_ENV_SINGLE_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 ());
 }
@@ -96,7 +96,7 @@ Worker::svc (void)
 {
   ACE_TRY_NEW_ENV
     {
-      this->test_->method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->test_->method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -118,22 +118,22 @@ main (int argc, char **argv)
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
       CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"
-                                                               TAO_ENV_ARG_PARAMETER);
+                                                               ACE_ENV_ARG_PARAMETER);
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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;
 
       // Policies for the new POA.
@@ -142,12 +142,12 @@ main (int argc, char **argv)
 
       policies[0] =
         root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policies[1] =
         root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creation of the child POA.
@@ -155,7 +155,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;
 
       // Destroy the policies
@@ -163,20 +163,20 @@ main (int argc, char **argv)
            i < policies.length ();
            ++i)
         {
-          policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policies[i]->destroy (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;
 
       test_i servant1 (child_poa.in ());
       test_i servant2 (child_poa.in ());
 
-      test_var object1 = servant1._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test_var object1 = servant1._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test_var object2 = servant2._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test_var object2 = servant2._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Worker worker1 (object1.in ());
@@ -195,7 +195,7 @@ main (int argc, char **argv)
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
index a6e778470ab..8b945a68c1b 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
@@ -21,7 +21,7 @@
 class test_i : public POA_test
 {
 public:
-  void destroy_poa (TAO_ENV_SINGLE_ARG_DECL)
+  void destroy_poa (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void test_poa (PortableServer::POA_ptr poa);
@@ -36,14 +36,14 @@ test_i::test_poa (PortableServer::POA_ptr poa)
 }
 
 void
-test_i::destroy_poa (TAO_ENV_SINGLE_ARG_DECL)
+test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean etherealize_objects = 1;
   CORBA::Boolean wait_for_completion = 1;
   this->poa_->destroy (etherealize_objects,
                        wait_for_completion
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -51,33 +51,33 @@ PortableServer::POA_ptr
 init_orb (int argc,
           char **argv,
           const char *orb_name
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
 {
   // Initialize the ORB first.
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv,
                                         orb_name
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Obtain the RootPOA.
   CORBA::Object_var obj =
     orb->resolve_initial_references ("RootPOA"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa =
     PortableServer::POA::_narrow (obj.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Get the POAManager of the RootPOA.
   PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+    root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
-  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   return root_poa._retn ();
@@ -87,7 +87,7 @@ int
 main (int argc,
       char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -95,18 +95,18 @@ main (int argc,
         init_orb (argc,
                   argv,
                   "first ORB"
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var second_poa =
         init_orb (argc,
                   argv,
                   "second ORB"
-                  TAO_ENV_ARG_PARAMETER);
+                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_i servant;
-      test_var test_object = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test_var test_object = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int expected_exception_raised = 0;
@@ -115,7 +115,7 @@ main (int argc,
         {
           servant.test_poa (first_poa.in ());
 
-          test_object->destroy_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+          test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (first_poa);
         }
       ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
@@ -140,10 +140,10 @@ main (int argc,
 
       servant.test_poa (second_poa.in ());
 
-      test_object->destroy_poa (TAO_ENV_SINGLE_ARG_PARAMETER);
+      test_object->destroy_poa (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      first_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      first_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp
index e12c722c98f..af6bddcb277 100644
--- a/TAO/tests/Param_Test/any.cpp
+++ b/TAO/tests/Param_Test/any.cpp
@@ -48,7 +48,7 @@ Test_Any::opname (void) const
 }
 
 void
-Test_Any::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL)
+Test_Any::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("o1") <<= this->in_;
   req->add_inout_arg ("o2") <<= this->inout_;
@@ -56,7 +56,7 @@ Test_Any::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL)
 
   req->set_return_type (CORBA::_tc_any);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const CORBA::Any *tmp;
@@ -64,13 +64,13 @@ Test_Any::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL)
   this->ret_ = new CORBA::Any (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = CORBA::Any (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new CORBA::Any (*tmp);
@@ -93,12 +93,12 @@ static const CORBA::TypeCode_ptr any_table [] =
 
 int
 Test_Any::init_parameters (Param_Test_ptr objref
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       // get access to a Coffee Object
-      this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->reset_parameters ();
@@ -270,14 +270,14 @@ Test_Any::reset_parameters (void)
 
 int
 Test_Any::run_sii_test (Param_Test_ptr objref
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_any (this->in_,
                                      this->inout_,
                                      this->out_.out ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h
index 501d31336f8..f27f8be3c99 100644
--- a/TAO/tests/Param_Test/any.h
+++ b/TAO/tests/Param_Test/any.h
@@ -48,14 +48,14 @@ public:
   };
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -70,7 +70,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp
index fe874758829..f8068a4ca54 100644
--- a/TAO/tests/Param_Test/anyop.cpp
+++ b/TAO/tests/Param_Test/anyop.cpp
@@ -33,7 +33,7 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_Get_Opt get_opt (argc, argv, "dn:l:");
@@ -91,12 +91,12 @@ main (int argc, char *argv[])
           {
             CORBA::Object_var obj =
               orb->string_to_object ("corbaloc:iiop:localhost:1234/Foo/Bar"
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             Param_Test_var param_test =
               Param_Test::_unchecked_narrow (obj.in ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
             TAO_Stub *stub = param_test->_stubobj ();
             stub->type_id = CORBA::string_dup ("IDL:Param_Test:1.0");
@@ -110,7 +110,7 @@ main (int argc, char *argv[])
                             "Cannot extract Param_Test (oh the horror)\n"));
               }
             CORBA::Boolean equiv =
-              param_test->_is_equivalent (o TAO_ENV_ARG_PARAMETER);
+              param_test->_is_equivalent (o ACE_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
             if (!equiv)
               {
diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp
index 1b7edb51d8e..7bf7c6936b5 100644
--- a/TAO/tests/Param_Test/bd_array_seq.cpp
+++ b/TAO/tests/Param_Test/bd_array_seq.cpp
@@ -49,14 +49,14 @@ Test_Bounded_Array_Sequence::opname (void) const
 
 void
 Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Bounded_ArraySeq);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Bounded_ArraySeq *tmp;
@@ -64,13 +64,13 @@ Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Bounded_ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_ArraySeq (*tmp);
@@ -78,7 +78,7 @@ Test_Bounded_Array_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr
-                                              TAO_ENV_ARG_DECL_NOT_USED)
+                                              ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -124,7 +124,7 @@ Test_Bounded_Array_Sequence::reset_parameters (void)
 
 int
 Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -134,7 +134,7 @@ Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref
         objref->test_bounded_array_sequence (this->in_,
                                              this->inout_.inout (),
                                              out
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_array_seq.h b/TAO/tests/Param_Test/bd_array_seq.h
index 2069c790f58..060454b6e71 100644
--- a/TAO/tests/Param_Test/bd_array_seq.h
+++ b/TAO/tests/Param_Test/bd_array_seq.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -58,7 +58,7 @@ public:
   // print all the values
 
   void dii_req_invoke (CORBA::Request *
-                       TAO_ENV_ARG_DECL_NOT_USED);
+                       ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index a32c2d50f10..38bb0ed35ee 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -48,14 +48,14 @@ Test_Bounded_Long_Sequence::opname (void) const
 
 void
 Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Bounded_Long_Seq);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const Param_Test::Bounded_Long_Seq *tmp;
@@ -63,13 +63,13 @@ Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Bounded_Long_Seq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_Long_Seq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_Long_Seq (*tmp);
@@ -77,7 +77,7 @@ Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr
-                                             TAO_ENV_ARG_DECL_NOT_USED)
+                                             ACE_ENV_ARG_DECL_NOT_USED)
 {
   // get some sequence length (32 in this case)
   CORBA::ULong len = this->in_->maximum ();
@@ -115,7 +115,7 @@ Test_Bounded_Long_Sequence::reset_parameters (void)
 
 int
 Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref
-                                          TAO_ENV_ARG_DECL)
+                                          ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -123,7 +123,7 @@ Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_bounded_long_sequence (this->in_.in (),
                                                        this->inout_.inout (),
                                                        out
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h
index d7b49cd3b45..52e9fbdeb02 100644
--- a/TAO/tests/Param_Test/bd_long_seq.h
+++ b/TAO/tests/Param_Test/bd_long_seq.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp
index 21836ba0f74..e6a6f205546 100644
--- a/TAO/tests/Param_Test/bd_short_seq.cpp
+++ b/TAO/tests/Param_Test/bd_short_seq.cpp
@@ -48,14 +48,14 @@ Test_Bounded_Short_Sequence::opname (void) const
 
 void
 Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Bounded_Short_Seq);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Bounded_Short_Seq *tmp;
@@ -63,13 +63,13 @@ Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Bounded_Short_Seq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_Short_Seq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_Short_Seq (*tmp);
@@ -77,7 +77,7 @@ Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/
-                                              TAO_ENV_ARG_DECL_NOT_USED /*env*/)
+                                              ACE_ENV_ARG_DECL_NOT_USED /*env*/)
 {
   // ACE_UNUSED_ARG (objref);
 
@@ -119,7 +119,7 @@ Test_Bounded_Short_Sequence::reset_parameters (void)
 
 int
 Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -128,7 +128,7 @@ Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_bounded_short_sequence (this->in_.in (),
                                                         this->inout_.inout (),
                                                         out
-                                                        TAO_ENV_ARG_PARAMETER);
+                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h
index f0b9b33944b..78f402b4f63 100644
--- a/TAO/tests/Param_Test/bd_short_seq.h
+++ b/TAO/tests/Param_Test/bd_short_seq.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index 3df97b029d1..1ca7bb06806 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -48,7 +48,7 @@ Test_Bounded_String_Sequence::opname (void) const
 
 void
 Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Bounded_StrSeq);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const Param_Test::Bounded_StrSeq *tmp;
@@ -64,13 +64,13 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Bounded_StrSeq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_StrSeq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_StrSeq (*tmp);
@@ -78,7 +78,7 @@ Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr
-                                               TAO_ENV_ARG_DECL_NOT_USED)
+                                               ACE_ENV_ARG_DECL_NOT_USED)
 {
   const char *choiceList[] =
   {
@@ -112,7 +112,7 @@ Test_Bounded_String_Sequence::reset_parameters (void)
 
 int
 Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -121,7 +121,7 @@ Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_bounded_strseq (this->in_.in (),
                                                 this->inout_.inout (),
                                                 out
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h
index be4e9061e40..31936d01fec 100644
--- a/TAO/tests/Param_Test/bd_str_seq.h
+++ b/TAO/tests/Param_Test/bd_str_seq.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp
index 88bce95539d..538784a75a0 100644
--- a/TAO/tests/Param_Test/bd_string.cpp
+++ b/TAO/tests/Param_Test/bd_string.cpp
@@ -56,7 +56,7 @@ Test_Bounded_String::opname (void) const
 
 void
 Test_Bounded_String::dii_req_invoke (CORBA::Request *req
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= CORBA::Any::from_string (this->in_, 128);
   req->add_inout_arg ("s2") <<= CORBA::Any::from_string (this->inout_, 128);
@@ -67,7 +67,7 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_short_string);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   char *tmp;
@@ -75,13 +75,13 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req
   this->ret_ = CORBA::string_dup (tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= CORBA::Any::to_string (tmp, 128);
   this->inout_ = CORBA::string_dup (tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= CORBA::Any::to_string (tmp, 128);
   this->out_ = CORBA::string_dup (tmp);
@@ -89,7 +89,7 @@ Test_Bounded_String::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Bounded_String::init_parameters (Param_Test_ptr
-                                                              TAO_ENV_ARG_DECL_NOT_USED)
+                                                              ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -125,7 +125,7 @@ Test_Bounded_String::reset_parameters (void)
 
 int
 Test_Bounded_String::run_sii_test (Param_Test_ptr objref
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -134,7 +134,7 @@ Test_Bounded_String::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_bounded_string (this->in_,
                                                 this->inout_,
                                                 str_out
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h
index 5d28250b598..f8024a686ff 100644
--- a/TAO/tests/Param_Test/bd_string.h
+++ b/TAO/tests/Param_Test/bd_string.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp
index 3666187016c..f382a7badbe 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.cpp
+++ b/TAO/tests/Param_Test/bd_struct_seq.cpp
@@ -51,14 +51,14 @@ Test_Bounded_Struct_Sequence::opname (void) const
 
 void
 Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Bounded_StructSeq);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Bounded_StructSeq *tmp;
@@ -66,13 +66,13 @@ Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Bounded_StructSeq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_StructSeq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_StructSeq (*tmp);
@@ -80,7 +80,7 @@ Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr /* objref */
-                                               TAO_ENV_ARG_DECL_NOT_USED /* env */)
+                                               ACE_ENV_ARG_DECL_NOT_USED /* env */)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -117,7 +117,7 @@ Test_Bounded_Struct_Sequence::reset_parameters (void)
 
 int
 Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref
-                                            TAO_ENV_ARG_DECL)
+                                            ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -126,7 +126,7 @@ Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_bounded_struct_sequence (this->in_,
                                                          this->inout_.inout (),
                                                          out
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h
index 5302176d981..e59ef86b43e 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.h
+++ b/TAO/tests/Param_Test/bd_struct_seq.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp
index a0b9ae9d756..3c5c065af16 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp
@@ -48,7 +48,7 @@ Test_Bounded_WString_Sequence::opname (void) const
 
 void
 Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req
-                                               TAO_ENV_ARG_DECL)
+                                               ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Bounded_WStrSeq);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const Param_Test::Bounded_WStrSeq *tmp;
@@ -64,13 +64,13 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Bounded_WStrSeq (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Bounded_WStrSeq (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Bounded_WStrSeq (*tmp);
@@ -78,7 +78,7 @@ Test_Bounded_WString_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr
-                                                TAO_ENV_ARG_DECL_NOT_USED)
+                                                ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -111,7 +111,7 @@ Test_Bounded_WString_Sequence::reset_parameters (void)
 
 int
 Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref
-                                             TAO_ENV_ARG_DECL)
+                                             ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -120,7 +120,7 @@ Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_bounded_wstrseq (this->in_.in (),
                                                  this->inout_.inout (),
                                                  out
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.h b/TAO/tests/Param_Test/bd_wstr_seq.h
index 038cc5f7be9..b1057f513f6 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.h
+++ b/TAO/tests/Param_Test/bd_wstr_seq.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -58,7 +58,7 @@ public:
   // print all the values
 
   void dii_req_invoke (CORBA::Request *
-                       TAO_ENV_ARG_DECL_NOT_USED);
+                       ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp
index 3100895a2b7..3d94454d818 100644
--- a/TAO/tests/Param_Test/bd_wstring.cpp
+++ b/TAO/tests/Param_Test/bd_wstring.cpp
@@ -56,7 +56,7 @@ Test_Bounded_WString::opname (void) const
 
 void
 Test_Bounded_WString::dii_req_invoke (CORBA::Request *req
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= CORBA::Any::from_wstring (this->in_, 128);
   req->add_inout_arg ("s2") <<= CORBA::Any::from_wstring (this->inout_, 128);
@@ -67,7 +67,7 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_short_wstring);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::WChar *tmp;
@@ -75,13 +75,13 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req
   this->ret_ = CORBA::wstring_dup (tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= CORBA::Any::to_wstring (tmp, 128);
   this->inout_ = CORBA::wstring_dup (tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= CORBA::Any::to_wstring (tmp, 128);
   this->out_ = CORBA::wstring_dup (tmp);
@@ -89,7 +89,7 @@ Test_Bounded_WString::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Bounded_WString::init_parameters (Param_Test_ptr
-                                                               TAO_ENV_ARG_DECL_NOT_USED)
+                                                               ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -125,7 +125,7 @@ Test_Bounded_WString::reset_parameters (void)
 
 int
 Test_Bounded_WString::run_sii_test (Param_Test_ptr objref
-                                                            TAO_ENV_ARG_DECL)
+                                                            ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -134,7 +134,7 @@ Test_Bounded_WString::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_bounded_wstring (this->in_,
                                                  this->inout_,
                                                  str_out
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/bd_wstring.h b/TAO/tests/Param_Test/bd_wstring.h
index dbb2a29b882..ec0fb098b2e 100644
--- a/TAO/tests/Param_Test/bd_wstring.h
+++ b/TAO/tests/Param_Test/bd_wstring.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   // print all the values
 
   void dii_req_invoke (CORBA::Request *
-                       TAO_ENV_ARG_DECL_NOT_USED);
+                       ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index 0cb0f5589af..d63460e7eeb 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -46,7 +46,7 @@ Test_Big_Union::opname (void) const
 
 void
 Test_Big_Union::dii_req_invoke (CORBA::Request *req
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -54,7 +54,7 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Big_Union);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Big_Union *tmp;
@@ -62,13 +62,13 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Big_Union (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = *tmp;
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Big_Union (*tmp);
@@ -76,12 +76,12 @@ Test_Big_Union::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Big_Union::init_parameters (Param_Test_ptr objref
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       // get access to a Coffee Object
-      this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->reset_parameters ();
@@ -229,14 +229,14 @@ Test_Big_Union::reset_parameters (void)
 
 int
 Test_Big_Union::run_sii_test (Param_Test_ptr objref
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_big_union (this->in_,
                                            this->inout_,
                                            this->out_
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -286,7 +286,7 @@ Test_Big_Union::check_validity (void)
       break;
     case 1:
       {
-        TAO_ENV_DECLARE_NEW_ENV;
+        ACE_DECLARE_NEW_CORBA_ENV;
         ACE_TRY
           {
             Coffee_ptr in    = this->in_.the_interface ();
@@ -301,16 +301,16 @@ Test_Big_Union::check_validity (void)
               return 0;
 
             Coffee::Desc_var in_desc =
-              in->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+              in->description (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             Coffee::Desc_var inout_desc =
-              inout->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+              inout->description (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             Coffee::Desc_var out_desc =
-              out->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+              out->description (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
             Coffee::Desc_var ret_desc =
-              ret->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+              ret->description (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
             if (ACE_OS::strcmp (in_desc->name.in (),
diff --git a/TAO/tests/Param_Test/big_union.h b/TAO/tests/Param_Test/big_union.h
index e66dbf4f6a6..f08e0eac9c3 100644
--- a/TAO/tests/Param_Test/big_union.h
+++ b/TAO/tests/Param_Test/big_union.h
@@ -38,14 +38,14 @@ public:
   };
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -60,7 +60,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp
index 3fe60d6cd70..c1edb32fbb2 100644
--- a/TAO/tests/Param_Test/client.cpp
+++ b/TAO/tests/Param_Test/client.cpp
@@ -65,10 +65,10 @@ Param_Test_Client<T>::run_sii_test (void)
   this->results_.iterations (opt->loop_count ());
 
   // Declare the Env
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   // Initialize parameters for the test.
   int check = this->test_object_->init_parameters (this->param_test_
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (check == -1)
@@ -98,7 +98,7 @@ Param_Test_Client<T>::run_sii_test (void)
 
           // make the call
           this->test_object_->run_sii_test (this->param_test_
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // stop the timer.
@@ -178,10 +178,10 @@ Param_Test_Client<T>::run_dii_test (void)
   this->results_.iterations (opt->loop_count ());
 
   // Environment variable
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   // initialize parameters for the test
   int check = this->test_object_->init_parameters (this->param_test_
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (check == -1)
@@ -208,7 +208,7 @@ Param_Test_Client<T>::run_dii_test (void)
       ACE_TRY
         {
           req = this->param_test_->_request (opname
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (opt->debug ())
@@ -219,7 +219,7 @@ Param_Test_Client<T>::run_dii_test (void)
 
           // Make the invocation, verify the result.
           this->test_object_->dii_req_invoke (req.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp
index d3d621880fe..730761cca34 100644
--- a/TAO/tests/Param_Test/complex_any.cpp
+++ b/TAO/tests/Param_Test/complex_any.cpp
@@ -52,7 +52,7 @@ Test_Complex_Any::opname (void) const
 
 void
 Test_Complex_Any::dii_req_invoke (CORBA::Request *req
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -60,7 +60,7 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_any);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const CORBA::Any *tmp;
@@ -68,13 +68,13 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req
   this->ret_ = new CORBA::Any (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = CORBA::Any (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new CORBA::Any (*tmp);
@@ -82,7 +82,7 @@ Test_Complex_Any::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Complex_Any::init_parameters (Param_Test_ptr
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
 {
   return this->reset_parameters ();
 }
@@ -168,14 +168,14 @@ Test_Complex_Any::reset_parameters (void)
 
 int
 Test_Complex_Any::run_sii_test (Param_Test_ptr objref
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_complex_any (this->in_,
                                              this->inout_,
                                              this->out_.out ()
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Param_Test/complex_any.h b/TAO/tests/Param_Test/complex_any.h
index 0637a5647e9..8ad9e40be77 100644
--- a/TAO/tests/Param_Test/complex_any.h
+++ b/TAO/tests/Param_Test/complex_any.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index cac0b11e525..ba14469be30 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -61,7 +61,7 @@ int
 Driver::init (int argc, char **argv)
 {
   // environment to track exceptions
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   // retrieve the instance of Options
   Options *opt = OPTIONS::instance ();
@@ -76,7 +76,7 @@ Driver::init (int argc, char **argv)
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     "internet"
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -89,7 +89,7 @@ Driver::init (int argc, char **argv)
       ACE_OS::strcpy (exception_string,"ORB::string_to_object() failed.");
 
       CORBA::Object_var temp =
-        this->orb_->string_to_object (opt->param_test_ior () TAO_ENV_ARG_PARAMETER);
+        this->orb_->string_to_object (opt->param_test_ior () ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -102,7 +102,7 @@ Driver::init (int argc, char **argv)
       // Get the object reference
       ACE_OS::strcpy (exception_string,"Param_Test::_narrow () failed.");
 
-      this->objref_ = Param_Test::_narrow (temp.in() TAO_ENV_ARG_PARAMETER);
+      this->objref_ = Param_Test::_narrow (temp.in() ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
@@ -613,12 +613,12 @@ Driver::run (void)
     }
 
   // Get in a new environment variable
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       if (opt->shutdown ())
         {
-          this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->objref_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index 5d2b8a77165..7eb9b210746 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -48,7 +48,7 @@ Test_Exception::opname (void) const
 
 void
 Test_Exception::dii_req_invoke (CORBA::Request_ptr req
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -61,18 +61,18 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req
 
       req->exceptions ()->add (CORBA::TypeCode::_duplicate (Param_Test::_tc_Ooops));
 
-      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+      req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       req->return_value () >>= this->ret_;
 
       CORBA::NamedValue_ptr o2 =
-        req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+        req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       *o2->value () >>= this->inout_;
 
       CORBA::NamedValue_ptr o3 =
-        req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+        req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
       *o3->value () >>= this->out_;
     }
@@ -132,7 +132,7 @@ Test_Exception::dii_req_invoke (CORBA::Request_ptr req
 
 int
 Test_Exception::init_parameters (Param_Test_ptr
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -152,7 +152,7 @@ Test_Exception::reset_parameters (void)
 
 int
 Test_Exception::run_sii_test (Param_Test_ptr objref
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -160,7 +160,7 @@ Test_Exception::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_exception (this->in_,
                                            this->inout_,
                                            this->out_
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (Param_Test::Ooops, ex)
diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h
index 5efa62b14f8..acc0f1c2cb0 100644
--- a/TAO/tests/Param_Test/except.h
+++ b/TAO/tests/Param_Test/except.h
@@ -31,14 +31,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -53,7 +53,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp
index b34cdbd5e46..02eb437af97 100644
--- a/TAO/tests/Param_Test/fixed_array.cpp
+++ b/TAO/tests/Param_Test/fixed_array.cpp
@@ -45,14 +45,14 @@ Test_Fixed_Array::opname (void) const
 
 void
 Test_Fixed_Array::dii_req_invoke (CORBA::Request *req
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= Param_Test::Fixed_Array_forany (this->in_);
   req->add_inout_arg ("s2") <<= Param_Test::Fixed_Array_forany (this->inout_);
   req->add_out_arg ("s3") <<= Param_Test::Fixed_Array_forany (this->out_);
   req->set_return_type (Param_Test::_tc_Fixed_Array);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Fixed_Array_forany forany;
@@ -60,13 +60,13 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req
   Param_Test::Fixed_Array_copy (this->ret_, forany.in ());
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= forany;
   Param_Test::Fixed_Array_copy (this->inout_, forany.in ());
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   Param_Test::Fixed_Array_forany out_any (this->out_);
   *arg3->value () >>= forany;
@@ -75,7 +75,7 @@ Test_Fixed_Array::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/
-                                   TAO_ENV_ARG_DECL_NOT_USED/*env*/)
+                                   ACE_ENV_ARG_DECL_NOT_USED/*env*/)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -107,14 +107,14 @@ Test_Fixed_Array::reset_parameters (void)
 
 int
 Test_Fixed_Array::run_sii_test (Param_Test_ptr objref
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_fixed_array (this->in_,
                                              this->inout_,
                                              this->out_
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h
index 04c3744cb91..c064b8106fb 100644
--- a/TAO/tests/Param_Test/fixed_array.h
+++ b/TAO/tests/Param_Test/fixed_array.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp
index 46e87cc5b66..669c7a9e7f8 100644
--- a/TAO/tests/Param_Test/fixed_struct.cpp
+++ b/TAO/tests/Param_Test/fixed_struct.cpp
@@ -44,14 +44,14 @@ Test_Fixed_Struct::opname (void) const
 
 void
 Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
   req->add_out_arg ("s3") <<= this->out_;
   req->set_return_type (Param_Test::_tc_Fixed_Struct);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Fixed_Struct *tmp;
@@ -59,13 +59,13 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req
   this->ret_ = *tmp;
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = *tmp;
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = *tmp;
@@ -73,7 +73,7 @@ Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Fixed_Struct::init_parameters (Param_Test_ptr /*objref*/
-                                    TAO_ENV_ARG_DECL_NOT_USED/*env*/)
+                                    ACE_ENV_ARG_DECL_NOT_USED/*env*/)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -106,14 +106,14 @@ Test_Fixed_Struct::reset_parameters (void)
 
 int
 Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_fixed_struct (this->in_,
                                               this->inout_,
                                               this->out_
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h
index c8c7a7f0c8d..b791bbe5e3e 100644
--- a/TAO/tests/Param_Test/fixed_struct.h
+++ b/TAO/tests/Param_Test/fixed_struct.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp
index 6dd783bf1e5..ee238011542 100644
--- a/TAO/tests/Param_Test/multdim_array.cpp
+++ b/TAO/tests/Param_Test/multdim_array.cpp
@@ -47,7 +47,7 @@ Test_Multdim_Array::opname (void) const
 
 void
 Test_Multdim_Array::dii_req_invoke (CORBA::Request *req
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= Param_Test::Multdim_Array_forany (this->in_.inout ());
   req->add_inout_arg ("s2") <<= Param_Test::Multdim_Array_forany (this->inout_.inout ());
@@ -55,7 +55,7 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Multdim_Array);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
 
@@ -64,13 +64,13 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req
   Param_Test::Multdim_Array_copy (this->ret_, forany.in ());
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= forany;
   Param_Test::Multdim_Array_copy (this->inout_, forany.in ());
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= forany;
   Param_Test::Multdim_Array_copy (this->out_, forany.in ());
@@ -78,7 +78,7 @@ Test_Multdim_Array::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/
-                                     TAO_ENV_ARG_DECL_NOT_USED/*env*/)
+                                     ACE_ENV_ARG_DECL_NOT_USED/*env*/)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -134,14 +134,14 @@ Test_Multdim_Array::reset_parameters (void)
 
 int
 Test_Multdim_Array::run_sii_test (Param_Test_ptr objref
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_multdim_array (this->in_.in (),
                                                this->inout_.inout (),
                                                this->out_.inout ()
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       return 0;
     }
diff --git a/TAO/tests/Param_Test/multdim_array.h b/TAO/tests/Param_Test/multdim_array.h
index e82d6dd0bd4..a6ab0243884 100644
--- a/TAO/tests/Param_Test/multdim_array.h
+++ b/TAO/tests/Param_Test/multdim_array.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index 022c4fb538f..4b16cd9ff6a 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -48,14 +48,14 @@ Test_Nested_Struct::opname (void) const
 }
 
 void
-Test_Nested_Struct::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL)
+Test_Nested_Struct::dii_req_invoke (CORBA::Request *req ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
   req->add_out_arg ("s3") <<= this->out_.in ();
   req->set_return_type (Param_Test::_tc_Nested_Struct);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Nested_Struct *tmp;
@@ -63,13 +63,13 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL)
   this->ret_ = new Param_Test::Nested_Struct (*tmp);
 
   CORBA::NamedValue_ptr arg2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg2->value () >>= tmp;
   this->inout_ = new Param_Test::Nested_Struct (*tmp);
 
   CORBA::NamedValue_ptr arg3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *arg3->value () >>= tmp;
   this->out_ = new Param_Test::Nested_Struct (*tmp);
@@ -77,7 +77,7 @@ Test_Nested_Struct::dii_req_invoke (CORBA::Request *req TAO_ENV_ARG_DECL)
 
 int
 Test_Nested_Struct::init_parameters (Param_Test_ptr
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -131,7 +131,7 @@ Test_Nested_Struct::reset_parameters (void)
 
 int
 Test_Nested_Struct::run_sii_test (Param_Test_ptr objref
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -139,7 +139,7 @@ Test_Nested_Struct::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_nested_struct (this->in_,
                                                this->inout_.inout (),
                                                out
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h
index 7fa958598b1..50a456bd479 100644
--- a/TAO/tests/Param_Test/nested_struct.h
+++ b/TAO/tests/Param_Test/nested_struct.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp
index 128959dfed3..c629356d959 100644
--- a/TAO/tests/Param_Test/objref.cpp
+++ b/TAO/tests/Param_Test/objref.cpp
@@ -44,7 +44,7 @@ Test_ObjRef::opname (void) const
 
 void
 Test_ObjRef::dii_req_invoke (CORBA::Request *req
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -52,7 +52,7 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (_tc_Coffee);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Coffee_ptr tmp;
@@ -60,13 +60,13 @@ Test_ObjRef::dii_req_invoke (CORBA::Request *req
   this->ret_ = Coffee::_duplicate (tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = Coffee::_duplicate (tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = Coffee::_duplicate (tmp);
@@ -83,7 +83,7 @@ static const char *Coffee_Flavor [] = {
 
 int
 Test_ObjRef::init_parameters (Param_Test_ptr objref
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   Coffee::Desc desc;
   Generator *gen = GENERATOR::instance (); // value generator
@@ -95,7 +95,7 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref
       ACE_OS::strcpy (msg_str, "make_cofee");
 
       // first get a Coffee object
-      this->in_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->in_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get some index into Coffee_Flavor [].
@@ -104,7 +104,7 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref
 
       // set the attribute of the object
       ACE_OS::strcpy (msg_str, "set coffee attribute");
-      this->in_->description (desc TAO_ENV_ARG_PARAMETER); // set the attribute for the in object
+      this->in_->description (desc ACE_ENV_ARG_PARAMETER); // set the attribute for the in object
       ACE_TRY_CHECK;
 
       this->inout_ = Coffee::_nil ();
@@ -125,7 +125,7 @@ int
 Test_ObjRef::reset_parameters (void)
 {
   // Environemnt variable
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   Coffee::Desc desc;
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -136,7 +136,7 @@ Test_ObjRef::reset_parameters (void)
   ACE_TRY
     {
       // set the attribute of the object
-      this->in_->description (desc TAO_ENV_ARG_PARAMETER); // set the attribute for the in object
+      this->in_->description (desc ACE_ENV_ARG_PARAMETER); // set the attribute for the in object
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -155,7 +155,7 @@ Test_ObjRef::reset_parameters (void)
 
 int
 Test_ObjRef::run_sii_test (Param_Test_ptr objref
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -164,7 +164,7 @@ Test_ObjRef::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_objref (this->in_.in (),
                                         this->inout_.inout (),
                                         out
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -183,7 +183,7 @@ CORBA::Boolean
 Test_ObjRef::check_validity (void)
 {
   // Environemnt variable
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -193,24 +193,24 @@ Test_ObjRef::check_validity (void)
           || CORBA::is_nil (this->ret_.in ()))
         return 0;
       Coffee::Desc_var in_desc =
-        this->in_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->in_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *in = in_desc->name.in ();
 
       Coffee::Desc_var inout_desc =
-        this->inout_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->inout_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *inout = inout_desc->name.in ();
 
       Coffee::Desc_var out_desc =
-        this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char *out = out_desc->name.in ();
 
-      Coffee::Desc_var ret_desc = this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Coffee::Desc_var ret_desc = this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       const char* ret = ret_desc->name.in ();
@@ -241,7 +241,7 @@ void
 Test_ObjRef::print_values (void)
 {
   // Env. variable
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   Coffee::Desc_var ret_desc;
   const char *in = 0;
@@ -250,23 +250,23 @@ Test_ObjRef::print_values (void)
   ACE_TRY
     {
       Coffee::Desc_var in_desc =
-        this->in_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->in_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       in = in_desc->name.in ();
 
       Coffee::Desc_var inout_desc =
-        this->inout_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->inout_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       inout = inout_desc->name.in ();
 
       Coffee::Desc_var out_desc =
-        this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+        this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       out = out_desc->name.in ();
 
-      ret_desc = this->out_->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+      ret_desc = this->out_->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h
index fb03eb03ac2..023829729fc 100644
--- a/TAO/tests/Param_Test/objref.h
+++ b/TAO/tests/Param_Test/objref.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index 4489417361f..35b97524b65 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -49,7 +49,7 @@ Test_Objref_Struct::opname (void) const
 
 void
 Test_Objref_Struct::dii_req_invoke (CORBA::Request *req
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -57,7 +57,7 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Objref_Struct);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Objref_Struct *tmp;
@@ -65,13 +65,13 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Objref_Struct (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Objref_Struct (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Objref_Struct (*tmp);
@@ -79,7 +79,7 @@ Test_Objref_Struct::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Objref_Struct::init_parameters (Param_Test_ptr objref
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -88,14 +88,14 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref
       // Set the long member.
       this->in_.x = gen->gen_long ();
 
-      this->in_.y = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->in_.y = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Coffee::Desc d;
       d.name = gen->gen_string ();
 
       this->in_.y->description (d
-                                TAO_ENV_ARG_PARAMETER);
+                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
             this->inout_->x = 0;
@@ -136,7 +136,7 @@ Test_Objref_Struct::reset_parameters (void)
 
 int
 Test_Objref_Struct::run_sii_test (Param_Test_ptr objref
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -145,7 +145,7 @@ Test_Objref_Struct::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_objref_struct (this->in_,
                                                this->inout_.inout (),
                                                out
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -168,7 +168,7 @@ Test_Objref_Struct::check_validity (void)
       || this->in_.x != this->ret_->x)
     return 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -180,16 +180,16 @@ Test_Objref_Struct::check_validity (void)
           return 0;
         }
 
-      Coffee::Desc_var s_in = this->in_.y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Coffee::Desc_var s_in = this->in_.y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Coffee::Desc_var s_out = this->out_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Coffee::Desc_var s_out = this->out_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Coffee::Desc_var s_inout = this->inout_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Coffee::Desc_var s_inout = this->inout_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Coffee::Desc_var s_ret = this->ret_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Coffee::Desc_var s_ret = this->ret_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ACE_OS::strcmp (s_in->name, s_out->name) != 0
@@ -231,21 +231,21 @@ Test_Objref_Struct::print_values (void)
               this->out_->x,
               this->ret_->x ));
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
 
-      Coffee::Desc_var s_in = this->in_.y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Coffee::Desc_var s_in = this->in_.y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Coffee::Desc_var s_out = this->out_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Coffee::Desc_var s_out = this->out_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Coffee::Desc_var s_inout = this->inout_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Coffee::Desc_var s_inout = this->inout_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Coffee::Desc_var s_ret = this->ret_->y->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Coffee::Desc_var s_ret = this->ret_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h
index 2f517ef9b6f..8a2aaf06665 100644
--- a/TAO/tests/Param_Test/objref_struct.h
+++ b/TAO/tests/Param_Test/objref_struct.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index 689e66c5c81..09e993346be 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -35,7 +35,7 @@ Coffee_i::~Coffee_i (void)
 
 // get attribute
 Coffee::Desc *
-Coffee_i::description (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/)
+Coffee_i::description (ACE_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Coffee::Desc *desc = new Coffee::Desc;
@@ -46,7 +46,7 @@ Coffee_i::description (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*env*/)
 // set attribute
 void
 Coffee_i::description (const Coffee::Desc &description
-                       TAO_ENV_ARG_DECL_NOT_USED /*env*/)
+                       ACE_ENV_ARG_DECL_NOT_USED /*env*/)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->name_ = CORBA::string_dup (description.name);
@@ -75,7 +75,7 @@ CORBA::Short
 Param_Test_i::test_short (CORBA::Short s1,
                           CORBA::Short &s2,
                           CORBA::Short_out s3
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = (CORBA::Short) (s1 * 2);
@@ -94,7 +94,7 @@ CORBA::ULongLong
 Param_Test_i::test_ulonglong (CORBA::ULongLong s1,
                               CORBA::ULongLong &s2,
                               CORBA::ULongLong_out s3
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = s1 * 2;
@@ -109,7 +109,7 @@ char *
 Param_Test_i::test_unbounded_string (const char *s1,
                                      char *&s2,
                                      CORBA::String_out s3
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *retstr = CORBA::string_dup (s1);
@@ -128,7 +128,7 @@ char *
 Param_Test_i::test_bounded_string (const char *s1,
                                    char *&s2,
                                    CORBA::String_out s3
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char *retstr = CORBA::string_dup (s1);
@@ -147,7 +147,7 @@ CORBA::WChar *
 Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1,
                                       CORBA::WChar *&ws2,
                                       CORBA::WString_out ws3
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::WChar *retwstr = CORBA::wstring_dup (ws1);
@@ -170,7 +170,7 @@ CORBA::WChar *
 Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1,
                                     CORBA::WChar *&ws2,
                                     CORBA::WString_out ws3
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::WChar *retwstr = CORBA::wstring_dup (ws1);
@@ -191,7 +191,7 @@ Param_Test::Fixed_Struct
 Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1,
                                  Param_Test::Fixed_Struct &s2,
                                  Param_Test::Fixed_Struct_out s3
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   s2 = s1;
@@ -205,7 +205,7 @@ Param_Test::Long_Seq *
 Param_Test_i::test_long_sequence (const Param_Test::Long_Seq & s1,
                                   Param_Test::Long_Seq & s2,
                                   Param_Test::Long_Seq_out s3
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Long_Seq
@@ -223,7 +223,7 @@ Param_Test::Short_Seq *
 Param_Test_i::test_short_sequence (const Param_Test::Short_Seq & s1,
                                    Param_Test::Short_Seq & s2,
                                    Param_Test::Short_Seq_out s3
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Short_Seq
@@ -241,7 +241,7 @@ Param_Test::Bounded_Short_Seq *
 Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq & s1,
                                            Param_Test::Bounded_Short_Seq & s2,
                                            Param_Test::Bounded_Short_Seq_out s3
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_Short_Seq
@@ -259,7 +259,7 @@ Param_Test::Bounded_Long_Seq *
 Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s1,
                                           Param_Test::Bounded_Long_Seq & s2,
                                           Param_Test::Bounded_Long_Seq_out s3
-                                          TAO_ENV_ARG_DECL_NOT_USED)
+                                          ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_Long_Seq
@@ -277,7 +277,7 @@ Param_Test::StrSeq *
 Param_Test_i::test_strseq (const Param_Test::StrSeq &s1,
                            Param_Test::StrSeq &s2,
                            Param_Test::StrSeq_out s3
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -313,7 +313,7 @@ Param_Test::Bounded_StrSeq *
 Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1,
                                    Param_Test::Bounded_StrSeq & s2,
                                    Param_Test::Bounded_StrSeq_out s3
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -334,7 +334,7 @@ Param_Test::WStrSeq *
 Param_Test_i::test_wstrseq (const Param_Test::WStrSeq &ws1,
                             Param_Test::WStrSeq &ws2,
                             Param_Test::WStrSeq_out ws3
-                            TAO_ENV_ARG_DECL_NOT_USED)
+                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -355,7 +355,7 @@ Param_Test::Bounded_WStrSeq *
 Param_Test_i::test_bounded_wstrseq (const Param_Test::Bounded_WStrSeq & ws1,
                                     Param_Test::Bounded_WStrSeq & ws2,
                                     Param_Test::Bounded_WStrSeq_out ws3
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -377,7 +377,7 @@ Param_Test::StructSeq *
 Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1,
                                     Param_Test::StructSeq &s2,
                                     Param_Test::StructSeq_out s3
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -400,7 +400,7 @@ Param_Test::Bounded_StructSeq *
 Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq & s1,
                                             Param_Test::Bounded_StructSeq & s2,
                                             Param_Test::Bounded_StructSeq_out s3
-                                            TAO_ENV_ARG_DECL_NOT_USED)
+                                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_StructSeq
@@ -419,7 +419,7 @@ Param_Test::PathSpec *
 Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1,
                                               Param_Test::PathSpec & s2,
                                               Param_Test::PathSpec_out s3
-                                              TAO_ENV_ARG_DECL_NOT_USED)
+                                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::PathSpec
@@ -452,7 +452,7 @@ Param_Test::ArraySeq *
 Param_Test_i::test_array_sequence (const Param_Test::ArraySeq &s1,
                                    Param_Test::ArraySeq &s2,
                                    Param_Test::ArraySeq_out s3
-                                   TAO_ENV_ARG_DECL_NOT_USED)
+                                   ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -475,7 +475,7 @@ Param_Test::Bounded_ArraySeq *
 Param_Test_i::test_bounded_array_sequence (const Param_Test::Bounded_ArraySeq & s1,
                                            Param_Test::Bounded_ArraySeq & s2,
                                            Param_Test::Bounded_ArraySeq_out s3
-                                           TAO_ENV_ARG_DECL_NOT_USED)
+                                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_ArraySeq
@@ -493,7 +493,7 @@ Param_Test::Coffee_Mix *
 Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1,
                               Param_Test::Coffee_Mix & s2,
                               Param_Test::Coffee_Mix_out s3
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Coffee_Mix
@@ -536,7 +536,7 @@ Param_Test::Bounded_Coffee_Mix *
 Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1,
                                       Param_Test::Bounded_Coffee_Mix & s2,
                                       Param_Test::Bounded_Coffee_Mix_out s3
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Bounded_Coffee_Mix
@@ -579,7 +579,7 @@ Param_Test::AnySeq *
 Param_Test_i::test_anyseq (const Param_Test::AnySeq &s1,
                            Param_Test::AnySeq &s2,
                            Param_Test::AnySeq_out s3
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -603,7 +603,7 @@ Param_Test::Var_Struct *
 Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1,
                                Param_Test::Var_Struct &s2,
                                Param_Test::Var_Struct_out s3
-                               TAO_ENV_ARG_DECL_NOT_USED)
+                               ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -625,7 +625,7 @@ Param_Test::Nested_Struct *
 Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1,
                                   Param_Test::Nested_Struct &s2,
                                   Param_Test::Nested_Struct_out s3
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -647,7 +647,7 @@ Param_Test::Recursive_Struct *
 Param_Test_i::test_recursive_struct (const Param_Test::Recursive_Struct &s1,
                                      Param_Test::Recursive_Struct &s2,
                                      Param_Test::Recursive_Struct_out s3
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" structs into all the inout, out and return sequences.
@@ -668,7 +668,7 @@ Param_Test::Objref_Struct *
 Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
                                   Param_Test::Objref_Struct &s2,
                                   Param_Test::Objref_Struct_out s3
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we copy the "in" sequences into all the inout, out and return sequences.
@@ -687,10 +687,10 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
 
 // make a Coffee object
 Coffee_ptr
-Param_Test_i::make_coffee (TAO_ENV_SINGLE_ARG_DECL)
+Param_Test_i::make_coffee (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->obj_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return this->obj_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // test for object references
@@ -698,21 +698,21 @@ Coffee_ptr
 Param_Test_i::test_objref (Coffee_ptr o1,
                            Coffee_ptr &o2,
                            Coffee_out o3
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Coffee_ptr ret = Coffee::_nil ();
 
   ACE_TRY
     {
-      Coffee_var myobj = obj_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      Coffee_var myobj = obj_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (o2))
         CORBA::release (o2);
 
       CORBA::Boolean equiv = myobj->_is_equivalent (o1
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (equiv)
@@ -747,7 +747,7 @@ CORBA::TypeCode_ptr
 Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1,
                              CORBA::TypeCode_ptr &t2,
                              CORBA::TypeCode_out t3
-                             TAO_ENV_ARG_DECL_NOT_USED/*env*/)
+                             ACE_ENV_ARG_DECL_NOT_USED/*env*/)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // we simply assign t1 to the others
@@ -762,7 +762,7 @@ CORBA::Any *
 Param_Test_i::test_any (const CORBA::Any &a1,
                         CORBA::Any &a2,
                         CORBA::Any_out a3
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any *ret;
@@ -784,7 +784,7 @@ Param_Test_i::test_any (const CORBA::Any &a1,
   if (TAO_debug_level > 0)
     {
       CORBA::TypeCode_var tc = a1.type ();
-      int kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
+      int kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       ACE_DEBUG ((LM_DEBUG,
@@ -929,7 +929,7 @@ Param_Test::Fixed_Array_slice *
 Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1,
                                 Param_Test::Fixed_Array a2,
                                 Param_Test::Fixed_Array_out a3
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Fixed_Array_slice *ret;
@@ -945,7 +945,7 @@ Param_Test::Var_Array_slice *
 Param_Test_i::test_var_array (const Param_Test::Var_Array a1,
                               Param_Test::Var_Array a2,
                               Param_Test::Var_Array_out a3
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Var_Array_slice *ret;
@@ -960,7 +960,7 @@ CORBA::ULong
 Param_Test_i::test_exception (CORBA::ULong s1,
                               CORBA::ULong& s2,
                               CORBA::ULong_out s3
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Param_Test::Ooops))
 {
@@ -981,7 +981,7 @@ Param_Test_i::test_exception (CORBA::ULong s1,
   // warning that test_exception is throwing an exception
   // not in its THROW_SPEC, but still test TAO's
   // conversion of such an exception to UNKNOWN.
-  this->throw_badboy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->throw_badboy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return 0;
@@ -991,7 +991,7 @@ Param_Test::Big_Union*
 Param_Test_i::test_big_union (const Param_Test::Big_Union& u1,
                               Param_Test::Big_Union& u2,
                               Param_Test::Big_Union_out u3
-                              TAO_ENV_ARG_DECL_NOT_USED)
+                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Big_Union_var ret (new Param_Test::Big_Union (u1));
@@ -1004,7 +1004,7 @@ Param_Test::Small_Union
 Param_Test_i::test_small_union (const Param_Test::Small_Union& u1,
                                 Param_Test::Small_Union& u2,
                                 Param_Test::Small_Union_out u3
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u2 = u1;
@@ -1016,7 +1016,7 @@ Param_Test::Recursive_Union*
 Param_Test_i::test_recursive_union (const Param_Test::Recursive_Union& ru1,
                                     Param_Test::Recursive_Union& ru2,
                                     Param_Test::Recursive_Union_out ru3
-                                    TAO_ENV_ARG_DECL_NOT_USED)
+                                    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Recursive_Union_var ret (new Param_Test::Recursive_Union (ru1));
@@ -1029,7 +1029,7 @@ CORBA::Any*
 Param_Test_i::test_complex_any (const CORBA::Any &a1,
                                 CORBA::Any &a2,
                                 CORBA::Any_out a3
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Any_var ret (new CORBA::Any (a1));
@@ -1042,7 +1042,7 @@ Param_Test::Multdim_Array_slice *
 Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
                                   Param_Test::Multdim_Array a2,
                                   Param_Test::Multdim_Array_out a3
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Param_Test::Multdim_Array_slice *ret;
@@ -1054,14 +1054,14 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
 }
 
 void
-Param_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Param_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
 }
 
 void
-Param_Test_i::throw_badboy (TAO_ENV_SINGLE_ARG_DECL)
+Param_Test_i::throw_badboy (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_THROW (Param_Test::BadBoy ());
 }
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index 31ba05dedf1..219f2b2c1ea 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -31,12 +31,12 @@ public:
 
   // =methods for the attribute
 
-  virtual Coffee::Desc * description (TAO_ENV_SINGLE_ARG_DECL)
+  virtual Coffee::Desc * description (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // get attribute
 
   virtual void description (const Coffee::Desc &description
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // set attribute
 
@@ -63,42 +63,42 @@ public:
   virtual CORBA::Short test_short (CORBA::Short s1,
                                    CORBA::Short &s2,
                                    CORBA::Short_out s3
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for shorts
 
   virtual CORBA::ULongLong test_ulonglong (CORBA::ULongLong s1,
                                            CORBA::ULongLong &s2,
                                            CORBA::ULongLong_out s3
-                                           TAO_ENV_ARG_DECL)
+                                           ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for unsigned long long
 
   virtual char *test_unbounded_string (const char *s1,
                                        char *&s2,
                                        CORBA::String_out s3
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for unbounded strings
 
   virtual char *test_bounded_string (const char *s1,
                                      char *&s2,
                                      CORBA::String_out s3
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for bounded strings
 
   virtual CORBA::WChar *test_unbounded_wstring (const CORBA::WChar *ws1,
                                                 CORBA::WChar *&ws2,
                                                 CORBA::WString_out ws3
-                                                TAO_ENV_ARG_DECL)
+                                                ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for unbounded wstrings
 
   virtual CORBA::WChar *test_bounded_wstring (const CORBA::WChar *ws1,
                                               CORBA::WChar *&ws2,
                                               CORBA::WString_out ws3
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for bounded wstrings
 
@@ -106,7 +106,7 @@ public:
   test_fixed_struct (const Param_Test::Fixed_Struct &s1,
                      Param_Test::Fixed_Struct &s2,
                      Param_Test::Fixed_Struct_out s3
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // test for fixed structures
 
@@ -115,97 +115,97 @@ public:
       const Param_Test::Long_Seq & s1,
       Param_Test::Long_Seq & s2,
       Param_Test::Long_Seq_out s3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_Long_Seq * test_bounded_long_sequence (
       const Param_Test::Bounded_Long_Seq & s1,
       Param_Test::Bounded_Long_Seq & s2,
       Param_Test::Bounded_Long_Seq_out s3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Short_Seq * test_short_sequence (
       const Param_Test::Short_Seq & s1,
       Param_Test::Short_Seq & s2,
       Param_Test::Short_Seq_out s3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_Short_Seq * test_bounded_short_sequence (
           const Param_Test::Bounded_Short_Seq & s1,
       Param_Test::Bounded_Short_Seq & s2,
       Param_Test::Bounded_Short_Seq_out s3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::StrSeq * test_strseq (
       const Param_Test::StrSeq & s1,
       Param_Test::StrSeq & s2,
       Param_Test::StrSeq_out s3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_StrSeq * test_bounded_strseq (
       const Param_Test::Bounded_StrSeq & s1,
       Param_Test::Bounded_StrSeq & s2,
       Param_Test::Bounded_StrSeq_out s3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::WStrSeq * test_wstrseq (
       const Param_Test::WStrSeq & ws1,
       Param_Test::WStrSeq & ws2,
       Param_Test::WStrSeq_out ws3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_WStrSeq * test_bounded_wstrseq (
       const Param_Test::Bounded_WStrSeq & ws1,
       Param_Test::Bounded_WStrSeq & ws2,
       Param_Test::Bounded_WStrSeq_out ws3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::StructSeq * test_struct_sequence (
       const Param_Test::StructSeq & s1,
       Param_Test::StructSeq & s2,
       Param_Test::StructSeq_out s3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::PathSpec * test_unbounded_struct_sequence (
       const Param_Test::PathSpec & s1,
       Param_Test::PathSpec & s2,
       Param_Test::PathSpec_out s3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_StructSeq * test_bounded_struct_sequence (
       const Param_Test::Bounded_StructSeq & s1,
       Param_Test::Bounded_StructSeq & s2,
       Param_Test::Bounded_StructSeq_out s3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::ArraySeq * test_array_sequence (
       const Param_Test::ArraySeq & s1,
       Param_Test::ArraySeq & s2,
       Param_Test::ArraySeq_out s3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_ArraySeq * test_bounded_array_sequence (
       const Param_Test::Bounded_ArraySeq & s1,
       Param_Test::Bounded_ArraySeq & s2,
       Param_Test::Bounded_ArraySeq_out s3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Coffee_Mix * test_coffe_mix (
       const Param_Test::Coffee_Mix & s1,
       Param_Test::Coffee_Mix & s2,
       Param_Test::Coffee_Mix_out s3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::Bounded_Coffee_Mix * test_bounded_coffe_mix (
       const Param_Test::Bounded_Coffee_Mix & s1,
       Param_Test::Bounded_Coffee_Mix & s2,
       Param_Test::Bounded_Coffee_Mix_out s3
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual Param_Test::AnySeq * test_anyseq (
           const Param_Test::AnySeq & s1,
           Param_Test::AnySeq & s2,
           Param_Test::AnySeq_out s3
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // = End of sequences tests....
 
@@ -213,7 +213,7 @@ public:
   test_var_struct (const Param_Test::Var_Struct &s1,
                    Param_Test::Var_Struct &s2,
                    Param_Test::Var_Struct_out s3
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for variable structs
 
@@ -221,7 +221,7 @@ public:
   test_nested_struct (const Param_Test::Nested_Struct &s1,
                       Param_Test::Nested_Struct &s2,
                       Param_Test::Nested_Struct_out s3
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for nested structs
 
@@ -229,7 +229,7 @@ public:
     test_recursive_struct (const Param_Test::Recursive_Struct &rs1,
                            Param_Test::Recursive_Struct &rs2,
                            Param_Test::Recursive_Struct_out rs3
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for recursive structs
 
@@ -237,11 +237,11 @@ public:
   test_objref_struct (const Param_Test::Objref_Struct &s1,
                       Param_Test::Objref_Struct &s2,
                       Param_Test::Objref_Struct_out s3
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Coffee_ptr
-  make_coffee (TAO_ENV_SINGLE_ARG_DECL)
+  make_coffee (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // make a coffee object
 
@@ -249,7 +249,7 @@ public:
   test_objref (Coffee_ptr o1,
                Coffee_ptr &o2,
                Coffee_out o3
-               TAO_ENV_ARG_DECL)
+               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for object references
 
@@ -257,7 +257,7 @@ public:
   test_typecode (CORBA::TypeCode_ptr t1,
                  CORBA::TypeCode_ptr &o2,
                  CORBA::TypeCode_out o3
-                 TAO_ENV_ARG_DECL)
+                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for typecodes
 
@@ -265,7 +265,7 @@ public:
   test_any (const CORBA::Any &a1,
             CORBA::Any &a2,
             CORBA::Any_out a3
-            TAO_ENV_ARG_DECL)
+            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for Anys
 
@@ -273,7 +273,7 @@ public:
   test_fixed_array (const Param_Test::Fixed_Array a1,
                     Param_Test::Fixed_Array a2,
                     Param_Test::Fixed_Array_out a3
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for fixed size arrays
 
@@ -281,14 +281,14 @@ public:
   test_var_array (const Param_Test::Var_Array a1,
                   Param_Test::Var_Array a2,
                   Param_Test::Var_Array_out a3
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // test for arrays of variable types
 
   virtual CORBA::ULong test_exception (CORBA::ULong s1,
                                        CORBA::ULong& s2,
                                        CORBA::ULong_out s3
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Param_Test::Ooops));
 
@@ -296,28 +296,28 @@ public:
     test_big_union (const Param_Test::Big_Union& u1,
                     Param_Test::Big_Union& u2,
                     Param_Test::Big_Union_out u3
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Param_Test::Small_Union
     test_small_union (const Param_Test::Small_Union& u1,
                       Param_Test::Small_Union& u2,
                       Param_Test::Small_Union_out u3
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Param_Test::Recursive_Union*
     test_recursive_union (const Param_Test::Recursive_Union& ru1,
                           Param_Test::Recursive_Union& ru2,
                           Param_Test::Recursive_Union_out ru3
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any*
     test_complex_any (const CORBA::Any &a1,
                       CORBA::Any &a2,
                       CORBA::Any_out a3
-                      TAO_ENV_ARG_DECL)
+                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Test for multi dimensional arrays
@@ -325,10 +325,10 @@ public:
   test_multdim_array (const Param_Test::Multdim_Array,
                       Param_Test::Multdim_Array ,
                       Param_Test::Multdim_Array_out
-                      TAO_ENV_ARG_DECL_NOT_USED)
+                      ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -339,7 +339,7 @@ private:
   Coffee_i obj_;
   // the coffee object reference we maintain
 
-  void throw_badboy (TAO_ENV_SINGLE_ARG_DECL);
+  void throw_badboy (ACE_ENV_SINGLE_ARG_DECL);
   // Called by test_exception. This will avoid the compiler
   // warning that test_exception is throwing an exception
   // not in its THROW_SPEC, but still test TAO's
diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp
index cbe8190640b..1e4f34d3f65 100644
--- a/TAO/tests/Param_Test/recursive_struct.cpp
+++ b/TAO/tests/Param_Test/recursive_struct.cpp
@@ -48,7 +48,7 @@ Test_Recursive_Struct::opname (void) const
 
 void
 Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Recursive_Struct);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Recursive_Struct *tmp;
@@ -64,13 +64,13 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Recursive_Struct (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Recursive_Struct (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Recursive_Struct (*tmp);
@@ -78,7 +78,7 @@ Test_Recursive_Struct::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Recursive_Struct::init_parameters (Param_Test_ptr
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   // The client calls init_parameters() before the first
   // call and reset_parameters() after each call. For this
@@ -117,7 +117,7 @@ Test_Recursive_Struct::reset_parameters (void)
 
 int
 Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -126,7 +126,7 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_recursive_struct (this->in_,
                                                   this->inout_.inout (),
                                                   out
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/recursive_struct.h b/TAO/tests/Param_Test/recursive_struct.h
index 9837523a401..18175cb53bd 100644
--- a/TAO/tests/Param_Test/recursive_struct.h
+++ b/TAO/tests/Param_Test/recursive_struct.h
@@ -36,14 +36,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -59,7 +59,7 @@ public:
   // print all the values
 
   void dii_req_invoke (CORBA::Request *
-                       TAO_ENV_ARG_DECL_NOT_USED);
+                       ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp
index 1c9ec710040..b868c76ee54 100644
--- a/TAO/tests/Param_Test/recursive_union.cpp
+++ b/TAO/tests/Param_Test/recursive_union.cpp
@@ -48,7 +48,7 @@ Test_Recursive_Union::opname (void) const
 
 void
 Test_Recursive_Union::dii_req_invoke (CORBA::Request *req
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Recursive_Union);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Recursive_Union *tmp;
@@ -64,13 +64,13 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Recursive_Union (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Recursive_Union (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Recursive_Union (*tmp);
@@ -78,7 +78,7 @@ Test_Recursive_Union::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Recursive_Union::init_parameters (Param_Test_ptr
-                                       TAO_ENV_ARG_DECL_NOT_USED)
+                                       ACE_ENV_ARG_DECL_NOT_USED)
 {
   // The client calls init_parameters() before the first
   // call and reset_parameters() after each call. For this
@@ -119,7 +119,7 @@ Test_Recursive_Union::reset_parameters (void)
 
 int
 Test_Recursive_Union::run_sii_test (Param_Test_ptr objref
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -128,7 +128,7 @@ Test_Recursive_Union::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_recursive_union (this->in_,
                                                  this->inout_.inout (),
                                                  out
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/recursive_union.h b/TAO/tests/Param_Test/recursive_union.h
index 33870fecbf6..5ebeaac1dd7 100644
--- a/TAO/tests/Param_Test/recursive_union.h
+++ b/TAO/tests/Param_Test/recursive_union.h
@@ -36,14 +36,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -59,7 +59,7 @@ public:
   // print all the values
 
   void dii_req_invoke (CORBA::Request *
-                       TAO_ENV_ARG_DECL_NOT_USED);
+                       ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp
index 23ce8f75a3e..481e82837e3 100644
--- a/TAO/tests/Param_Test/results.cpp
+++ b/TAO/tests/Param_Test/results.cpp
@@ -103,7 +103,7 @@ Results::print_stats (void)
 
 void
 Results::print_exception (const char * /* call_name */
-                          TAO_ENV_ARG_DECL_NOT_USED)
+                          ACE_ENV_ARG_DECL_NOT_USED)
 {
   //ACE_PRINT_EXCEPTION (call_name);
 }
diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h
index 81225cd2d01..e4cf1941a26 100644
--- a/TAO/tests/Param_Test/results.h
+++ b/TAO/tests/Param_Test/results.h
@@ -39,7 +39,7 @@ public:
   // prints the time stats
 
   void print_exception (const char *call_name
-                        TAO_ENV_ARG_DECL_NOT_USED);
+                        ACE_ENV_ARG_DECL_NOT_USED);
   // print the exception
 
   void start_timer (void);
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index 2fa7b83009e..d148bb4fa2d 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -61,12 +61,12 @@ main (int argc, char *argv[])
   PortableServer::POA_var oa_ptr;
   Param_Test_i *param_test = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       const char *orb_name = "";
       CORBA::ORB_var orb_ptr =
-        CORBA::ORB_init (argc, argv, orb_name TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var temp; // holder for the myriad of times we get
@@ -75,7 +75,7 @@ main (int argc, char *argv[])
       // Get the Root POA
 
       temp = orb_ptr->resolve_initial_references ("RootPOA"
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (temp.in()))
@@ -83,21 +83,21 @@ main (int argc, char *argv[])
                            "(%P|%t) Unable to get root poa reference.\n"),
                           1);
 
-      oa_ptr = PortableServer::POA::_narrow (temp.in() TAO_ENV_ARG_PARAMETER);
+      oa_ptr = PortableServer::POA::_narrow (temp.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        oa_ptr->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        oa_ptr->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyList policies (2);
       policies.length (2);
       policies[0] =
         oa_ptr->create_id_assignment_policy (PortableServer::USER_ID
-                                             TAO_ENV_ARG_PARAMETER);
+                                             ACE_ENV_ARG_PARAMETER);
       policies[1] =
         oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
 
       // We use a different POA, otherwise the user would have to
       // change the object key each time it invokes the server.
@@ -105,7 +105,7 @@ main (int argc, char *argv[])
         oa_ptr->create_POA ("child_poa",
                             poa_manager.in (),
                             policies
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse remaining command line and verify parameters.
@@ -124,19 +124,19 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("param_test");
       good_poa->activate_object_with_id (id.in (),
                                          param_test
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Stringify the objref we'll be implementing, and print it to
       // stdout.  Someone will take that string and give it to a
       // client.  Then release the object.
 
-      temp = good_poa->id_to_reference (id.in () TAO_ENV_ARG_PARAMETER);
+      temp = good_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
         orb_ptr->object_to_string (temp.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (TAO_debug_level > 0)
@@ -149,20 +149,20 @@ main (int argc, char *argv[])
 
 
       // Make the POAs controlled by this manager active
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb_ptr->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb_ptr->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       good_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       oa_ptr->destroy (1,
                        1
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp
index 6c906cbbadd..68d02b1db10 100644
--- a/TAO/tests/Param_Test/short.cpp
+++ b/TAO/tests/Param_Test/short.cpp
@@ -44,7 +44,7 @@ Test_Short::opname (void) const
 
 void
 Test_Short::dii_req_invoke (CORBA::Request *req
-                            TAO_ENV_ARG_DECL)
+                            ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -52,25 +52,25 @@ Test_Short::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_short);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   req->return_value () >>= this->ret_;
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= this->inout_;
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= this->out_;
 }
 
 int
 Test_Short::init_parameters (Param_Test_ptr /*objref*/
-                             TAO_ENV_ARG_DECL_NOT_USED)
+                             ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -90,14 +90,14 @@ Test_Short::reset_parameters (void)
 
 int
 Test_Short::run_sii_test (Param_Test_ptr objref
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_short (this->in_,
                                        this->inout_,
                                        this->out_
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h
index 2304e0f2671..5157b673c74 100644
--- a/TAO/tests/Param_Test/short.h
+++ b/TAO/tests/Param_Test/short.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp
index 555e42c38c8..6c05b360cbb 100644
--- a/TAO/tests/Param_Test/small_union.cpp
+++ b/TAO/tests/Param_Test/small_union.cpp
@@ -46,7 +46,7 @@ Test_Small_Union::opname (void) const
 
 void
 Test_Small_Union::dii_req_invoke (CORBA::Request *req
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -54,7 +54,7 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Small_Union);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Small_Union *tmp;
@@ -62,13 +62,13 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Small_Union (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = *tmp;
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Small_Union (*tmp);
@@ -76,12 +76,12 @@ Test_Small_Union::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Small_Union::init_parameters (Param_Test_ptr objref
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       // get access to a Coffee Object
-      this->cobj_ = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->cobj_ = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->reset_parameters ();
@@ -130,14 +130,14 @@ Test_Small_Union::reset_parameters (void)
 
 int
 Test_Small_Union::run_sii_test (Param_Test_ptr objref
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_small_union (this->in_,
                                            this->inout_,
                                            this->out_
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/small_union.h b/TAO/tests/Param_Test/small_union.h
index 0e6124c80e3..bea055565b4 100644
--- a/TAO/tests/Param_Test/small_union.h
+++ b/TAO/tests/Param_Test/small_union.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp
index 23972a2ef3f..44b891b6ac9 100644
--- a/TAO/tests/Param_Test/typecode.cpp
+++ b/TAO/tests/Param_Test/typecode.cpp
@@ -44,7 +44,7 @@ Test_TypeCode::opname (void) const
 
 void
 Test_TypeCode::dii_req_invoke (CORBA::Request *req
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -52,7 +52,7 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_TypeCode);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_ptr tmp;
@@ -60,13 +60,13 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req
   this->ret_ = CORBA::TypeCode::_duplicate (tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = CORBA::TypeCode::_duplicate (tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = CORBA::TypeCode::_duplicate (tmp);
@@ -74,7 +74,7 @@ Test_TypeCode::dii_req_invoke (CORBA::Request *req
 
 int
 Test_TypeCode::init_parameters (Param_Test_ptr
-                                TAO_ENV_ARG_DECL_NOT_USED)
+                                ACE_ENV_ARG_DECL_NOT_USED)
 {
   static CORBA::TypeCode_ptr tc_table [] =
     {
@@ -116,11 +116,11 @@ Test_TypeCode::reset_parameters (void)
 
 int
 Test_TypeCode::run_sii_test (Param_Test_ptr objref
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      this->init_parameters (objref TAO_ENV_ARG_PARAMETER);
+      this->init_parameters (objref ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::TypeCode_out out (this->out_);
@@ -128,7 +128,7 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_typecode (this->in_.in (),
                                           this->inout_.inout (),
                                           out
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -146,22 +146,22 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref
 CORBA::Boolean
 Test_TypeCode::check_validity (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::Boolean one, two, three;
 
       one = this->in_.in ()->equal (this->inout_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       two = this->in_.in ()->equal (this->out_.in ()
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       three = this->in_.in ()->equal (this->ret_.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (one && two && three)
diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h
index 4181f902805..bb369324d6e 100644
--- a/TAO/tests/Param_Test/typecode.h
+++ b/TAO/tests/Param_Test/typecode.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index a05bc294abc..e755c773a7f 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -52,7 +52,7 @@ Test_AnySeq::opname (void) const
 
 void
 Test_AnySeq::dii_req_invoke (CORBA::Request *req
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -60,7 +60,7 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_AnySeq);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::AnySeq* tmp;
@@ -68,13 +68,13 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::AnySeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::AnySeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::AnySeq (*tmp);
@@ -82,7 +82,7 @@ Test_AnySeq::dii_req_invoke (CORBA::Request *req
 
 int
 Test_AnySeq::init_parameters (Param_Test_ptr objref
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -124,7 +124,7 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref
             ACE_TRY
               {
                 // get access to a Coffee Object
-                Coffee_var cobj = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
+                Coffee_var cobj = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
                 ACE_TRY_CHECK;
 
                 // insert the coffee object into the Any
@@ -198,7 +198,7 @@ Test_AnySeq::reset_parameters (void)
 
 int
 Test_AnySeq::run_sii_test (Param_Test_ptr objref
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -207,7 +207,7 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_anyseq (this->in_.in (),
                                         this->inout_.inout (),
                                         out
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h
index d7087b969b0..7b1efefb875 100644
--- a/TAO/tests/Param_Test/ub_any_seq.h
+++ b/TAO/tests/Param_Test/ub_any_seq.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp
index a4534a5129a..c662ac224c4 100644
--- a/TAO/tests/Param_Test/ub_array_seq.cpp
+++ b/TAO/tests/Param_Test/ub_array_seq.cpp
@@ -47,7 +47,7 @@ Test_Array_Sequence::opname (void) const
 
 void
 Test_Array_Sequence::dii_req_invoke (CORBA::Request *req
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -55,7 +55,7 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_ArraySeq);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::ArraySeq *tmp;
@@ -63,13 +63,13 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::ArraySeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::ArraySeq (*tmp);
@@ -77,7 +77,7 @@ Test_Array_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Array_Sequence::init_parameters (Param_Test_ptr
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -126,7 +126,7 @@ Test_Array_Sequence::reset_parameters (void)
 
 int
 Test_Array_Sequence::run_sii_test (Param_Test_ptr objref
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -135,7 +135,7 @@ Test_Array_Sequence::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_array_sequence (this->in_,
                                                 this->inout_.inout (),
                                                 out
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_array_seq.h b/TAO/tests/Param_Test/ub_array_seq.h
index 855c2c27565..ce888926d2e 100644
--- a/TAO/tests/Param_Test/ub_array_seq.h
+++ b/TAO/tests/Param_Test/ub_array_seq.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -58,7 +58,7 @@ public:
   // print all the values
 
   void dii_req_invoke (CORBA::Request *
-                       TAO_ENV_ARG_DECL_NOT_USED);
+                       ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp
index eeae63f57e9..d14d272722c 100644
--- a/TAO/tests/Param_Test/ub_long_seq.cpp
+++ b/TAO/tests/Param_Test/ub_long_seq.cpp
@@ -48,7 +48,7 @@ Test_Long_Sequence::opname (void) const
 
 void
 Test_Long_Sequence::dii_req_invoke (CORBA::Request *req
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Long_Seq);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Long_Seq *tmp;
@@ -64,13 +64,13 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = Param_Test::Long_Seq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = Param_Test::Long_Seq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = Param_Test::Long_Seq (*tmp);
@@ -78,7 +78,7 @@ Test_Long_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Long_Sequence::init_parameters (Param_Test_ptr
-                                     TAO_ENV_ARG_DECL_NOT_USED)
+                                     ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -108,7 +108,7 @@ Test_Long_Sequence::reset_parameters (void)
 
 int
 Test_Long_Sequence::run_sii_test (Param_Test_ptr objref
-                                  TAO_ENV_ARG_DECL)
+                                  ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -117,7 +117,7 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_long_sequence (this->in_.in (),
                                                this->inout_.inout (),
                                                out
-                                               TAO_ENV_ARG_PARAMETER);
+                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h
index 133930584f0..a73f8d4adfe 100644
--- a/TAO/tests/Param_Test/ub_long_seq.h
+++ b/TAO/tests/Param_Test/ub_long_seq.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index 99a8e7f0761..15e8b9a6cba 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -58,7 +58,7 @@ Test_ObjRef_Sequence::opname (void) const
 
 void
 Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -66,7 +66,7 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Coffee_Mix);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Coffee_Mix *tmp;
@@ -74,13 +74,13 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Coffee_Mix (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Coffee_Mix (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Coffee_Mix (*tmp);
@@ -88,7 +88,7 @@ Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -106,7 +106,7 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref
         {
           // generate some arbitrary string to be filled into the ith location in
           // the sequence
-          this->in_[i] = objref->make_coffee (TAO_ENV_SINGLE_ARG_PARAMETER);
+          this->in_[i] = objref->make_coffee (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // select a Coffee flavor at random
@@ -117,7 +117,7 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref
           Coffee_ptr tmp = this->in_[i];
 
           tmp->description (desc
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -144,7 +144,7 @@ Test_ObjRef_Sequence::reset_parameters (void)
 
 int
 Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -153,7 +153,7 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_coffe_mix (this->in_,
                                            this->inout_.inout (),
                                            out
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -171,23 +171,23 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref
 CORBA::Boolean
 Test_ObjRef_Sequence::check_validity (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       this->compare (this->in_,
                      this->inout_.in ()
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->compare (this->in_,
                      this->out_.in ()
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->compare (this->in_,
                      this->ret_.in ()
-                     TAO_ENV_ARG_PARAMETER);
+                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 1;
@@ -233,7 +233,7 @@ Test_ObjRef_Sequence::print_values (void)
 CORBA::Boolean
 Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1,
                                const Param_Test::Coffee_Mix &s2
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -261,12 +261,12 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1,
               return 0;
             }
 
-          Coffee::Desc_var desc1 = vs1->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+          Coffee::Desc_var desc1 = vs1->description (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::String_var n1 = desc1->name.in ();
 
-          Coffee::Desc_var desc2 = vs2->description (TAO_ENV_SINGLE_ARG_PARAMETER);
+          Coffee::Desc_var desc2 = vs2->description (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::String_var n2 = desc2->name.in ();
diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h
index 1955fbfdeb1..f087101b08b 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.h
+++ b/TAO/tests/Param_Test/ub_objref_seq.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,13 +57,13 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
   CORBA::Boolean compare (const Param_Test::Coffee_Mix &s1,
                           const Param_Test::Coffee_Mix &s2
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
   // compare
 
   void print_sequence (const Param_Test::Coffee_Mix &s);
diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp
index b6d97bb5af4..519c5687ee6 100644
--- a/TAO/tests/Param_Test/ub_short_seq.cpp
+++ b/TAO/tests/Param_Test/ub_short_seq.cpp
@@ -48,7 +48,7 @@ Test_Short_Sequence::opname (void) const
 
 void
 Test_Short_Sequence::dii_req_invoke (CORBA::Request *req
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Short_Seq);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Short_Seq *tmp;
@@ -64,13 +64,13 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Short_Seq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Short_Seq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Short_Seq (*tmp);
@@ -78,7 +78,7 @@ Test_Short_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Short_Sequence::init_parameters (Param_Test_ptr
-                                      TAO_ENV_ARG_DECL_NOT_USED)
+                                      ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -110,7 +110,7 @@ Test_Short_Sequence::reset_parameters (void)
 
 int
 Test_Short_Sequence::run_sii_test (Param_Test_ptr objref
-                                   TAO_ENV_ARG_DECL)
+                                   ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -119,7 +119,7 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_short_sequence (this->in_.in (),
                                                 this->inout_.inout (),
                                                 out
-                                                TAO_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h
index f15ccbe0bb2..5f433fba4e0 100644
--- a/TAO/tests/Param_Test/ub_short_seq.h
+++ b/TAO/tests/Param_Test/ub_short_seq.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index a7bb6108914..8d85803ab37 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -48,7 +48,7 @@ Test_String_Sequence::opname (void) const
 
 void
 Test_String_Sequence::dii_req_invoke (CORBA::Request *req
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_StrSeq);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::StrSeq *tmp;
@@ -64,13 +64,13 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::StrSeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::StrSeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::StrSeq (*tmp);
@@ -78,7 +78,7 @@ Test_String_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_String_Sequence::init_parameters (Param_Test_ptr
-                                       TAO_ENV_ARG_DECL_NOT_USED)
+                                       ACE_ENV_ARG_DECL_NOT_USED)
 {
   const char *choiceList[] =
   {
@@ -114,7 +114,7 @@ Test_String_Sequence::reset_parameters (void)
 
 int
 Test_String_Sequence::run_sii_test (Param_Test_ptr objref
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -123,7 +123,7 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_strseq (this->in_.in (),
                                         this->inout_.inout (),
                                         out
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h
index 5193a92a113..78f9c6f60f2 100644
--- a/TAO/tests/Param_Test/ub_str_seq.h
+++ b/TAO/tests/Param_Test/ub_str_seq.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp
index ff695b3e18e..f378c212fa6 100644
--- a/TAO/tests/Param_Test/ub_string.cpp
+++ b/TAO/tests/Param_Test/ub_string.cpp
@@ -56,7 +56,7 @@ Test_Unbounded_String::opname (void) const
 
 void
 Test_Unbounded_String::dii_req_invoke (CORBA::Request *req
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -67,7 +67,7 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_string);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *tmp;
@@ -75,13 +75,13 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req
   this->ret_ = CORBA::string_dup (tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = CORBA::string_dup (tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = CORBA::string_dup (tmp);
@@ -89,7 +89,7 @@ Test_Unbounded_String::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Unbounded_String::init_parameters (Param_Test_ptr
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -126,7 +126,7 @@ Test_Unbounded_String::reset_parameters (void)
 
 int
 Test_Unbounded_String::run_sii_test (Param_Test_ptr objref
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -135,7 +135,7 @@ Test_Unbounded_String::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_unbounded_string (this->in_,
                                                   this->inout_,
                                                   str_out
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h
index 12b02c4af4a..ed721972028 100644
--- a/TAO/tests/Param_Test/ub_string.h
+++ b/TAO/tests/Param_Test/ub_string.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index be2efce2d3d..cbf69675ddc 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -49,7 +49,7 @@ Test_Struct_Sequence::opname (void) const
 
 void
 Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -57,7 +57,7 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_StructSeq);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::StructSeq *tmp;
@@ -65,13 +65,13 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::StructSeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::StructSeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::StructSeq (*tmp);
@@ -79,7 +79,7 @@ Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Struct_Sequence::init_parameters (Param_Test_ptr
-                                       TAO_ENV_ARG_DECL_NOT_USED)
+                                       ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -111,7 +111,7 @@ Test_Struct_Sequence::reset_parameters (void)
 
 int
 Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref
-                                    TAO_ENV_ARG_DECL)
+                                    ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -120,7 +120,7 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_struct_sequence (this->in_,
                                                  this->inout_.inout (),
                                                  out
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
@@ -256,7 +256,7 @@ Test_Unbounded_Struct_Sequence::opname (void) const
 
 void
 Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
-                                                TAO_ENV_ARG_DECL)
+                                                ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -264,7 +264,7 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_PathSpec);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::PathSpec *tmp;
@@ -272,13 +272,13 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::PathSpec (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::PathSpec (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::PathSpec (*tmp);
@@ -286,7 +286,7 @@ Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr
-                                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -319,13 +319,13 @@ Test_Unbounded_Struct_Sequence::reset_parameters (void)
 
 int
 Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref
-                                              TAO_ENV_ARG_DECL)
+                                              ACE_ENV_ARG_DECL)
 {
   Param_Test::PathSpec_out out (this->out_.out ());
   this->ret_ = objref->test_unbounded_struct_sequence (this->in_,
                                                        this->inout_.inout (),
                                                        out
-                                                       TAO_ENV_ARG_PARAMETER);
+                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h
index 546d1e95854..00ce057526d 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.h
+++ b/TAO/tests/Param_Test/ub_struct_seq.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
@@ -98,14 +98,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                        TAO_ENV_ARG_DECL);
+                        ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -120,7 +120,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp
index 15852c15044..d5494df60fa 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp
@@ -48,7 +48,7 @@ Test_WString_Sequence::opname (void) const
 
 void
 Test_WString_Sequence::dii_req_invoke (CORBA::Request *req
-                                       TAO_ENV_ARG_DECL)
+                                       ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_.in ();
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -56,7 +56,7 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_WStrSeq);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::WStrSeq *tmp;
@@ -64,13 +64,13 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::WStrSeq (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::WStrSeq (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::WStrSeq (*tmp);
@@ -78,7 +78,7 @@ Test_WString_Sequence::dii_req_invoke (CORBA::Request *req
 
 int
 Test_WString_Sequence::init_parameters (Param_Test_ptr
-                                        TAO_ENV_ARG_DECL_NOT_USED)
+                                        ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -109,7 +109,7 @@ Test_WString_Sequence::reset_parameters (void)
 
 int
 Test_WString_Sequence::run_sii_test (Param_Test_ptr objref
-                                     TAO_ENV_ARG_DECL)
+                                     ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -118,7 +118,7 @@ Test_WString_Sequence::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_wstrseq (this->in_.in (),
                                          this->inout_.inout (),
                                          out
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.h b/TAO/tests/Param_Test/ub_wstr_seq.h
index 9e45909609d..c691018765d 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.h
+++ b/TAO/tests/Param_Test/ub_wstr_seq.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -58,7 +58,7 @@ public:
   // print all the values
 
   void dii_req_invoke (CORBA::Request *
-                       TAO_ENV_ARG_DECL_NOT_USED);
+                       ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp
index 255e49b96b0..bfb398c2259 100644
--- a/TAO/tests/Param_Test/ub_wstring.cpp
+++ b/TAO/tests/Param_Test/ub_wstring.cpp
@@ -56,7 +56,7 @@ Test_Unbounded_WString::opname (void) const
 
 void
 Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req
-                                        TAO_ENV_ARG_DECL)
+                                        ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -67,7 +67,7 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_wstring);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   const CORBA::WChar *tmp;
@@ -75,13 +75,13 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req
   this->ret_ = CORBA::wstring_dup (tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = CORBA::wstring_dup (tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = CORBA::wstring_dup (tmp);
@@ -89,7 +89,7 @@ Test_Unbounded_WString::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Unbounded_WString::init_parameters (Param_Test_ptr
-                                         TAO_ENV_ARG_DECL_NOT_USED)
+                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -125,7 +125,7 @@ Test_Unbounded_WString::reset_parameters (void)
 
 int
 Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref
-                                      TAO_ENV_ARG_DECL)
+                                      ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -134,7 +134,7 @@ Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_unbounded_wstring (this->in_,
                                                    this->inout_,
                                                    str_out
-                                                   TAO_ENV_ARG_PARAMETER);
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/ub_wstring.h b/TAO/tests/Param_Test/ub_wstring.h
index 5f53c7e707a..04497648c11 100644
--- a/TAO/tests/Param_Test/ub_wstring.h
+++ b/TAO/tests/Param_Test/ub_wstring.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   // print all the values
 
   void dii_req_invoke (CORBA::Request *
-                       TAO_ENV_ARG_DECL_NOT_USED);
+                       ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp
index 05360195cb3..e491c76d9f2 100644
--- a/TAO/tests/Param_Test/ulonglong.cpp
+++ b/TAO/tests/Param_Test/ulonglong.cpp
@@ -40,7 +40,7 @@ Test_ULongLong::opname (void) const
 
 void
 Test_ULongLong::dii_req_invoke (CORBA::Request *req
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_;
@@ -48,25 +48,25 @@ Test_ULongLong::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (CORBA::_tc_ulonglong);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   req->return_value () >>= this->ret_;
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= this->inout_;
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= this->out_;
 }
 
 int
 Test_ULongLong::init_parameters (Param_Test_ptr
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -86,14 +86,14 @@ Test_ULongLong::reset_parameters (void)
 
 int
 Test_ULongLong::run_sii_test (Param_Test_ptr objref
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->ret_ = objref->test_ulonglong (this->in_,
                                            this->inout_,
                                            this->out_
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h
index 6deae313e01..db9e1fa86a4 100644
--- a/TAO/tests/Param_Test/ulonglong.h
+++ b/TAO/tests/Param_Test/ulonglong.h
@@ -31,14 +31,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -53,7 +53,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index 7a429a50a7e..997600b7479 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -46,7 +46,7 @@ Test_Var_Array::opname (void) const
 
 void
 Test_Var_Array::dii_req_invoke (CORBA::Request *req
-                                TAO_ENV_ARG_DECL)
+                                ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= Param_Test::Var_Array_forany (this->in_);
   req->add_inout_arg ("s2") <<= Param_Test::Var_Array_forany (this->inout_);
@@ -54,7 +54,7 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Var_Array);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Var_Array_forany forany;
@@ -63,13 +63,13 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req
   this->ret_ = Param_Test::Var_Array_dup (forany.in ());
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= forany;
   Param_Test::Var_Array_copy (this->inout_, forany.in ());
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= forany;
   this->out_ = Param_Test::Var_Array_dup (forany.in ());
@@ -77,7 +77,7 @@ Test_Var_Array::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Var_Array::init_parameters (Param_Test_ptr
-                                 TAO_ENV_ARG_DECL_NOT_USED)
+                                 ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -104,7 +104,7 @@ Test_Var_Array::reset_parameters (void)
 
 int
 Test_Var_Array::run_sii_test (Param_Test_ptr objref
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -112,7 +112,7 @@ Test_Var_Array::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_var_array (this->in_,
                                            this->inout_,
                                            out_arr
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h
index 3bf6bff5e66..07d33162104 100644
--- a/TAO/tests/Param_Test/var_array.h
+++ b/TAO/tests/Param_Test/var_array.h
@@ -34,14 +34,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -56,7 +56,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index 849d80bcb16..ff644037acc 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -49,7 +49,7 @@ Test_Var_Struct::opname (void) const
 
 void
 Test_Var_Struct::dii_req_invoke (CORBA::Request *req
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   req->add_in_arg ("s1") <<= this->in_;
   req->add_inout_arg ("s2") <<= this->inout_.in ();
@@ -57,7 +57,7 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req
 
   req->set_return_type (Param_Test::_tc_Var_Struct);
 
-  req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
+  req->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   Param_Test::Var_Struct *tmp;
@@ -65,13 +65,13 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req
   this->ret_ = new Param_Test::Var_Struct (*tmp);
 
   CORBA::NamedValue_ptr o2 =
-    req->arguments ()->item (1 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (1 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o2->value () >>= tmp;
   this->inout_ = new Param_Test::Var_Struct (*tmp);
 
   CORBA::NamedValue_ptr o3 =
-    req->arguments ()->item (2 TAO_ENV_ARG_PARAMETER);
+    req->arguments ()->item (2 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   *o3->value () >>= tmp;
   this->out_ = new Param_Test::Var_Struct (*tmp);
@@ -79,7 +79,7 @@ Test_Var_Struct::dii_req_invoke (CORBA::Request *req
 
 int
 Test_Var_Struct::init_parameters (Param_Test_ptr
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -134,7 +134,7 @@ Test_Var_Struct::reset_parameters (void)
 
 int
 Test_Var_Struct::run_sii_test (Param_Test_ptr objref
-                               TAO_ENV_ARG_DECL)
+                               ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -142,7 +142,7 @@ Test_Var_Struct::run_sii_test (Param_Test_ptr objref
       this->ret_ = objref->test_var_struct (this->in_,
                                             this->inout_.inout (),
                                             out
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h
index f7a4228bdef..aab34fe5247 100644
--- a/TAO/tests/Param_Test/var_struct.h
+++ b/TAO/tests/Param_Test/var_struct.h
@@ -35,14 +35,14 @@ public:
   // dtor
 
   int run_sii_test (Param_Test_ptr objref
-                    TAO_ENV_ARG_DECL);
+                    ACE_ENV_ARG_DECL);
   // run the SII test
 
   const char *opname (void) const;
   // return operation name
 
   int init_parameters (Param_Test_ptr objref
-                       TAO_ENV_ARG_DECL);
+                       ACE_ENV_ARG_DECL);
   // set values for parameters
 
   int reset_parameters (void);
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request * TAO_ENV_ARG_DECL_NOT_USED);
+  void dii_req_invoke (CORBA::Request * ACE_ENV_ARG_DECL_NOT_USED);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index 549033856ae..6992cafb9d7 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -63,7 +63,7 @@ private:
                           CORBA::PolicyList_var &policies,
                           CORBA::PolicyManager_ptr policy_manager,
                           CORBA::PolicyCurrent_ptr policy_current
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
 
 private:
   CORBA::ORB_var orb_;
@@ -82,7 +82,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;
 
       if (parse_args (argc, argv) != 0)
@@ -90,11 +90,11 @@ main (int argc, char *argv[])
 
       CORBA::Object_var object =
         orb->string_to_object ("corbaloc:iiop:localhost:12345/FakeIOR"
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var test =
-        Test::_unchecked_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test::_unchecked_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (test.in ()))
@@ -145,7 +145,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
                                  CORBA::PolicyList_var &policies,
                                  CORBA::PolicyManager_ptr policy_manager,
                                  CORBA::PolicyCurrent_ptr policy_current
-                                 TAO_ENV_ARG_DECL)
+                                 ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -206,7 +206,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
 
           policy = this->orb_->create_policy (policy_type,
                                               any
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::SetOverrideType override_type = CORBA::SET_OVERRIDE;
@@ -227,7 +227,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
               CORBA::Object_var tmp =
                 this->test_->_set_policy_overrides (policy_list,
                                                     override_type
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else if (operation == ADD_CURRENT_POLICY
@@ -235,7 +235,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
             {
               policy_current->set_policy_overrides (policy_list,
                                                     override_type
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
@@ -244,24 +244,24 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
               // || operation == SET_CURRENT_POLICY)
               policy_manager->set_policy_overrides (policy_list,
                                                     override_type
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
-          policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (operation == SAVE_CURRENT_POLICIES)
         {
           CORBA::PolicyTypeSeq types;
           policies =
-            policy_current->get_policy_overrides (types TAO_ENV_ARG_PARAMETER);
+            policy_current->get_policy_overrides (types ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (operation == SAVE_MANAGER_POLICIES)
         {
           CORBA::PolicyTypeSeq types;
           policies =
-            policy_manager->get_policy_overrides (types TAO_ENV_ARG_PARAMETER);
+            policy_manager->get_policy_overrides (types ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (operation == RESTORE_CURRENT_POLICIES)
@@ -270,7 +270,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
             {
               policy_current->set_policy_overrides (policies.in (),
                                                     CORBA::SET_OVERRIDE
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -280,7 +280,7 @@ Manipulation::perform_iteration (ACE_RANDR_TYPE &seed,
             {
               policy_manager->set_policy_overrides (policies.in (),
                                                     CORBA::SET_OVERRIDE
-                                                    TAO_ENV_ARG_PARAMETER);
+                                                    ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -307,20 +307,20 @@ Manipulation::svc (void)
 #endif
       CORBA::Object_var object =
         this->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;
 
       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;
 
 
@@ -331,7 +331,7 @@ Manipulation::svc (void)
                                    policies,
                                    policy_manager.in (),
                                    policy_current.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
         }
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
index 2e59b25ca5c..ac66f70dc63 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp
@@ -17,7 +17,7 @@ Client_ORBInitializer::Client_ORBInitializer (int interceptor_type)
 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))
 {
 }
@@ -25,7 +25,7 @@ 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))
 {
 
@@ -68,6 +68,6 @@ Client_ORBInitializer::post_init (
   PortableInterceptor::ClientRequestInterceptor_var interceptor = tmp;
 
   info->add_client_request_interceptor (interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
index 3892d9abcf3..37f8fc4e360 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h
@@ -35,11 +35,11 @@ public:
   Client_ORBInitializer (int interceptor_type);
 
   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));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
index c1cabcaa2d4..908f0505579 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp
@@ -19,7 +19,7 @@ Server_ORBInitializer::Server_ORBInitializer (int interceptor_type)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -27,7 +27,7 @@ Server_ORBInitializer::pre_init (
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -70,6 +70,6 @@ Server_ORBInitializer::post_init (
   PortableInterceptor::ServerRequestInterceptor_var interceptor = tmp;
 
   info->add_server_request_interceptor (interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
index 98b9b2ec535..9d0def3d62e 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h
@@ -35,11 +35,11 @@ public:
   Server_ORBInitializer (int interceptor_type);
 
   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));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index 769632b1f33..cf45cfb9fb4 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -50,7 +50,7 @@ parse_args (int argc, char *argv[])
 
 void
 run_test (Test_Interceptors::Secure_Vault_ptr server
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
 {
   int i = 0;
   const char user[] = "root";
@@ -68,7 +68,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server
       // Record current time.
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
-      server->ready (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->ready (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // Grab timestamp again.
@@ -96,7 +96,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server
           // Record current time.
           ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
-          server->authenticate (user TAO_ENV_ARG_PARAMETER);
+          server->authenticate (user ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Grab timestamp again.
@@ -134,7 +134,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server
 
       server->update_records (id,
                               record
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
 
       // Grab timestamp again.
       ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -191,23 +191,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;
 
       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_Interceptors::Secure_Vault_var server =
         Test_Interceptors::Secure_Vault::_narrow (object.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -223,10 +223,10 @@ main (int argc, char *argv[])
       // This test is useful for  benchmarking the differences when
       // the same method is intercepted by different interceptors
       // wanting to achieve different functionality.
-      run_test (server.in () TAO_ENV_ARG_PARAMETER);
+      run_test (server.in () 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/Portable_Interceptors/Benchmark/interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
index 9c9eb160a09..b90b7642047 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
@@ -33,14 +33,14 @@ Vault_Client_Request_Interceptor::_remove_ref (void)
 }
 
 char *
-Vault_Client_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -48,7 +48,7 @@ Vault_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Vault_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,12 +57,12 @@ Vault_Client_Request_Interceptor::send_poll (
 void
 Vault_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
@@ -81,14 +81,14 @@ Vault_Client_Request_Interceptor::send_request (
       sc.context_data.replace (string_len, string_len, buf, 1);
 
       // Add this context to the service context list.
-      ri->add_request_service_context (sc, 0 TAO_ENV_ARG_PARAMETER);
+      ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test_Interceptors::Secure_Vault::Record *record;
@@ -103,17 +103,17 @@ Vault_Client_Request_Interceptor::send_request (
 void
 Vault_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       CORBA::Long result;
-      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -123,7 +123,7 @@ Vault_Client_Request_Interceptor::receive_reply (
 void
 Vault_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))
 {
@@ -133,21 +133,21 @@ Vault_Client_Request_Interceptor::receive_other (
 void
 Vault_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var tc = any->type ();
 
-  const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
@@ -182,14 +182,14 @@ Vault_Server_Request_Interceptor::_remove_ref (void)
 }
 
 char *
-Vault_Server_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Vault_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -197,7 +197,7 @@ Vault_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Vault_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -207,19 +207,19 @@ Vault_Server_Request_Interceptor::receive_request_service_contexts (
 void
 Vault_Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
     {
       IOP::ServiceId id = request_ctx_id;
       IOP::ServiceContext_var sc =
-        ri->get_request_service_context (id TAO_ENV_ARG_PARAMETER);
+        ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       const char *buf =
@@ -233,7 +233,7 @@ Vault_Server_Request_Interceptor::receive_request (
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test_Interceptors::Secure_Vault::Record *record;
@@ -248,17 +248,17 @@ Vault_Server_Request_Interceptor::receive_request (
 void
 Vault_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       CORBA::Long result;
-      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -268,7 +268,7 @@ Vault_Server_Request_Interceptor::send_reply (
 void
 Vault_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -278,7 +278,7 @@ Vault_Server_Request_Interceptor::send_exception (
 void
 Vault_Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -313,7 +313,7 @@ Vault_Client_Request_Context_Interceptor::_remove_ref (void)
 
 char *
 Vault_Client_Request_Context_Interceptor::name (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
@@ -321,7 +321,7 @@ Vault_Client_Request_Context_Interceptor::name (
 
 void
 Vault_Client_Request_Context_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -329,7 +329,7 @@ Vault_Client_Request_Context_Interceptor::destroy (
 void
 Vault_Client_Request_Context_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
@@ -338,7 +338,7 @@ Vault_Client_Request_Context_Interceptor::send_poll (
 void
 Vault_Client_Request_Context_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -360,14 +360,14 @@ Vault_Client_Request_Context_Interceptor::send_request (
   sc.context_data.replace (string_len, string_len, buf, 1);
 
   // Add this context to the service context list.
-  ri->add_request_service_context (sc, 0 TAO_ENV_ARG_PARAMETER);
+  ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 Vault_Client_Request_Context_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))
 {
@@ -377,7 +377,7 @@ Vault_Client_Request_Context_Interceptor::receive_other (
 void
 Vault_Client_Request_Context_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -386,21 +386,21 @@ Vault_Client_Request_Context_Interceptor::receive_reply (
 void
 Vault_Client_Request_Context_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var tc = any->type ();
 
-  const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
@@ -436,7 +436,7 @@ Vault_Server_Request_Context_Interceptor::_remove_ref (void)
 
 char *
 Vault_Server_Request_Context_Interceptor::name (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
@@ -444,7 +444,7 @@ Vault_Server_Request_Context_Interceptor::name (
 
 void
 Vault_Server_Request_Context_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -452,7 +452,7 @@ Vault_Server_Request_Context_Interceptor::destroy (
 void
 Vault_Server_Request_Context_Interceptor::receive_request_service_contexts(
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -462,14 +462,14 @@ Vault_Server_Request_Context_Interceptor::receive_request_service_contexts(
 void
 Vault_Server_Request_Context_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   IOP::ServiceId id = request_ctx_id;
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (id TAO_ENV_ARG_PARAMETER);
+    ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf = ACE_reinterpret_cast (const char *,
@@ -482,7 +482,7 @@ Vault_Server_Request_Context_Interceptor::receive_request (
 void
 Vault_Server_Request_Context_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -491,7 +491,7 @@ Vault_Server_Request_Context_Interceptor::send_reply (
 void
 Vault_Server_Request_Context_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -500,7 +500,7 @@ Vault_Server_Request_Context_Interceptor::send_exception (
 void
 Vault_Server_Request_Context_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -534,7 +534,7 @@ Vault_Client_Request_Dynamic_Interceptor::_remove_ref (void)
 
 char *
 Vault_Client_Request_Dynamic_Interceptor::name (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
@@ -542,7 +542,7 @@ Vault_Client_Request_Dynamic_Interceptor::name (
 
 void
 Vault_Client_Request_Dynamic_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -550,7 +550,7 @@ Vault_Client_Request_Dynamic_Interceptor::destroy (
 void
 Vault_Client_Request_Dynamic_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
@@ -559,18 +559,18 @@ Vault_Client_Request_Dynamic_Interceptor::send_poll (
 void
 Vault_Client_Request_Dynamic_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
  if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       const char *user;
@@ -582,7 +582,7 @@ Vault_Client_Request_Dynamic_Interceptor::send_request (
  if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test_Interceptors::Secure_Vault::Record *record;
@@ -597,18 +597,18 @@ Vault_Client_Request_Dynamic_Interceptor::send_request (
 void
 Vault_Client_Request_Dynamic_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "ready") == 0)
     {
       CORBA::Short result;
 
-      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -618,7 +618,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply (
     {
       CORBA::Long result;
 
-      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -628,7 +628,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply (
 void
 Vault_Client_Request_Dynamic_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))
 {
@@ -638,21 +638,21 @@ Vault_Client_Request_Dynamic_Interceptor::receive_other (
 void
 Vault_Client_Request_Dynamic_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var tc = any->type ();
 
-  const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
@@ -688,7 +688,7 @@ Vault_Server_Request_Dynamic_Interceptor::_remove_ref (void)
 
 char *
 Vault_Server_Request_Dynamic_Interceptor::name (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
@@ -696,7 +696,7 @@ Vault_Server_Request_Dynamic_Interceptor::name (
 
 void
 Vault_Server_Request_Dynamic_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -704,18 +704,18 @@ Vault_Server_Request_Dynamic_Interceptor::destroy (
 void
 Vault_Server_Request_Dynamic_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "authenticate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       const char *user;
@@ -727,7 +727,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request (
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test_Interceptors::Secure_Vault::Record *record;
@@ -742,7 +742,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request (
 void
 Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts(
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -752,17 +752,17 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts(
 void
 Vault_Server_Request_Dynamic_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "ready") == 0)
     {
       CORBA::Short result;
-      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -771,7 +771,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "update_records") == 0)
     {
       CORBA::Long result;
-      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -781,7 +781,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply (
 void
 Vault_Server_Request_Dynamic_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -790,7 +790,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_exception (
 void
 Vault_Server_Request_Dynamic_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -823,7 +823,7 @@ Vault_Client_Request_NOOP_Interceptor::_remove_ref (void)
 }
 
 char *
-Vault_Client_Request_NOOP_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Client_Request_NOOP_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
@@ -831,7 +831,7 @@ Vault_Client_Request_NOOP_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Vault_Client_Request_NOOP_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -839,7 +839,7 @@ Vault_Client_Request_NOOP_Interceptor::destroy (
 void
 Vault_Client_Request_NOOP_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
@@ -848,7 +848,7 @@ Vault_Client_Request_NOOP_Interceptor::send_poll (
 void
 Vault_Client_Request_NOOP_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))
 {
@@ -858,7 +858,7 @@ Vault_Client_Request_NOOP_Interceptor::send_request (
 void
 Vault_Client_Request_NOOP_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))
 {
@@ -868,7 +868,7 @@ Vault_Client_Request_NOOP_Interceptor::receive_other (
 void
 Vault_Client_Request_NOOP_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -877,21 +877,21 @@ Vault_Client_Request_NOOP_Interceptor::receive_reply (
 void
 Vault_Client_Request_NOOP_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var tc = any->type ();
 
-  const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (id, exception_id.in ()) != 0)
@@ -926,7 +926,7 @@ Vault_Server_Request_NOOP_Interceptor::_remove_ref (void)
 }
 
 char *
-Vault_Server_Request_NOOP_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Server_Request_NOOP_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
@@ -934,7 +934,7 @@ Vault_Server_Request_NOOP_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Vault_Server_Request_NOOP_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -942,7 +942,7 @@ Vault_Server_Request_NOOP_Interceptor::destroy (
 void
 Vault_Server_Request_NOOP_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -951,7 +951,7 @@ Vault_Server_Request_NOOP_Interceptor::receive_request (
 void
 Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts(
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -961,7 +961,7 @@ Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts(
 void
 Vault_Server_Request_NOOP_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -970,7 +970,7 @@ Vault_Server_Request_NOOP_Interceptor::send_reply (
 void
 Vault_Server_Request_NOOP_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -979,7 +979,7 @@ Vault_Server_Request_NOOP_Interceptor::send_exception (
 void
 Vault_Server_Request_NOOP_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
index 7a077f925d3..05206a6e7d4 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
@@ -35,33 +35,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));
 
@@ -86,35 +86,35 @@ 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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
@@ -139,33 +139,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));
 
@@ -190,35 +190,35 @@ 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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
@@ -244,33 +244,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));
 
@@ -295,35 +295,35 @@ 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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
@@ -349,33 +349,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));
 
@@ -400,35 +400,35 @@ 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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
index d3849370316..9d8610b2857 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
@@ -53,18 +53,18 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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 poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -72,35 +72,35 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Secure_Vault_i server_impl (orb.in ());
 
       PortableServer::ObjectId_var id =
         root_poa->activate_object (&server_impl
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var test_obj =
         root_poa->id_to_reference (id.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_Interceptors::Secure_Vault_var server =
         Test_Interceptors::Secure_Vault::_narrow (test_obj.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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,
@@ -120,12 +120,12 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
index 748820c893b..8eed5c1c096 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp
@@ -12,7 +12,7 @@ Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb)
 // ctor
 
 CORBA::Short
-Secure_Vault_i::ready (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Secure_Vault_i::ready (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 1;
@@ -20,7 +20,7 @@ Secure_Vault_i::ready (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Secure_Vault_i::authenticate (const char * user
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test_Interceptors::Invalid))
 {
@@ -32,15 +32,15 @@ Secure_Vault_i::authenticate (const char * user
 CORBA::Long
 Secure_Vault_i::update_records (CORBA::Long,
                 const Test_Interceptors::Secure_Vault::Record &
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 return 1;
 }
 
 void
-Secure_Vault_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Secure_Vault_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);
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
index 07891acfc20..1e91333a22d 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h
@@ -27,21 +27,21 @@ public:
   Secure_Vault_i (CORBA::ORB_ptr orb);
   // ctor
 
-  virtual CORBA::Short ready (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short ready (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void authenticate (const char * user
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test_Interceptors::Invalid));
   // Passwd sent in the service context list
 
   virtual CORBA::Long update_records (CORBA::Long id,
                                       const Test_Interceptors::Secure_Vault::Record & val
-                                      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
  private:
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
index bd736641a5a..eff774840ce 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp
@@ -13,7 +13,7 @@ ACE_RCSID (Dynamic, Echo_Client_ORBInitializer, "$Id$")
 void
 Echo_Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -21,7 +21,7 @@ Echo_Client_ORBInitializer::pre_init (
 void
 Echo_Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -38,7 +38,7 @@ Echo_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/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
index 01d8ed5223e..744e300ebe7 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h
@@ -35,11 +35,11 @@ class Echo_Client_ORBInitializer :
 public:
 
   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/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
index 3951c2527a6..d97e189d466 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp
@@ -13,7 +13,7 @@ ACE_RCSID (Dynamic, Echo_Server_ORBInitializer, "$Id$")
 void
 Echo_Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -21,7 +21,7 @@ Echo_Server_ORBInitializer::pre_init (
 void
 Echo_Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -38,7 +38,7 @@ Echo_Server_ORBInitializer::post_init (
     server_interceptor = interceptor;
 
   info->add_server_request_interceptor (server_interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 }
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
index 1c087f32c26..a3c63880e02 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h
@@ -35,11 +35,11 @@ class Echo_Server_ORBInitializer :
 public:
 
   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/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
index 0e927949c71..ba7cc997692 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
@@ -39,15 +39,15 @@ parse_args (int argc, char *argv[])
 
 void
 run_test (Test_Interceptors::Visual_ptr server
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
 {
-  server->normal (10 TAO_ENV_ARG_PARAMETER);
+  server->normal (10 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Long one = 1, two = 1, result = 0;
   result = server->calculate (one,
                               two
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -57,7 +57,7 @@ run_test (Test_Interceptors::Visual_ptr server
 
   ACE_TRY
     {
-      server->user (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (Test_Interceptors::Silly, userex)
@@ -69,7 +69,7 @@ run_test (Test_Interceptors::Visual_ptr server
 
   ACE_TRY_EX (SYS)
     {
-      server->system (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (SYS);
     }
   ACE_CATCH (CORBA::INV_OBJREF, sysex)
@@ -94,22 +94,22 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -120,9 +120,9 @@ main (int argc, char *argv[])
                             1);
         }
 
-      run_test (server.in () TAO_ENV_ARG_PARAMETER);
+      run_test (server.in () ACE_ENV_ARG_PARAMETER);
 
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
index c3292620654..254109d8afe 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
@@ -35,14 +35,14 @@ Echo_Client_Request_Interceptor::_remove_ref (void)
 }
 
 char *
-Echo_Client_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -50,7 +50,7 @@ Echo_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Echo_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))
 {
@@ -60,12 +60,12 @@ Echo_Client_Request_Interceptor::send_poll (
 void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -76,7 +76,7 @@ Echo_Client_Request_Interceptor::send_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Long param;
@@ -93,12 +93,12 @@ Echo_Client_Request_Interceptor::send_request (
 void
 Echo_Client_Request_Interceptor::receive_other (
   PortableInterceptor::ClientRequestInfo_ptr ri
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -110,11 +110,11 @@ Echo_Client_Request_Interceptor::receive_other (
 void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -125,7 +125,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Long param;
@@ -140,7 +140,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Long param1, param2, result;
@@ -149,7 +149,7 @@ Echo_Client_Request_Interceptor::receive_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -165,12 +165,12 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -180,7 +180,7 @@ Echo_Client_Request_Interceptor::receive_exception (
 
 
   CORBA::String_var exception_id =
-    ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -212,14 +212,14 @@ Echo_Server_Request_Interceptor::_remove_ref (void)
 }
 
 char *
-Echo_Server_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -227,7 +227,7 @@ Echo_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -236,12 +236,12 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 void
 Echo_Server_Request_Interceptor::receive_request (
   PortableInterceptor::ServerRequestInfo_ptr ri
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -251,7 +251,7 @@ Echo_Server_Request_Interceptor::receive_request (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Long param;
@@ -266,7 +266,7 @@ Echo_Server_Request_Interceptor::receive_request (
      }
 
   CORBA::String_var tmdi =
-    ri->target_most_derived_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -277,11 +277,11 @@ Echo_Server_Request_Interceptor::receive_request (
 void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -291,7 +291,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "normal") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Long param;
@@ -306,7 +306,7 @@ Echo_Server_Request_Interceptor::send_reply (
   if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Long param1, param2, result = 0;
@@ -315,7 +315,7 @@ Echo_Server_Request_Interceptor::send_reply (
       paramlist[i++].argument >>= param1;
       paramlist[i].argument >>= param2;
 
-      CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       (result_any.in ()) >>= result;
@@ -331,12 +331,12 @@ Echo_Server_Request_Interceptor::send_reply (
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -346,12 +346,12 @@ Echo_Server_Request_Interceptor::send_exception (
 
 
   CORBA::Any_var any =
-    ri->sending_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::TypeCode_var type = any->type ();
 
-  const char *exception_id = type->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -362,7 +362,7 @@ Echo_Server_Request_Interceptor::send_exception (
 void
 Echo_Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h
index 68777008e86..e0f6bfa90ab 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h
@@ -33,29 +33,29 @@ 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_other (
         PortableInterceptor::ClientRequestInfo_ptr
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
@@ -63,12 +63,12 @@ public:
         ));
 
   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_exception (
       PortableInterceptor::ClientRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
@@ -94,16 +94,16 @@ 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 receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -111,22 +111,22 @@ public:
       ));
 
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
         PortableInterceptor::ServerRequestInfo_ptr
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
         )
     ACE_THROW_SPEC ((
       CORBA::SystemException,
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
index 0b5756e38d1..62696682ac3 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
@@ -51,15 +51,15 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -68,14 +68,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -85,21 +85,21 @@ main (int argc, char *argv[])
 
       PortableServer::ObjectId_var id =
         root_poa->activate_object (&server_impl
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var test_obj =
         root_poa->id_to_reference (id.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_Interceptors::Visual_var server =
         Test_Interceptors::Visual::_narrow (test_obj.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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, "Test_Interceptors::Visual: <%s>\n", ior.in ()));
@@ -117,12 +117,12 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
index 64c80dd0a86..d760688fb6d 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp
@@ -12,7 +12,7 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 
 void
 Visual_i::normal (CORBA::Long arg
-                  TAO_ENV_ARG_DECL_NOT_USED)
+                  ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
@@ -21,7 +21,7 @@ Visual_i::normal (CORBA::Long arg
 CORBA::Long
 Visual_i::calculate (CORBA::Long one,
                      CORBA::Long two
-                     TAO_ENV_ARG_DECL_NOT_USED)
+                     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n"));
@@ -29,7 +29,7 @@ Visual_i::calculate (CORBA::Long one,
 }
 
 void
-Visual_i::user (TAO_ENV_SINGLE_ARG_DECL)
+Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
@@ -37,7 +37,7 @@ Visual_i::user (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Visual_i::system (TAO_ENV_SINGLE_ARG_DECL)
+Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
@@ -45,7 +45,7 @@ Visual_i::system (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Visual_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
index 1c679a55b7c..f31756fb10a 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h
@@ -28,22 +28,22 @@ public:
   // ctor
 
   void normal (CORBA::Long arg
-               TAO_ENV_ARG_DECL_NOT_USED)
+               ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Long calculate (
                          CORBA::Long one,
                          CORBA::Long two
-                         TAO_ENV_ARG_DECL_NOT_USED)
+                         ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void user (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly));
 
-  void system (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void system (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:
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
index 8ff1de5e5be..8f147a4df0c 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
@@ -15,7 +15,7 @@ ACE_RCSID (ForwardRequest,
 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,13 +23,13 @@ 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);
+  CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::StringSeq_var args = info->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::StringSeq_var args = info->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var forward_str;
@@ -59,7 +59,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/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
index 015848c743c..ceacb35a97f 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h
@@ -46,11 +46,11 @@ class Client_ORBInitializer :
 public:
 
   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/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
index 104ad3d7681..43c3962fa02 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
@@ -19,14 +19,14 @@ Client_Request_Interceptor::Client_Request_Interceptor (
 
 char *
 Client_Request_Interceptor::name (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Client_Request_Interceptor");
 }
 
 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))
 {
 }
@@ -34,14 +34,14 @@ Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Client_Request_Interceptor::send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   ++this->request_count_;
 
   CORBA::Boolean response_expected =
-    ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!response_expected)   // A one-way request.
@@ -58,18 +58,18 @@ Client_Request_Interceptor::send_request (
           this->orb_ = CORBA::ORB_init (argc,
                                         0,
                                         this->orb_id_.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
       CORBA::Object_var forward =
         this->orb_->string_to_object (this->forward_str_.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var forward_str =
         this->orb_->object_to_string (forward.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -87,7 +87,7 @@ Client_Request_Interceptor::send_request (
 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))
 {
 }
@@ -95,7 +95,7 @@ Client_Request_Interceptor::send_poll (
 void
 Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -103,7 +103,7 @@ Client_Request_Interceptor::receive_reply (
 void
 Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -112,17 +112,17 @@ Client_Request_Interceptor::receive_exception (
 void
 Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean response_expected =
-    ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableInterceptor::ReplyStatus reply_status =
-    ri->reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!response_expected   // A one-way or asynchronous request.
@@ -136,7 +136,7 @@ Client_Request_Interceptor::receive_other (
   // This will throw an exception if a location forward has not
   // occured.  If an exception is thrown then something is wrong with
   // the PortableInterceptor::ForwardRequest support.
-  CORBA::Object_var forward = ri->forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Object_var forward = ri->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (forward.in ()))
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
index 4696ede0d9c..37994c74c0e 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
@@ -66,37 +66,37 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestinterceptor.
-  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));
 
-  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_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 send_poll (
       PortableInterceptor::ClientRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   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_exception (
       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_other (
       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/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
index 9fed7eb387f..4a5ff2b8045 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
@@ -18,7 +18,7 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -26,7 +26,7 @@ Server_ORBInitializer::pre_init (
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
@@ -43,7 +43,7 @@ Server_ORBInitializer::post_init (
   this->server_interceptor_ = interceptor;
 
   info->add_server_request_interceptor (interceptor
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
index 7b0320caf55..865ab8044be 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
@@ -52,11 +52,11 @@ public:
   Server_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));
 
   /// Return the created server request interceptor.  Only valid after
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
index 650431f5134..fb67917c81b 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
@@ -21,7 +21,7 @@ void
 Server_Request_Interceptor::forward_references (
   CORBA::Object_ptr obj1,
   CORBA::Object_ptr obj2
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2))
@@ -36,14 +36,14 @@ Server_Request_Interceptor::forward_references (
 }
 
 char *
-Server_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("Server_Request_Interceptor");
 }
 
 void
-Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::release (this->obj_[0]);
@@ -53,14 +53,14 @@ Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   this->request_count_++;
 
   CORBA::Boolean response_expected =
-    ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!response_expected)   // A one-way request.
@@ -93,12 +93,12 @@ Server_Request_Interceptor::receive_request_service_contexts (
 void
 Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   CORBA::Boolean response_expected =
-    ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!response_expected)   // A one-way request.
@@ -135,7 +135,7 @@ Server_Request_Interceptor::receive_request (
 void
 Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -143,7 +143,7 @@ Server_Request_Interceptor::send_reply (
 void
 Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -152,12 +152,12 @@ Server_Request_Interceptor::send_exception (
 void
 Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
   CORBA::Boolean response_expected =
-    ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER);
+    ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!response_expected)   // A one-way request.
@@ -169,7 +169,7 @@ Server_Request_Interceptor::send_other (
   // This will throw an exception if a location forward has not
   // occured.  If an exception is thrown then something is wrong with
   // the PortableInterceptor::ForwardRequest support.
-  CORBA::Object_var forward = ri->forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::Object_var forward = ri->forward_reference (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (forward.in ()))
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
index 189fa3d6ee0..cd4fb27371b 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
@@ -69,7 +69,7 @@ public:
   /// Set the references to which requests will be forwarded.
   virtual void forward_references (CORBA::Object_ptr obj1,
                                    CORBA::Object_ptr obj2
-                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -82,38 +82,38 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  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));
 
-  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 receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
       PortableInterceptor::ServerRequestInfo_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/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
index 42c9f336a0f..c9fc64b3ecd 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
@@ -50,7 +50,7 @@ main (int argc, char *argv[])
 {
   int status = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -64,14 +64,14 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             "Client ORB"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (::parse_args (argc, argv) != 0)
@@ -81,11 +81,11 @@ main (int argc, char *argv[])
       // IOR occurs during the various interceptions executed during
       // this test.
       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;
 
       ForwardRequestTest::test_var server =
-        ForwardRequestTest::test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        ForwardRequestTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -112,7 +112,7 @@ main (int argc, char *argv[])
           if (i > 1)
             old_number = number;
 
-          number = server->number (TAO_ENV_SINGLE_ARG_PARAMETER);
+          number = server->number (ACE_ENV_SINGLE_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
             }
         }
 
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
index 3a4e7f1fa21..f4aaaa548ec 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
@@ -56,7 +56,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       Server_ORBInitializer *temp_initializer = 0;
@@ -67,15 +67,15 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -84,11 +84,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (::parse_args (argc, argv) != 0)
@@ -103,21 +103,21 @@ main (int argc, char *argv[])
         root_poa->create_POA ("first POA",
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var oid1 =
         first_poa->activate_object (&servant1
-                                    TAO_ENV_ARG_PARAMETER);
+                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj1 =
         first_poa->servant_to_reference (&servant1
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior1 =
-        orb->object_to_string (obj1.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (obj1.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -131,28 +131,28 @@ main (int argc, char *argv[])
         root_poa->create_POA ("second POA",
                               poa_manager.in (),
                               policies
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var oid2 =
         second_poa->activate_object (&servant2
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj2 =
         second_poa->servant_to_reference (&servant2
-                                          TAO_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior2 =
-        orb->object_to_string (obj2.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (obj2.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "ForwardRequestTest::test servant 2: <%s>\n",
                   ior2.in ()));
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Set the forward references in the server request interceptor.
@@ -161,7 +161,7 @@ main (int argc, char *argv[])
 
       ForwardRequestTest::ServerRequestInterceptor_var interceptor =
         ForwardRequestTest::ServerRequestInterceptor::_narrow (
-           server_interceptor.in () TAO_ENV_ARG_PARAMETER);
+           server_interceptor.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (interceptor.in ()))
@@ -172,7 +172,7 @@ main (int argc, char *argv[])
 
       interceptor->forward_references (obj1.in (),
                                        obj2.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Write each IOR to a file.
@@ -199,13 +199,13 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Run the ORB event loop.
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
index abe34922f30..adafe5be28d 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
@@ -18,18 +18,18 @@ test_i::~test_i (void)
 }
 
 CORBA::Short
-test_i::number (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->number_;
 }
 
 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,
               "Server is shutting down via object %d.\n",
               this->number_));
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
index 04ef8b96d8e..51c142c2de3 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
@@ -37,11 +37,11 @@ public:
   ~test_i (void);
 
   /// Return the number assigned to this object.
-  virtual CORBA::Short number (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index 2adf3bbcd2e..100d5176c81 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
@@ -9,14 +9,14 @@ ACE_RCSID (IORInterceptor,
 
 char *
 FOO_ClientRequestInterceptor::name (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("FOO_ClientRequestInterceptor");
 }
 
 void
-FOO_ClientRequestInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+FOO_ClientRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -24,7 +24,7 @@ FOO_ClientRequestInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 FOO_ClientRequestInterceptor::send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL)
+      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -33,7 +33,7 @@ FOO_ClientRequestInterceptor::send_request (
   // profile.
   IOP::TaggedComponent_var component =
     ri->get_effective_component (FOO::COMPONENT_ID
-                                 TAO_ENV_ARG_PARAMETER);
+                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The correct tagged component appears to exist.  Display the
@@ -61,7 +61,7 @@ FOO_ClientRequestInterceptor::send_request (
 void
 FOO_ClientRequestInterceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -69,7 +69,7 @@ FOO_ClientRequestInterceptor::send_poll (
 void
 FOO_ClientRequestInterceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -77,7 +77,7 @@ FOO_ClientRequestInterceptor::receive_reply (
 void
 FOO_ClientRequestInterceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -86,7 +86,7 @@ FOO_ClientRequestInterceptor::receive_exception (
 void
 FOO_ClientRequestInterceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
index 6dd2180d9de..02c4319ddcb 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
@@ -58,37 +58,37 @@ public:
    */
   //@{
   /// Return the name of this ClientRequestInterceptor.
-  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));
 
-  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_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 send_poll (
       PortableInterceptor::ClientRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   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_exception (
       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_other (
       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/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
index 1986211dd64..2ca470b3152 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
@@ -10,7 +10,7 @@ ACE_RCSID (IORInterceptor,
 void
 FOO_Client_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -18,7 +18,7 @@ FOO_Client_ORBInitializer::pre_init (
 void
 FOO_Client_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ClientRequestInterceptor_ptr foo;
@@ -35,6 +35,6 @@ FOO_Client_ORBInitializer::post_init (
     foo;
 
   info->add_client_request_interceptor (interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
index afec7a1b51e..01a5cc2bce6 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h
@@ -57,13 +57,13 @@ public:
   /// The pre-initialization hook.
   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));
 
   /// The post-initialization hook.
   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/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
index 95a8d090193..e5b12846c51 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
@@ -8,14 +8,14 @@ ACE_RCSID (IORInterceptor,
            "$Id$")
 
 char *
-FOO_IORInterceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+FOO_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("FOO_IORInterceptor");
 }
 
 void
-FOO_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+FOO_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -23,7 +23,7 @@ FOO_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 FOO_IORInterceptor::establish_components (
     PortableInterceptor::IORInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // According to the Portable Interceptors specification,
@@ -32,7 +32,7 @@ FOO_IORInterceptor::establish_components (
   // does the right thing, and ignores any IOR interceptors that throw
   // an exception.
 
-  CORBA::String_var name = this->name (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Get the length of the string plus one for the NULL terminator.
@@ -53,7 +53,7 @@ FOO_IORInterceptor::establish_components (
 
   // Add the tagged component to all profiles.
   info->add_ior_component (FOO_Component
-                           TAO_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -65,7 +65,7 @@ FOO_IORInterceptor::establish_components (
 void
 FOO_IORInterceptor::components_established (
     PortableInterceptor::IORInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
@@ -75,7 +75,7 @@ void
 FOO_IORInterceptor::adapter_manager_state_changed (
     PortableInterceptor::AdapterManagerId ,
     PortableInterceptor::AdapterState
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
@@ -85,7 +85,7 @@ void
 FOO_IORInterceptor:: adapter_state_changed (
     const PortableInterceptor::ObjectReferenceTemplateSeq &,
     PortableInterceptor::AdapterState
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return;
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index df51ed69ddb..2fa2027a6fc 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -56,28 +56,28 @@ public:
    */
   //@{
   /// Return the name of this IORInterceptor.
-  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));
 
   /// Cleanup resources acquired by this IORInterceptor.
-  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));
 
   /// Add the tagged components to the IOR.
   virtual void establish_components (
       PortableInterceptor::IORInfo_ptr info
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void components_established (
       PortableInterceptor::IORInfo_ptr info
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void adapter_manager_state_changed (
       PortableInterceptor::AdapterManagerId id,
       PortableInterceptor::AdapterState state
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
@@ -85,7 +85,7 @@ public:
   virtual void adapter_state_changed (
       const PortableInterceptor::ObjectReferenceTemplateSeq & templates,
       PortableInterceptor::AdapterState state
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
index 3781f73dd95..1860310c092 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
@@ -10,7 +10,7 @@ ACE_RCSID (IORInterceptor,
 void
 FOO_IORInterceptor_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -18,7 +18,7 @@ FOO_IORInterceptor_ORBInitializer::pre_init (
 void
 FOO_IORInterceptor_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -36,6 +36,6 @@ FOO_IORInterceptor_ORBInitializer::post_init (
     foo;
 
   info->add_ior_interceptor (ior_interceptor.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
index 7b1dc666c0f..ed0a8ce161f 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h
@@ -57,13 +57,13 @@ public:
   /// The pre-initialization hook.
   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));
 
   /// The post-initialization hook.
   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/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
index f0177e0af19..b0869bed3f1 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
@@ -37,7 +37,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -51,23 +51,23 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "client_orb" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       FOO::test_var server =
-        FOO::test::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        FOO::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -78,7 +78,7 @@ main (int argc, char *argv[])
                             1);
         }
 
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
index e981076e18b..4d9e10f5536 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
@@ -39,7 +39,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
@@ -61,16 +61,16 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             "test_orb"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -79,10 +79,10 @@ 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -90,11 +90,11 @@ main (int argc, char *argv[])
 
       test_i server_impl (orb.in ());
 
-      obj = server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       FOO::test_var server = FOO::test::_narrow (obj.in ()
-                                                 TAO_ENV_ARG_PARAMETER);
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -104,7 +104,7 @@ main (int argc, char *argv[])
                           -1);
 
       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_INFO, "FOO::test: <%s>\n", ior.in ()));
@@ -123,7 +123,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_INFO, "Event loop finished.\n"));
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
index 1bcd569d623..ecdb6b3560f 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp
@@ -12,10 +12,10 @@ 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,
               "\"test_i\" is shutting down.\n"));
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
index 2309de5d64b..a712ff5c8d7 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h
@@ -34,7 +34,7 @@ public:
   test_i (CORBA::ORB_ptr orb);
 
   /// Shutdown the ORB.
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
index 76c69b76129..c555b2f2c53 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
@@ -12,7 +12,7 @@ PortableInterceptor::SlotId slot_id = 2093843221;
 void
 ServerORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr /* info */
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -20,10 +20,10 @@ ServerORBInitializer::pre_init (
 void
 ServerORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ::slot_id = info->allocate_slot_id (TAO_ENV_SINGLE_ARG_PARAMETER);
+  ::slot_id = info->allocate_slot_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableInterceptor::ServerRequestInterceptor_ptr tmp;
@@ -39,6 +39,6 @@ ServerORBInitializer::post_init (
   PortableInterceptor::ServerRequestInterceptor_var interceptor = tmp;
 
   info->add_server_request_interceptor (interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
index b8b1ed06ec4..9057ba80593 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h
@@ -65,13 +65,13 @@ public:
   /// The pre-initialization hook.
   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));
 
   /// The post-initialization hook.
   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/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
index 4f7354e6843..6a1fe16b448 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
@@ -15,14 +15,14 @@ ServerRequestInterceptor::ServerRequestInterceptor (
 }
 
 char *
-ServerRequestInterceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup ("ServerRequestInterceptor");
 }
 
 void
-ServerRequestInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -30,12 +30,12 @@ ServerRequestInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 ServerRequestInterceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "invoke_me") != 0)
@@ -50,7 +50,7 @@ ServerRequestInterceptor::receive_request_service_contexts (
 
   ACE_TRY
     {
-      ri->set_slot (this->slot_id_, data TAO_ENV_ARG_PARAMETER);
+      ri->set_slot (this->slot_id_, data ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
@@ -76,7 +76,7 @@ ServerRequestInterceptor::receive_request_service_contexts (
 void
 ServerRequestInterceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -85,11 +85,11 @@ ServerRequestInterceptor::receive_request (
 void
 ServerRequestInterceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (ACE_OS::strcmp (op.in (), "invoke_me") != 0)
@@ -102,7 +102,7 @@ ServerRequestInterceptor::send_reply (
       // Retrieve the data stored in the RSC.  This data should be
       // different from the original data stored into the RSC by the
       // receive_request_service_contexts() interception point.
-      data = ri->get_slot (this->slot_id_ TAO_ENV_ARG_PARAMETER);
+      data = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
@@ -144,7 +144,7 @@ ServerRequestInterceptor::send_reply (
 void
 ServerRequestInterceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -153,7 +153,7 @@ ServerRequestInterceptor::send_exception (
 void
 ServerRequestInterceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
index d261109238e..16cf93d8d9b 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
@@ -58,38 +58,38 @@ public:
    */
   //@{
   /// Return the name of this ServerRequestinterceptor.
-  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));
 
-  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 receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
       PortableInterceptor::ServerRequestInfo_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/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
index 5a88a5bb0cc..9baf7a31f3c 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
@@ -37,7 +37,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 #if 0
@@ -51,23 +51,23 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 #endif  /* 0 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "client_orb" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PICurrentTest::test_var server =
-        PICurrentTest::test::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PICurrentTest::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -78,10 +78,10 @@ main (int argc, char *argv[])
                             1);
         }
 
-      server->invoke_me (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->invoke_me (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/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
index 12ba83e873a..4414b4966cc 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
@@ -41,7 +41,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
@@ -54,22 +54,22 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             "test_orb"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -78,20 +78,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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return -1;
 
-      obj = orb->resolve_initial_references ("PICurrent" TAO_ENV_ARG_PARAMETER);
+      obj = orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableInterceptor::Current_var pi_current =
-        PortableInterceptor::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        PortableInterceptor::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (pi_current.in ()))
@@ -103,12 +103,12 @@ main (int argc, char *argv[])
                           ::slot_id,
                           orb.in ());
 
-      obj = server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PICurrentTest::test_var server =
         PICurrentTest::test::_narrow (obj.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
                           -1);
 
       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_INFO, "PICurrentTest::test: <%s>\n", ior.in ()));
@@ -137,7 +137,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_INFO, "Event loop finished.\n"));
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
index dbea3421c8e..061948b2659 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp
@@ -20,7 +20,7 @@ test_i::~test_i (void)
 }
 
 void
-test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL)
+test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -39,7 +39,7 @@ test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL)
       // receive_request_service_contexts() interception point, and
       // then copied into the TSC current.
       retrieved_any =
-        this->current_->get_slot (this->slot_id_ TAO_ENV_ARG_PARAMETER);
+        this->current_->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
@@ -88,7 +88,7 @@ test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY_EX (foo)
     {
-      this->current_->set_slot (this->slot_id_, data TAO_ENV_ARG_PARAMETER);
+      this->current_->set_slot (this->slot_id_, data ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (foo);
     }
   ACE_CATCH (PortableInterceptor::InvalidSlot, ex)
@@ -113,11 +113,11 @@ test_i::invoke_me (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,
               "(%P|%t) Server is shutting down.\n"));
 
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
index ed0f81b6c2d..e217cdd75b1 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
@@ -38,11 +38,11 @@ public:
   ~test_i (void);
 
   /// Return the number assigned to this object.
-  virtual void invoke_me (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void invoke_me (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
index 642c66c8913..afd5699b21d 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
@@ -15,7 +15,7 @@ ACE_RCSID (Request_Interceptor_Flow,
 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,7 +23,7 @@ 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))
 {
 
@@ -43,7 +43,7 @@ Client_ORBInitializer::post_init (
     ci;
 
   info->add_client_request_interceptor (ci_interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_NEW_THROW_EX (ci,
@@ -58,7 +58,7 @@ Client_ORBInitializer::post_init (
   ci_interceptor = ci;
 
   info->add_client_request_interceptor (ci_interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_NEW_THROW_EX (ci,
@@ -73,6 +73,6 @@ Client_ORBInitializer::post_init (
   ci_interceptor = ci;
 
   info->add_client_request_interceptor (ci_interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
index a9e20a2c950..c328fb96d85 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h
@@ -48,11 +48,11 @@ class Client_ORBInitializer :
 public:
 
   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/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
index 5cb7411e4ee..953f4bad296 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
@@ -15,13 +15,13 @@ Client_Request_Interceptor::Client_Request_Interceptor (const char *name)
 void
 Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri TAO_ENV_ARG_PARAMETER);
+    this->client_side_test (ri ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!client_side)
@@ -35,7 +35,7 @@ Client_Request_Interceptor::send_request (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test::TestScenario scenario;
@@ -75,12 +75,12 @@ Client_Request_Interceptor::send_request (
 void
 Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri TAO_ENV_ARG_PARAMETER);
+    this->client_side_test (ri ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!client_side)
@@ -96,12 +96,12 @@ Client_Request_Interceptor::send_poll (
 void
 Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri TAO_ENV_ARG_PARAMETER);
+    this->client_side_test (ri ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!client_side)
@@ -117,7 +117,7 @@ Client_Request_Interceptor::receive_reply (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test::TestScenario scenario;
@@ -155,13 +155,13 @@ Client_Request_Interceptor::receive_reply (
 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))
 {
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri TAO_ENV_ARG_PARAMETER);
+    this->client_side_test (ri ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!client_side)
@@ -177,7 +177,7 @@ Client_Request_Interceptor::receive_exception (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test::TestScenario scenario;
@@ -192,12 +192,12 @@ Client_Request_Interceptor::receive_exception (
           switch (scenario)
             {
             case 4:
-              exception = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
+              exception = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               tc = exception->type ();
 
-              id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+              id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               if (ACE_OS_String::strcmp (id, "IDL:Test/X:1.0") == 0)
@@ -239,13 +239,13 @@ Client_Request_Interceptor::receive_exception (
 void
 Client_Request_Interceptor::receive_other (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean client_side =
-    this->client_side_test (ri TAO_ENV_ARG_PARAMETER);
+    this->client_side_test (ri ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!client_side)
@@ -261,9 +261,9 @@ Client_Request_Interceptor::receive_other (
 CORBA::Boolean
 Client_Request_Interceptor::client_side_test (
   PortableInterceptor::ClientRequestInfo_ptr info
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
-  CORBA::String_var op = info->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = info->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return ACE_OS_String::strcmp (op.in (), "client_test") == 0 ? 1 : 0;
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
index c7fe08002a5..84b3468b286 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h
@@ -62,29 +62,29 @@ public:
   //@{
   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 send_poll (
       PortableInterceptor::ClientRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   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_exception (
       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_other (
       PortableInterceptor::ClientRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
@@ -95,7 +95,7 @@ private:
   // otherwise.
   CORBA::Boolean client_side_test (
     PortableInterceptor::ClientRequestInfo_ptr info
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
 
 };
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
index 8ceb71036e4..7b48928c7d2 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp
@@ -15,14 +15,14 @@ Request_Interceptor::Request_Interceptor (const char *name)
 
 char *
 Request_Interceptor::name (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.in ());
 }
 
 void
-Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
index 2c8a682d1ca..e8b1bf43936 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h
@@ -59,10 +59,10 @@ public:
    */
   //@{
   /// Return the name of this Requestinterceptor.
-  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));
 
-  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));
   //@}
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
index 1e5ef57fd73..f51c123c7dd 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
@@ -15,7 +15,7 @@ ACE_RCSID (Request_Interceptor_Flow,
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -23,7 +23,7 @@ Server_ORBInitializer::pre_init (
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -43,7 +43,7 @@ Server_ORBInitializer::post_init (
     si;
 
   info->add_server_request_interceptor (si_interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_NEW_THROW_EX (si,
@@ -58,7 +58,7 @@ Server_ORBInitializer::post_init (
   si_interceptor = si;
 
   info->add_server_request_interceptor (si_interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_NEW_THROW_EX (si,
@@ -73,6 +73,6 @@ Server_ORBInitializer::post_init (
   si_interceptor = si;
 
   info->add_server_request_interceptor (si_interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
index 1ffba6a3dca..bfb4ada10b3 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h
@@ -48,11 +48,11 @@ class Server_ORBInitializer :
 public:
 
   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/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
index 625574cfa47..e11ceee2f35 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
@@ -17,13 +17,13 @@ Server_Request_Interceptor::Server_Request_Interceptor (const char *name)
 void
 Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri TAO_ENV_ARG_PARAMETER);
+    this->server_side_test (ri ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!server_side)
@@ -64,13 +64,13 @@ Server_Request_Interceptor::receive_request_service_contexts (
 void
 Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri TAO_ENV_ARG_PARAMETER);
+    this->server_side_test (ri ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!server_side)
@@ -84,12 +84,12 @@ Server_Request_Interceptor::receive_request (
 void
 Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri TAO_ENV_ARG_PARAMETER);
+    this->server_side_test (ri ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!server_side)
@@ -105,7 +105,7 @@ Server_Request_Interceptor::send_reply (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test::TestScenario scenario;
@@ -143,13 +143,13 @@ Server_Request_Interceptor::send_reply (
 void
 Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri TAO_ENV_ARG_PARAMETER);
+    this->server_side_test (ri ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!server_side)
@@ -165,7 +165,7 @@ Server_Request_Interceptor::send_exception (
     {
       // Determine which test scenario we are in
       Dynamic::ParameterList_var paramlist =
-        ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       Test::TestScenario scenario;
@@ -180,12 +180,12 @@ Server_Request_Interceptor::send_exception (
           switch (scenario)
             {
             case 4:
-              exception = ri->sending_exception (TAO_ENV_SINGLE_ARG_PARAMETER);
+              exception = ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               tc = exception->type ();
 
-              id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
+              id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               if (ACE_OS_String::strcmp (id, "IDL:Test/X:1.0") == 0)
@@ -227,13 +227,13 @@ Server_Request_Interceptor::send_exception (
 void
 Server_Request_Interceptor::send_other (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
   CORBA::Boolean server_side =
-    this->server_side_test (ri TAO_ENV_ARG_PARAMETER);
+    this->server_side_test (ri ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!server_side)
@@ -249,9 +249,9 @@ Server_Request_Interceptor::send_other (
 CORBA::Boolean
 Server_Request_Interceptor::server_side_test (
   PortableInterceptor::ServerRequestInfo_ptr info
-  TAO_ENV_ARG_DECL)
+  ACE_ENV_ARG_DECL)
 {
-  CORBA::String_var op = info->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var op = info->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return ACE_OS_String::strcmp (op.in (), "server_test") == 0 ? 1 : 0;
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
index 1e6c84778ad..9a62c6546e1 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h
@@ -63,30 +63,30 @@ public:
   //@{
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (
       PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
   //@}
@@ -97,7 +97,7 @@ private:
   /// otherwise.
   CORBA::Boolean server_side_test (
     PortableInterceptor::ServerRequestInfo_ptr info
-    TAO_ENV_ARG_DECL);
+    ACE_ENV_ARG_DECL);
 
 private:
 
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
index 872b042472e..114837bcb26 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
@@ -41,7 +41,7 @@ parse_args (int argc, char *argv[])
 }
 
 void
-client_test (Test_ptr server TAO_ENV_ARG_DECL)
+client_test (Test_ptr server ACE_ENV_ARG_DECL)
 {
   // Currently, there are only four scenarios for the client side
   // tests.
@@ -56,7 +56,7 @@ client_test (Test_ptr server TAO_ENV_ARG_DECL)
 
       ACE_TRY
         {
-          server->client_test (i TAO_ENV_ARG_PARAMETER);
+          server->client_test (i ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (Test::X, ex)
@@ -89,7 +89,7 @@ client_test (Test_ptr server TAO_ENV_ARG_DECL)
 }
 
 void
-server_test (Test_ptr server TAO_ENV_ARG_DECL)
+server_test (Test_ptr server ACE_ENV_ARG_DECL)
 {
   // Currently, there are only four scenarios for the server side
   // tests.
@@ -104,7 +104,7 @@ server_test (Test_ptr server TAO_ENV_ARG_DECL)
 
       ACE_TRY
         {
-          server->server_test (i TAO_ENV_ARG_PARAMETER);
+          server->server_test (i ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (Test::X, ex)
@@ -139,7 +139,7 @@ server_test (Test_ptr server TAO_ENV_ARG_DECL)
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer =
@@ -152,24 +152,24 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             "Client ORB"
-                                            TAO_ENV_ARG_PARAMETER);
+                                            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 ()))
@@ -180,13 +180,13 @@ main (int argc, char *argv[])
                             1);
         }
 
-      ::client_test (server.in () TAO_ENV_ARG_PARAMETER);
+      ::client_test (server.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ::server_test (server.in () TAO_ENV_ARG_PARAMETER);
+      ::server_test (server.in () 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/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
index 5f1a1aac394..b5c19048de3 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
@@ -43,7 +43,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       Server_ORBInitializer *temp_initializer = 0;
@@ -54,15 +54,15 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" TAO_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -71,11 +71,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (::parse_args (argc, argv) != 0)
@@ -83,18 +83,18 @@ main (int argc, char *argv[])
 
       test_i servant (orb.in ());
 
-      CORBA::Object_var obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+      CORBA::Object_var obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
                   "Servant:\n<%s>\n",
                   ior.in ()));
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Write IOR to a file.
@@ -109,13 +109,13 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Run the ORB event loop.
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
index 682c1eec724..34463868f5a 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp
@@ -13,7 +13,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 
 void
 test_i::client_test (Test::TestScenario scenario
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((Test::X,
                    Test::UnknownScenario,
                    CORBA::SystemException))
@@ -35,7 +35,7 @@ test_i::client_test (Test::TestScenario scenario
 
 void
 test_i::server_test (Test::TestScenario scenario
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((Test::X,
                    Test::UnknownScenario,
                    CORBA::SystemException))
@@ -56,11 +56,11 @@ test_i::server_test (Test::TestScenario scenario
 }
 
 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_INFO,
               "Server is shutting down.\n"));
 
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
index d0a480c43d7..2d55095fe78 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h
@@ -34,20 +34,20 @@ public:
 
   /// The client-side test operation.
   virtual void client_test (Test::TestScenario scenario
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((Test::X,
                      Test::UnknownScenario,
                      CORBA::SystemException));
 
   /// The server-side test operation.
   virtual void server_test (Test::TestScenario scenario
-                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((Test::X,
                      Test::UnknownScenario,
                      CORBA::SystemException));
 
   /// Shutdown the ORB.
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
index 4244d28739f..b4732ce7376 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/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/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
index 4f0a2b8b6bd..855d3ace6e9 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/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/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
index 6546f4ef6f9..e0c859a8680 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp
@@ -15,7 +15,7 @@ Server_ORBInitializer::Server_ORBInitializer (void)
 void
 Server_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -23,7 +23,7 @@ Server_ORBInitializer::pre_init (
 void
 Server_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor =
@@ -39,7 +39,7 @@ Server_ORBInitializer::post_init (
     server_interceptor = interceptor;
 
   info->add_server_request_interceptor (server_interceptor.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
index a957f112d7d..075f4bdefaa 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h
@@ -35,11 +35,11 @@ public:
   Server_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/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
index 72d0eff0e95..61a34eea641 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
@@ -37,22 +37,22 @@ parse_args (int argc, char *argv[])
 
 void
 run_test (Test_Interceptors::Visual_ptr server
-          TAO_ENV_ARG_DECL)
+          ACE_ENV_ARG_DECL)
 {
 
-  server->normal (10 TAO_ENV_ARG_PARAMETER);
+  server->normal (10 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n"));
 
-  server->nothing (TAO_ENV_SINGLE_ARG_PARAMETER);
+  server->nothing (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG, "\"nothing\" operation done\n"));
 
   ACE_TRY
     {
-      server->user (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (Test_Interceptors::Silly, userex)
@@ -64,7 +64,7 @@ run_test (Test_Interceptors::Visual_ptr server
 
   ACE_TRY_EX (SYS)
     {
-      server->system (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (SYS);
     }
   ACE_CATCH (CORBA::INV_OBJREF, sysex)
@@ -89,22 +89,22 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -115,10 +115,10 @@ main (int argc, char *argv[])
                             1);
         }
 
-      run_test (server.in () TAO_ENV_ARG_PARAMETER);
+      run_test (server.in () 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/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
index e370378705d..94318e09bdc 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
@@ -37,14 +37,14 @@ Echo_Client_Request_Interceptor::_remove_ref (void)
 }
 
 char *
-Echo_Client_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -52,7 +52,7 @@ Echo_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Echo_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
@@ -61,7 +61,7 @@ Echo_Client_Request_Interceptor::send_poll (
 void
 Echo_Client_Request_Interceptor::send_request (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -71,18 +71,18 @@ Echo_Client_Request_Interceptor::send_request (
       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,
@@ -105,12 +105,12 @@ Echo_Client_Request_Interceptor::send_request (
   sc.context_data.replace (string_len, string_len, buf, 1);
 
   // Add this context to the service context list.
-  ri->add_request_service_context (sc, 0 TAO_ENV_ARG_PARAMETER);
+  ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Check that the request service context can be retrieved.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER);
+    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf2 =
@@ -130,7 +130,7 @@ Echo_Client_Request_Interceptor::send_request (
 void
 Echo_Client_Request_Interceptor::receive_reply (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -139,18 +139,18 @@ Echo_Client_Request_Interceptor::receive_reply (
       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,
@@ -163,7 +163,7 @@ Echo_Client_Request_Interceptor::receive_reply (
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id TAO_ENV_ARG_PARAMETER);
+    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf =
@@ -181,7 +181,7 @@ Echo_Client_Request_Interceptor::receive_reply (
 
   // Check that no one has messed with the request service context.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER);
+    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf2 =
@@ -200,7 +200,7 @@ Echo_Client_Request_Interceptor::receive_reply (
 void
 Echo_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))
 {
@@ -212,7 +212,7 @@ Echo_Client_Request_Interceptor::receive_other (
 void
 Echo_Client_Request_Interceptor::receive_exception (
     PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -222,18 +222,18 @@ Echo_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,
@@ -246,7 +246,7 @@ Echo_Client_Request_Interceptor::receive_exception (
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id TAO_ENV_ARG_PARAMETER);
+    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf =
@@ -264,7 +264,7 @@ Echo_Client_Request_Interceptor::receive_exception (
 
   // Check that no one has messed with the request service context.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER);
+    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf2 =
@@ -304,14 +304,14 @@ Echo_Server_Request_Interceptor::_remove_ref (void)
 }
 
 char *
-Echo_Server_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
@@ -319,12 +319,12 @@ Echo_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -341,7 +341,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 
   IOP::ServiceId id = ::service_id;
   IOP::ServiceContext_var sc =
-    ri->get_request_service_context (id TAO_ENV_ARG_PARAMETER);
+    ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf =
@@ -371,7 +371,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   scc.context_data.replace (string_len, string_len, buff, 1);
 
   // Add this context to the service context list.
-  ri->add_reply_service_context (scc, 0 TAO_ENV_ARG_PARAMETER);
+  ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -379,7 +379,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
 void
 Echo_Server_Request_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
+    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -389,11 +389,11 @@ Echo_Server_Request_Interceptor::receive_request (
 void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
-  CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -403,7 +403,7 @@ Echo_Server_Request_Interceptor::send_reply (
 
   // Check that the reply service context is set as expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id TAO_ENV_ARG_PARAMETER);
+    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf = ACE_reinterpret_cast (const char *,
@@ -422,7 +422,7 @@ Echo_Server_Request_Interceptor::send_reply (
 
   // Check that the request service context hasn't been changed.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER);
+    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf2 = ACE_reinterpret_cast (const char *,
@@ -442,12 +442,12 @@ Echo_Server_Request_Interceptor::send_reply (
 void
 Echo_Server_Request_Interceptor::send_exception (
     PortableInterceptor::ServerRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
+    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
 
-  CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -457,7 +457,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
   // Check that the reply service context is set as expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id TAO_ENV_ARG_PARAMETER);
+    ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf = ACE_reinterpret_cast (const char *,
@@ -476,7 +476,7 @@ Echo_Server_Request_Interceptor::send_exception (
 
   // Check that the request service context hasn't been changed.
   IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER);
+    ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   const char *buf2 = ACE_reinterpret_cast (const char *,
@@ -496,7 +496,7 @@ Echo_Server_Request_Interceptor::send_exception (
 void
 Echo_Server_Request_Interceptor::send_other (
              PortableInterceptor::ServerRequestInfo_ptr
-             TAO_ENV_ARG_DECL_NOT_USED)
+             ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest))
 {
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h
index a9fad3502c8..c1c21678dae 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h
@@ -38,33 +38,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));
 
@@ -96,35 +96,35 @@ 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 receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_request_service_contexts (
         PortableInterceptor::ServerRequestInfo_ptr
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr
-                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
index ee954a1172c..15de32386a0 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
@@ -50,16 +50,16 @@ main (int argc, char *argv[])
         temp_initializer;
 
       PortableInterceptor::register_orb_initializer (initializer.in ()
-                                                     TAO_ENV_ARG_PARAMETER);
+                                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Now we can create the 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -68,14 +68,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -85,21 +85,21 @@ main (int argc, char *argv[])
 
       PortableServer::ObjectId_var id =
         root_poa->activate_object (&server_impl
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var test_obj =
         root_poa->id_to_reference (id.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_Interceptors::Visual_var server =
         Test_Interceptors::Visual::_narrow (test_obj.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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,
@@ -119,12 +119,12 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
index 3d6d031610a..503c7a5b423 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp
@@ -14,21 +14,21 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb)
 
 void
 Visual_i::normal (CORBA::Long arg
-                  TAO_ENV_ARG_DECL_NOT_USED)
+                  ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
 }
 
 void
-Visual_i::nothing (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Visual_i::nothing (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n"));
 }
 
 void
-Visual_i::user (TAO_ENV_SINGLE_ARG_DECL)
+Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test_Interceptors::Silly))
 {
@@ -37,7 +37,7 @@ Visual_i::user (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Visual_i::system (TAO_ENV_SINGLE_ARG_DECL)
+Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
@@ -45,9 +45,9 @@ Visual_i::system (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Visual_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Visual_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);
   ACE_CHECK;
 }
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
index 7fc612e7210..5a6df58c457 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
@@ -29,20 +29,20 @@ public:
   Visual_i (CORBA::ORB_ptr orb);
 
   void normal (CORBA::Long arg
-               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void nothing (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void nothing (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void user (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void user (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test_Interceptors::Silly));
 
-  void system (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void system (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index d6082da0e8a..fc505726700 100755
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -24,21 +24,21 @@ main (int argc, char *argv[])
   QApplication app (argc, argv);
   TAO_QtResource_Factory::set_context (&app);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       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;
 
       Client client (orb.in (), app);
 
-      client.parse_args (argc, argv TAO_ENV_ARG_PARAMETER);
+      client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creates the Qt widgets
-      client.create_widgets (TAO_ENV_SINGLE_ARG_PARAMETER);
+      client.create_widgets (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This may look a bit suspect, but Qt wants the manager widget
@@ -75,7 +75,7 @@ Client::~Client (void)
 void
 Client::parse_args (int argc,
                     char *argv[]
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   const char *ior = "file://test.ior";
 
@@ -98,11 +98,11 @@ Client::parse_args (int argc,
       }
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+    this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->server_ =
-    LCD_Display::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+    LCD_Display::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil(this->server_.in ()))
@@ -113,7 +113,7 @@ Client::parse_args (int argc,
 }
 
 void
-Client::create_widgets (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
+Client::create_widgets (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*ACE_ENV_SINGLE_ARG_PARAMETER*/)
 {
   // Ewsize the box
   this->box_.resize (200,120);
diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h
index bbd8a4dc4ba..36da68ab1f9 100755
--- a/TAO/tests/QtTests/client.h
+++ b/TAO/tests/QtTests/client.h
@@ -38,13 +38,13 @@ public:
   ~Client (void);
   //Dtor..
 
-  void create_widgets (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  void create_widgets (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Adds the callbacks to the GUI underneath.....
 
   void show (void);
 
   void parse_args (int argc, char *argv[]
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 
   QVBox box_;
   // A box widget..
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 1094e5f4c37..09732412920 100755
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -63,15 +63,15 @@ main (int argc, char *argv[])
   QApplication app (argc, argv);
   TAO_QtResource_Factory::set_context (&app);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -80,11 +80,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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 the Qt stuff..
@@ -92,7 +92,7 @@ main (int argc, char *argv[])
       LCD_Display_imp display_impl (orb.in ());
 
       LCD_Display_var server =
-        display_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        display_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the LCD after the QVbox is created.
@@ -115,7 +115,7 @@ main (int argc, char *argv[])
       // End of QT specific stuff..
 
       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", ior.in ()));
@@ -133,7 +133,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
       }
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We choose to run the main Qt event loop..
diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp
index 6277525c83a..8b5bae8c705 100755
--- a/TAO/tests/QtTests/test_i.cpp
+++ b/TAO/tests/QtTests/test_i.cpp
@@ -17,7 +17,7 @@ LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb)
 }
 
 void
-LCD_Display_imp::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+LCD_Display_imp::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -28,7 +28,7 @@ LCD_Display_imp::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 LCD_Display_imp::send_val (CORBA::Long val
-                           TAO_ENV_ARG_DECL_NOT_USED)
+                           ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h
index e13be721eba..46eeb94d323 100755
--- a/TAO/tests/QtTests/test_i.h
+++ b/TAO/tests/QtTests/test_i.h
@@ -41,11 +41,11 @@ public:
 
   // ctor
 
-  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void send_val (CORBA::Long val
-                 TAO_ENV_ARG_DECL_NOT_USED)
+                 ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
  signals:
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.
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
index 0de4f50137e..106c14a0ec0 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp
@@ -12,29 +12,29 @@ Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb)
 }
 
 void
-Oneway_Receiver::raise_no_permission (TAO_ENV_SINGLE_ARG_DECL)
+Oneway_Receiver::raise_no_permission (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW (CORBA::NO_PERMISSION ());
 }
 
 void
-Oneway_Receiver::destroy (TAO_ENV_SINGLE_ARG_DECL)
+Oneway_Receiver::destroy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var id =
-    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
+    poa->servant_to_id (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
+  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 Test::Shutdown_Helper_ptr
-Oneway_Receiver::get_shutdown_helper (TAO_ENV_SINGLE_ARG_DECL)
+Oneway_Receiver::get_shutdown_helper (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Shutdown_Helper *shutdown_helper;
@@ -45,5 +45,5 @@ Oneway_Receiver::get_shutdown_helper (TAO_ENV_SINGLE_ARG_DECL)
 
   PortableServer::ServantBase_var transfer_ownership(shutdown_helper);
 
-  return shutdown_helper->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+  return shutdown_helper->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
index 0dba48dc0e8..5438e18bf41 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
@@ -25,13 +25,13 @@ public:
   Oneway_Receiver (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void raise_no_permission (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void raise_no_permission (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Test::Shutdown_Helper_ptr get_shutdown_helper (TAO_ENV_SINGLE_ARG_DECL)
+  virtual Test::Shutdown_Helper_ptr get_shutdown_helper (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
index 8c5e8b0781e..38ffc90ed4b 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp
@@ -11,8 +11,8 @@ Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb)
 }
 
 void
-Shutdown_Helper::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Shutdown_Helper::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);
 }
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
index 09ee8bba3fa..d1686561a5e 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
@@ -25,7 +25,7 @@ public:
   Shutdown_Helper (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp
index 97fd5efbe17..a49e15b2807 100644
--- a/TAO/tests/Reliable_Oneways/client.cpp
+++ b/TAO/tests/Reliable_Oneways/client.cpp
@@ -69,13 +69,13 @@ parse_args (int argc, char *argv[])
 }
 
 void run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 void run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver
-                                TAO_ENV_ARG_DECL);
+                                ACE_ENV_ARG_DECL);
 void run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver
-                                   TAO_ENV_ARG_DECL);
+                                   ACE_ENV_ARG_DECL);
 void run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver
-                         TAO_ENV_ARG_DECL);
+                         ACE_ENV_ARG_DECL);
 
 
 int
@@ -84,18 +84,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 tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Oneway_Receiver_var oneway_receiver =
-        Test::Oneway_Receiver::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Oneway_Receiver::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (oneway_receiver.in ()))
@@ -110,28 +110,28 @@ main (int argc, char *argv[])
         {
           ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_TARGET\n"));
           run_test_sync_with_target (oneway_receiver.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (test_sync_with_server)
         {
           ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_SERVER\n"));
           run_test_sync_with_server (oneway_receiver.in ()
-                                     TAO_ENV_ARG_PARAMETER);
+                                     ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (test_sync_with_transport)
         {
           ACE_DEBUG ((LM_DEBUG, "Running SYNC_WITH_TRANSPORT\n"));
           run_test_sync_with_transport (oneway_receiver.in ()
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
         {
           ACE_DEBUG ((LM_DEBUG, "Running SYNC_NONE\n"));
           run_test_sync_none (oneway_receiver.in ()
-                              TAO_ENV_ARG_PARAMETER);
+                              ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -147,7 +147,7 @@ main (int argc, char *argv[])
                     "ERROR: Mismatched number of calls (%d + %d != %d)\n",
                     successful_calls, failed_calls, iterations));
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -163,18 +163,18 @@ main (int argc, char *argv[])
 
 void
 set_sync_scope_policy (Messaging::SyncScope sync_scope
-                       TAO_ENV_ARG_DECL)
+                       ACE_ENV_ARG_DECL)
 {
   int argc = 0;
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "" TAO_ENV_ARG_PARAMETER);
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::Object_var object =
-    orb->resolve_initial_references ("PolicyCurrent" TAO_ENV_ARG_PARAMETER);
+    orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
   ACE_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_CHECK;
 
   if (CORBA::is_nil (policy_current.in ()))
@@ -189,14 +189,14 @@ set_sync_scope_policy (Messaging::SyncScope sync_scope
   policies[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                         scope_as_any
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  policies[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -204,7 +204,7 @@ void
 run_one_iteration (int i,
                    Test::Oneway_Receiver_ptr oneway_receiver,
                    Test::Shutdown_Helper_ptr shutdown_helper
-                   TAO_ENV_ARG_DECL)
+                   ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -212,14 +212,14 @@ run_one_iteration (int i,
         {
           ACE_DEBUG ((LM_DEBUG, "Destroying object\n"));
           server_status = DESTROYED;
-          oneway_receiver->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          oneway_receiver->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       if (i == 2 * iterations / 3)
         {
           ACE_DEBUG ((LM_DEBUG, "Shutting down server process\n"));
           server_status = SHUTDOWN;
-          shutdown_helper->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          shutdown_helper->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -228,7 +228,7 @@ run_one_iteration (int i,
     }
   ACE_ENDTRY;
 
-  oneway_receiver->raise_no_permission (TAO_ENV_SINGLE_ARG_PARAMETER);
+  oneway_receiver->raise_no_permission (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -243,13 +243,13 @@ call_failed (const CORBA::SystemException &ex)
 
 void
 run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
-  set_sync_scope_policy (Messaging::SYNC_WITH_TARGET TAO_ENV_ARG_PARAMETER);
+  set_sync_scope_policy (Messaging::SYNC_WITH_TARGET ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   Test::Shutdown_Helper_var shutdown_helper =
-    oneway_receiver->get_shutdown_helper (TAO_ENV_SINGLE_ARG_PARAMETER);
+    oneway_receiver->get_shutdown_helper (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   int had_comm_failure = 0;
@@ -258,7 +258,7 @@ run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver
       ACE_TRY
         {
           run_one_iteration (i, oneway_receiver, shutdown_helper.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CORBA::NO_PERMISSION, ex)
@@ -300,13 +300,13 @@ run_test_sync_with_target (Test::Oneway_Receiver_ptr oneway_receiver
 
 void
 run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver
-                           TAO_ENV_ARG_DECL)
+                           ACE_ENV_ARG_DECL)
 {
-  set_sync_scope_policy (Messaging::SYNC_WITH_SERVER TAO_ENV_ARG_PARAMETER);
+  set_sync_scope_policy (Messaging::SYNC_WITH_SERVER ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   Test::Shutdown_Helper_var shutdown_helper =
-    oneway_receiver->get_shutdown_helper (TAO_ENV_SINGLE_ARG_PARAMETER);
+    oneway_receiver->get_shutdown_helper (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   int had_comm_failure = 0;
@@ -315,7 +315,7 @@ run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver
       ACE_TRY
         {
           run_one_iteration (i, oneway_receiver, shutdown_helper.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (server_status == DESTROYED
@@ -361,37 +361,37 @@ run_test_sync_with_server (Test::Oneway_Receiver_ptr oneway_receiver
 /// Helper routine to run the sync_with_transport and sync_none tests.
 void
 run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver
-                     TAO_ENV_ARG_DECL);
+                     ACE_ENV_ARG_DECL);
 
 void
 run_test_sync_with_transport (Test::Oneway_Receiver_ptr oneway_receiver
-                              TAO_ENV_ARG_DECL)
+                              ACE_ENV_ARG_DECL)
 {
-  set_sync_scope_policy (Messaging::SYNC_WITH_TRANSPORT TAO_ENV_ARG_PARAMETER);
+  set_sync_scope_policy (Messaging::SYNC_WITH_TRANSPORT ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  run_test_unreliable (oneway_receiver TAO_ENV_ARG_PARAMETER);
+  run_test_unreliable (oneway_receiver ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
-  set_sync_scope_policy (Messaging::SYNC_NONE TAO_ENV_ARG_PARAMETER);
+  set_sync_scope_policy (Messaging::SYNC_NONE ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  run_test_unreliable (oneway_receiver TAO_ENV_ARG_PARAMETER);
+  run_test_unreliable (oneway_receiver ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 
 void
 run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver
-                     TAO_ENV_ARG_DECL)
+                     ACE_ENV_ARG_DECL)
 {
   Test::Shutdown_Helper_var shutdown_helper =
-    oneway_receiver->get_shutdown_helper (TAO_ENV_SINGLE_ARG_PARAMETER);
+    oneway_receiver->get_shutdown_helper (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   int undetected = 0;
@@ -401,7 +401,7 @@ run_test_unreliable (Test::Oneway_Receiver_ptr oneway_receiver
       ACE_TRY
         {
           run_one_iteration (i, oneway_receiver, shutdown_helper.in ()
-                             TAO_ENV_ARG_PARAMETER);
+                             ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // A few failures can go undetected...
diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp
index 0bff331018c..a198c55d3b5 100644
--- a/TAO/tests/Reliable_Oneways/server.cpp
+++ b/TAO/tests/Reliable_Oneways/server.cpp
@@ -39,15 +39,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -56,7 +56,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(oneway_receiver_impl);
 
       Test::Oneway_Receiver_var oneway_receiver =
-        oneway_receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        oneway_receiver_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (oneway_receiver.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (oneway_receiver.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -86,18 +86,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Server_Leaks/Ping_Service.cpp b/TAO/tests/Server_Leaks/Ping_Service.cpp
index ad640088619..31cf7652b1a 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.cpp
+++ b/TAO/tests/Server_Leaks/Ping_Service.cpp
@@ -11,14 +11,14 @@ Ping_Service::Ping_Service (CORBA::ORB_ptr orb)
 }
 
 void
-Ping_Service::ping (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Ping_Service::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Ping_Service::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Ping_Service::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);
 }
diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h
index 728a5e6def7..97d2a934099 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.h
+++ b/TAO/tests/Server_Leaks/Ping_Service.h
@@ -25,10 +25,10 @@ public:
   Ping_Service (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual void ping (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp
index d2fd0122245..c8263903192 100644
--- a/TAO/tests/Server_Leaks/client.cpp
+++ b/TAO/tests/Server_Leaks/client.cpp
@@ -45,18 +45,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 tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Ping_Service_var ping_service =
-        Test::Ping_Service::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
+        Test::Ping_Service::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (ping_service.in ()))
@@ -69,17 +69,17 @@ main (int argc, char *argv[])
 
       for (int i = 0; i != 10; ++i)
         {
-          ping_service->ping (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ping_service->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       if (do_shutdown)
         {
-          ping_service->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          ping_service->shutdown (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/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp
index 19117df1d8e..7ba0ae00538 100644
--- a/TAO/tests/Server_Leaks/server.cpp
+++ b/TAO/tests/Server_Leaks/server.cpp
@@ -38,15 +38,15 @@ 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;
 
       CORBA::Object_var poa_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 (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -55,7 +55,7 @@ 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;
 
       if (parse_args (argc, argv) != 0)
@@ -68,11 +68,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(ping_service_impl);
 
       Test::Ping_Service_var ping_service =
-        ping_service_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        ping_service_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (ping_service.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (ping_service.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -85,18 +85,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp
index edd0773c52f..7e69d9350cf 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -71,7 +71,7 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -80,7 +80,7 @@ main (int argc, char **argv)
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -91,12 +91,12 @@ main (int argc, char **argv)
       // Get an object reference from the argument string.
       CORBA::Object_var object =
         orb->string_to_object (IOR
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a <test> reference.
       test_var test_object = test::_narrow (object.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test::data the_data0 (data_bytes);
@@ -119,19 +119,19 @@ main (int argc, char **argv)
           // Invoke the oneway method.
           test_object->method (i,
                                the_data0
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Invoke the oneway method.
           test_object->method (i,
                                the_data1
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Invoke the oneway method.
           test_object->method (i,
                                the_data2
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -140,7 +140,7 @@ main (int argc, char **argv)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) Sending a shutdown call..\n"));
-          test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -150,7 +150,7 @@ main (int argc, char **argv)
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp
index 6f82d84ac69..13f7c855cfd 100644
--- a/TAO/tests/Single_Read/server.cpp
+++ b/TAO/tests/Single_Read/server.cpp
@@ -42,21 +42,21 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_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 (poa_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;
 
       if (parse_args (argc, argv) != 0)
@@ -65,12 +65,12 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -84,17 +84,17 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp
index 2ee2f038975..9b0120c488c 100644
--- a/TAO/tests/Single_Read/test_i.cpp
+++ b/TAO/tests/Single_Read/test_i.cpp
@@ -12,7 +12,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 void
 test_i::method (CORBA::ULong request_number,
                 const test::data &
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -27,11 +27,11 @@ test_i::method (CORBA::ULong request_number,
 }
 
 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,
               "(%P|%t) About to invoke shudown... "));
   this->orb_->shutdown (0
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Single_Read/test_i.h b/TAO/tests/Single_Read/test_i.h
index 8f921b977d1..39387592b14 100644
--- a/TAO/tests/Single_Read/test_i.h
+++ b/TAO/tests/Single_Read/test_i.h
@@ -30,10 +30,10 @@ public:
   // = The test interface methods.
   void method (CORBA::ULong request_number,
                const test::data &
-               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:
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
index 65826c42908..949c299e773 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
@@ -9,7 +9,7 @@ Smart_Test_Factory::Smart_Test_Factory (void)
 
 Test_ptr
 Smart_Test_Factory::create_proxy (Test_ptr proxy
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
  {
    ACE_DEBUG ((LM_DEBUG,
                "create_smart_proxy\n"));
@@ -28,12 +28,12 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 }
 
 CORBA::Short
-Smart_Test_Proxy::box_prices (TAO_ENV_SINGLE_ARG_DECL)
+Smart_Test_Proxy::box_prices (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->price_ == 0)
     {
-      this->price_ = TAO_Test_Smart_Proxy_Base::box_prices (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->price_ = TAO_Test_Smart_Proxy_Base::box_prices (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
   return this->price_;
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
index 5cafabfec5e..b3ac7e0c5d9 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h
@@ -8,7 +8,7 @@ public:
   Smart_Test_Factory (void);
 
   virtual Test_ptr create_proxy (Test_ptr proxy
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // This method will create the smart_proxy.
 };
 
@@ -17,7 +17,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base
 public:
   Smart_Test_Proxy (Test_ptr proxy);
 
-  virtual CORBA::Short box_prices(TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+  virtual CORBA::Short box_prices(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // "Smartify" the method call!
 
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
index e155adea751..ac4c6ea4623 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -127,7 +127,7 @@ 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;
       if (register_smart_proxy == 1)
         {
@@ -151,7 +151,7 @@ main (int argc, char *argv[])
 
       Test_var server =
         Test::_narrow (object.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
 
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -174,7 +174,7 @@ main (int argc, char *argv[])
            // Record current time.
            ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
-           price = server->box_prices (TAO_ENV_SINGLE_ARG_PARAMETER);
+           price = server->box_prices (ACE_ENV_SINGLE_ARG_PARAMETER);
            ACE_TRY_CHECK;
 
            if (price < 300)
@@ -194,13 +194,13 @@ main (int argc, char *argv[])
 
        marker.dump_stats ("buying tickets ", gsf);
 
-       server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+       server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       /*
 
       Test_var server1 =
         Test::_narrow (object.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
 
       if (CORBA::is_nil (server1.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -223,7 +223,7 @@ main (int argc, char *argv[])
            // Record current time.
            ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
-           price1 = server1->box_prices (TAO_ENV_SINGLE_ARG_PARAMETER);
+           price1 = server1->box_prices (ACE_ENV_SINGLE_ARG_PARAMETER);
            ACE_TRY_CHECK;
 
            if (price1 < 300)
@@ -243,7 +243,7 @@ main (int argc, char *argv[])
 
        marker1.dump_stats ("buying tickets using a default proxy ", gsf1);
 
-       server1->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+       server1->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       */
     }
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
index f029aefbd0d..4fb9002020f 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
@@ -28,14 +28,14 @@ class Test_i : public POA_Test
 public:
   Test_i (CORBA::ORB_ptr orb);
 
-  CORBA::Short box_prices  (TAO_ENV_SINGLE_ARG_DECL)
+  CORBA::Short box_prices  (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Long tickets  (CORBA::Short number
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_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));
 
 private:
@@ -49,7 +49,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Short
-Test_i::box_prices (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_i::box_prices (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 125;
@@ -57,17 +57,17 @@ Test_i::box_prices (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 CORBA::Long
 Test_i::tickets (CORBA::Short number
-                 TAO_ENV_ARG_DECL_NOT_USED)
+                 ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 125 * number;
 }
 
 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);
 }
 
 static const char *ior_output_file = 0;
@@ -100,7 +100,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -110,34 +110,34 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             ""
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i servant (orb.in ());
       // Obtain RootPOA.
       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;
 
       // Get the POAManager of the RootPOA.
       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;
 
       Test_var Test_object =
-        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (Test_object.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -157,10 +157,10 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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,
@@ -168,7 +168,7 @@ main (int argc, char *argv[])
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
index a12bd8c64a6..9e7f85bec74 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
@@ -22,10 +22,10 @@ Collocation_Test::Collocation_Test (void)
 }
 
 int
-Collocation_Test::init (int argc, char *argv[] TAO_ENV_ARG_DECL)
+Collocation_Test::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 {
   // Initialize the ORB.
-  this->orb_ = CORBA::ORB_init (argc, argv, 0 TAO_ENV_ARG_PARAMETER);
+  this->orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   int result = this->parse_args (argc, argv);
@@ -34,52 +34,52 @@ Collocation_Test::init (int argc, char *argv[] TAO_ENV_ARG_DECL)
 
   // Get an Object reference to RootPOA.
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+    this->orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Narrow the Object reference to a POA reference
   this->root_poa_ =
-    PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+    PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Get the POAManager of RootPOA
   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_RETURN (-1);
 
   // Activate the diamond servant and its base classes under RootPOA.
   PortableServer::ObjectId_var id =
     this->root_poa_->activate_object (&this->top_servant_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 //    // We only care about the most derived class here.
-//    this->diamond_obj_ = this->diamond_servant_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+//    this->diamond_obj_ = this->diamond_servant_._this (ACE_ENV_SINGLE_ARG_PARAMETER);
 //    ACE_CHECK_RETURN (-1);
 
   id =
     this->root_poa_->activate_object (&this->diamond_servant_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // We only care about the most derived class here.
   this->diamond_obj_ = this->root_poa_->id_to_reference (id.in ()
-                                                         TAO_ENV_ARG_PARAMETER);
+                                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   id =
     this->root_poa_->activate_object (&this->left_servant_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   id =
     this->root_poa_->activate_object (&this->right_servant_
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::String_var str =
     this->orb_->object_to_string (this->diamond_obj_.in ()
-                                  TAO_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG, "Diamond Servant activated:\n %s\n",
@@ -97,7 +97,7 @@ Collocation_Test::parse_args (int argc, char *argv[])
 }
 
 int
-Collocation_Test::test_narrow (TAO_ENV_SINGLE_ARG_DECL)
+Collocation_Test::test_narrow (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Ensure that the smart proxy is the one which is used by registering
   // the user-defined factory. Its necessary to create one on the heap so
@@ -108,34 +108,34 @@ Collocation_Test::test_narrow (TAO_ENV_SINGLE_ARG_DECL)
                                   -1);
 
   Diamond::Top_var top =
-    Diamond::Top::_narrow (this->diamond_obj_ TAO_ENV_ARG_PARAMETER);
+    Diamond::Top::_narrow (this->diamond_obj_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Left_var left =
-    Diamond::Left::_narrow (this->diamond_obj_ TAO_ENV_ARG_PARAMETER);
+    Diamond::Left::_narrow (this->diamond_obj_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Right_var right =
-    Diamond::Right::_narrow (this->diamond_obj_ TAO_ENV_ARG_PARAMETER);
+    Diamond::Right::_narrow (this->diamond_obj_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Buttom_var buttom =
-    Diamond::Buttom::_narrow (this->diamond_obj_ TAO_ENV_ARG_PARAMETER);
+    Diamond::Buttom::_narrow (this->diamond_obj_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  CORBA::String_var str = top->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::String_var str = top->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling top->shape: %s\n", str.in ()));
 
-  str = left->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = left->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling left->shape: %s\n", str.in ()));
 
-  str = right->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = right->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling right->shape: %s\n", str.in ()));
 
-  str = buttom->shape (TAO_ENV_SINGLE_ARG_PARAMETER);
+  str = buttom->shape (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   ACE_DEBUG ((LM_DEBUG, "Calling buttom->shape: %s\n", str.in ()));
 
@@ -143,12 +143,12 @@ Collocation_Test::test_narrow (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Collocation_Test::run (TAO_ENV_SINGLE_ARG_DECL)
+Collocation_Test::run (ACE_ENV_SINGLE_ARG_DECL)
 {
-  this->poa_manager_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->poa_manager_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->test_narrow (TAO_ENV_SINGLE_ARG_PARAMETER);
+  this->test_narrow (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
index 5d7a4ff12fc..94131c4fdff 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h
@@ -27,17 +27,17 @@ class Collocation_Test
 public:
   Collocation_Test (void);
 
-  int init (int argc, char *argv[] TAO_ENV_ARG_DECL_NOT_USED);
+  int init (int argc, char *argv[] ACE_ENV_ARG_DECL_NOT_USED);
   // Initializing the Collocation_Test object.
 
   int parse_args (int argc, char *argv[]);
   // Parse the test specific arguments.
 
-  int test_narrow (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int test_narrow (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // This test narrow an object reference to its base class and see
   // if it works correctly.
 
-  int run (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Run the test.
 
 private:
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
index df102e638a8..d3d9104b424 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp
@@ -13,7 +13,7 @@ Top_i::~Top_i ()
 }
 
 char *
-Top_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Top_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -32,7 +32,7 @@ Left_i::~Left_i ()
 }
 
 char *
-Left_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Left_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -41,7 +41,7 @@ Left_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Left_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Left_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -60,7 +60,7 @@ Right_i::~Right_i ()
 }
 
 char *
-Right_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Right_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -69,7 +69,7 @@ Right_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Right_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Right_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -79,7 +79,7 @@ Right_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::Long
-Right_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Right_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -98,7 +98,7 @@ Buttom_i::~Buttom_i ()
 }
 
 char *
-Buttom_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -107,7 +107,7 @@ Buttom_i::shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Buttom_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -116,7 +116,7 @@ Buttom_i::color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 CORBA::Long
-Buttom_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
@@ -125,7 +125,7 @@ Buttom_i::width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 char *
-Buttom_i::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Buttom_i::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
index 3b4540e57e9..37e4899af76 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h
@@ -16,7 +16,7 @@ public:
   ~Top_i (void);
   // Ctor and dtor.
 
-  virtual char* shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 };
@@ -28,11 +28,11 @@ public:
   ~Left_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 };
@@ -44,15 +44,15 @@ public:
   ~Right_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the width of the stuff.
 };
@@ -64,19 +64,19 @@ public:
   ~Buttom_i (void);
   // Ctor, dtor.
 
-  virtual char * shape (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * shape (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the shape of this object (interface.)
 
-  virtual char * color (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * color (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual CORBA::Long width (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the width of the stuff.
 
-  virtual char * name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return the name of the object.
 };
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index 65b2483243b..a054b238024 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -9,7 +9,7 @@ Smart_Diamond_Top_Factory::Smart_Diamond_Top_Factory (void)
 
 Diamond::Top_ptr
 Smart_Diamond_Top_Factory::create_proxy (Diamond::Top_ptr proxy
-                                                 TAO_ENV_ARG_DECL_NOT_USED
+                                                 ACE_ENV_ARG_DECL_NOT_USED
                                                     )
  {
    ACE_DEBUG ((LM_DEBUG, "create_smart_proxy\n"));
@@ -28,7 +28,7 @@ Smart_Diamond_Top_Proxy::Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy)
 
 char *
 Smart_Diamond_Top_Proxy::shape (
-                                                                TAO_ENV_SINGLE_ARG_DECL
+                                                                ACE_ENV_SINGLE_ARG_DECL
                                                                 )
   ACE_THROW_SPEC ((
                    CORBA::SystemException
@@ -40,7 +40,7 @@ Smart_Diamond_Top_Proxy::shape (
   char *ans= 0;
   ACE_TRY
     {
-          ans = ACE_OS::strdup (TAO_Diamond_Top_Smart_Proxy_Base::shape(TAO_ENV_SINGLE_ARG_PARAMETER));
+          ans = ACE_OS::strdup (TAO_Diamond_Top_Smart_Proxy_Base::shape(ACE_ENV_SINGLE_ARG_PARAMETER));
 
           ACE_TRY_CHECK;
 
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
index c89926eb6a5..87c0a8d453a 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h
@@ -11,7 +11,7 @@ class ACE_Svc_Export Smart_Diamond_Top_Factory : public virtual Diamond::TAO_Dia
   Smart_Diamond_Top_Factory (void);
 
   virtual Diamond::Top_ptr create_proxy (Diamond::Top_ptr proxy
-                                         TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
   // This method will create the smart_proxy.
 };
@@ -24,7 +24,7 @@ class ACE_Svc_Export Smart_Diamond_Top_Proxy : public virtual Diamond::TAO_Diamo
   Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy);
 
   virtual char * shape (
-                       TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+                       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
 
     ACE_THROW_SPEC ((
       CORBA::SystemException
diff --git a/TAO/tests/Smart_Proxies/Collocation/main.cpp b/TAO/tests/Smart_Proxies/Collocation/main.cpp
index 71ff66d922a..bd883b7c6e5 100644
--- a/TAO/tests/Smart_Proxies/Collocation/main.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/main.cpp
@@ -12,10 +12,10 @@ int main (int argc, char *argv[])
 
   ACE_TRY_NEW_ENV
     {
-      coll_test.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      coll_test.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      coll_test.run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
index 5d05e7d417e..62e5232517a 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp
@@ -8,7 +8,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 
 CORBA::Short
 Smart_Test_Proxy::method (CORBA::Short boo
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -19,7 +19,7 @@ Smart_Test_Proxy::method (CORBA::Short boo
   ACE_TRY
     {
       retval = TAO_Test_Smart_Proxy_Base::method (boo
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (Test::Oops, reason)
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
index b466f3fbe0c..a31d8556f36 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h
@@ -8,7 +8,7 @@ public:
   Smart_Test_Proxy (Test_ptr proxy);
 
   virtual CORBA::Short method (CORBA::Short boo
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
   // "Smartify" the method call!
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
index 20d025118f4..1d8380fc600 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
@@ -10,7 +10,7 @@ Smart_Test_Factory::Smart_Test_Factory (void)
 
 Test_ptr
 Smart_Test_Factory::create_proxy (Test_ptr proxy
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
  {
    ACE_DEBUG ((LM_DEBUG,
                "create_smart_proxy\n"));
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
index 4ce95df91b1..16825ed5720 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h
@@ -13,7 +13,7 @@ public:
   Smart_Test_Factory (void);
 
   virtual Test_ptr create_proxy (Test_ptr proxy
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // This method will create the smart_proxy.
 };
 
diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.cpp b/TAO/tests/Smart_Proxies/On_Demand/client.cpp
index 38576ea7d60..fa0ad5e077f 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/client.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/client.cpp
@@ -58,7 +58,7 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -66,7 +66,7 @@ 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;
 
       // To use the smart proxy just enter it as a svc.conf
@@ -74,7 +74,7 @@ main (int argc, char *argv[])
 
       Test_var server =
         Test::_narrow (object.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -85,7 +85,7 @@ main (int argc, char *argv[])
 
       server->method (0);
 
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
index aa8145b53ec..99d8cce8908 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
@@ -29,11 +29,11 @@ public:
   Test_i (CORBA::ORB_ptr orb);
 
   CORBA::Short method  (CORBA::Short boo
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
 
-  void shutdown  (TAO_ENV_SINGLE_ARG_DECL)
+  void shutdown  (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -48,7 +48,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 CORBA::Short
 Test_i :: method (CORBA::Short boo
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -62,7 +62,7 @@ Test_i :: method (CORBA::Short boo
 }
 
 void
-Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
@@ -98,7 +98,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -108,33 +108,33 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             ""
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i servant (orb.in ());
       // Obtain RootPOA.
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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;
 
       Test_var Test_object =
-        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (Test_object.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -154,17 +154,17 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
index 1fdcda810e7..4123f962892 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
@@ -11,7 +11,7 @@ Smart_Test_Factory::Smart_Test_Factory (int one_shot_factory)
 
 Test_ptr
 Smart_Test_Factory::create_proxy (Test_ptr proxy
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
  {
    ACE_DEBUG ((LM_DEBUG,
                "create_smart_proxy\n"));
@@ -30,7 +30,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 
 CORBA::Short
 Smart_Test_Proxy::method (CORBA::Short boo
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -41,7 +41,7 @@ Smart_Test_Proxy::method (CORBA::Short boo
   ACE_TRY
     {
       retval = TAO_Test_Smart_Proxy_Base::method (boo
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (Test::Oops, reason)
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
index 10edb88bf24..f024b4b69f7 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h
@@ -9,7 +9,7 @@ public:
   Smart_Test_Factory (int one_shot_factory = 1);
 
   virtual Test_ptr create_proxy (Test_ptr proxy
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // This method will create the smart_proxy.
 };
 
@@ -19,7 +19,7 @@ public:
   Smart_Test_Proxy (Test_ptr proxy);
 
   virtual CORBA::Short method (CORBA::Short boo
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
   // "Smartify" the method call!
diff --git a/TAO/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp
index b9a9b71b233..cfdaadb1a9f 100644
--- a/TAO/tests/Smart_Proxies/Policy/client.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/client.cpp
@@ -68,26 +68,26 @@ run_test (CORBA::ORB_ptr orb_ptr,
         {
           object =
             orb->string_to_object (ior1
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
         }
       else
         {
           object =
             orb->string_to_object (ior2
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
         }
       ACE_TRY_CHECK;
 
       Test_var server =
         Test::_narrow (object.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       if (CORBA::is_nil (server.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Object reference is nil\n"),
                           1);
 
       server->method (0);
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
@@ -109,7 +109,7 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp
index d83fffb74e9..eb7b9a50edf 100644
--- a/TAO/tests/Smart_Proxies/Policy/server.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/server.cpp
@@ -29,11 +29,11 @@ public:
   Test_i (CORBA::ORB_ptr orb);
 
   CORBA::Short method  (CORBA::Short boo
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
 
-  void shutdown  (TAO_ENV_SINGLE_ARG_DECL)
+  void shutdown  (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -48,7 +48,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 CORBA::Short
 Test_i :: method (CORBA::Short boo
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -62,10 +62,10 @@ Test_i :: method (CORBA::Short boo
 }
 
 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);
 }
 
 static const char *ior_output_file = 0;
@@ -98,7 +98,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -108,34 +108,34 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             ""
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i servant (orb.in ());
       // Obtain RootPOA.
       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;
 
       // Get the POAManager of the RootPOA.
       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;
 
       Test_var Test_object =
-        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (Test_object.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -155,10 +155,10 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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,
@@ -166,7 +166,7 @@ main (int argc, char *argv[])
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
index 996a0e588d4..b49a86973b1 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
@@ -10,7 +10,7 @@ Smart_Test_Factory::Smart_Test_Factory (void)
 
 Test_ptr
 Smart_Test_Factory::create_proxy (Test_ptr proxy
-                                  TAO_ENV_ARG_DECL_NOT_USED)
+                                  ACE_ENV_ARG_DECL_NOT_USED)
  {
    ACE_DEBUG ((LM_DEBUG,
                "create_smart_proxy\n"));
@@ -29,7 +29,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
 
 CORBA::Short
 Smart_Test_Proxy::method (CORBA::Short boo
-                          TAO_ENV_ARG_DECL)
+                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -40,7 +40,7 @@ Smart_Test_Proxy::method (CORBA::Short boo
   ACE_TRY
     {
       retval = TAO_Test_Smart_Proxy_Base::method (boo
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (Test::Oops, reason)
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
index 838a34b97ae..a61d96be76d 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h
@@ -9,7 +9,7 @@ public:
   Smart_Test_Factory (void);
 
   virtual Test_ptr create_proxy (Test_ptr proxy
-                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // This method will create the smart_proxy.
 };
 
@@ -19,7 +19,7 @@ public:
   Smart_Test_Proxy (Test_ptr proxy);
 
   virtual CORBA::Short method (CORBA::Short boo
-                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
   // "Smartify" the method call!
diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp
index 7a1936ab633..e8d1327eeef 100644
--- a/TAO/tests/Smart_Proxies/client.cpp
+++ b/TAO/tests/Smart_Proxies/client.cpp
@@ -58,7 +58,7 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -66,7 +66,7 @@ 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;
 
       // To use the smart proxy it is necessary to allocate the
@@ -87,7 +87,7 @@ main (int argc, char *argv[])
 
       Test_var server =
         Test::_narrow (object.in ()
-                       TAO_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
 
       server->method (0);
 
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
     }
diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp
index bf15eee2556..66bf39ba583 100644
--- a/TAO/tests/Smart_Proxies/server.cpp
+++ b/TAO/tests/Smart_Proxies/server.cpp
@@ -29,11 +29,11 @@ public:
   Test_i (CORBA::ORB_ptr orb);
 
   CORBA::Short method  (CORBA::Short boo
-                        TAO_ENV_ARG_DECL)
+                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Test::Oops));
 
-  void shutdown  (TAO_ENV_SINGLE_ARG_DECL)
+  void shutdown  (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -48,7 +48,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 
 CORBA::Short
 Test_i :: method (CORBA::Short boo
-                  TAO_ENV_ARG_DECL)
+                  ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Test::Oops))
 {
@@ -62,7 +62,7 @@ Test_i :: method (CORBA::Short boo
 }
 
 void
-Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown ();
@@ -98,7 +98,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -108,33 +108,33 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             ""
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i servant (orb.in ());
       // Obtain RootPOA.
       CORBA::Object_var object =
         orb->resolve_initial_references ("RootPOA"
-                                         TAO_ENV_ARG_PARAMETER);
+                                         ACE_ENV_ARG_PARAMETER);
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in ()
-                                      TAO_ENV_ARG_PARAMETER);
+                                      ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
       // Get the POAManager of the RootPOA.
       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;
 
       Test_var Test_object =
-        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (Test_object.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
 
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
@@ -154,17 +154,17 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp
index 9886e27c16e..a554f94fea5 100644
--- a/TAO/tests/Strategies/client.cpp
+++ b/TAO/tests/Strategies/client.cpp
@@ -67,18 +67,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->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -91,7 +91,7 @@ main (int argc, char *argv[])
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        server->print_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server->print_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret_value == 0)
@@ -103,11 +103,11 @@ main (int argc, char *argv[])
 
       if (server_shutdown)
         {
-          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          server->shutdown (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/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp
index 589a59091aa..7c4d59157bc 100644
--- a/TAO/tests/Strategies/server.cpp
+++ b/TAO/tests/Strategies/server.cpp
@@ -38,11 +38,11 @@ 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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -51,11 +51,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       if (parse_args (argc, argv) != 0)
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -86,18 +86,18 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Strategies/simple_test_i.cpp b/TAO/tests/Strategies/simple_test_i.cpp
index 8c9c75ef9b1..f6ca0ea9a94 100644
--- a/TAO/tests/Strategies/simple_test_i.cpp
+++ b/TAO/tests/Strategies/simple_test_i.cpp
@@ -10,7 +10,7 @@
 ACE_RCSID(tests, simple_test_i, "$Id$")
 
 CORBA::Boolean
-Simple_Server_i::print_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::print_status (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -20,7 +20,7 @@ Simple_Server_i::print_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/tests/Strategies/simple_test_i.h b/TAO/tests/Strategies/simple_test_i.h
index f58ecb402d5..ad353e0a263 100644
--- a/TAO/tests/Strategies/simple_test_i.h
+++ b/TAO/tests/Strategies/simple_test_i.h
@@ -31,10 +31,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  CORBA::Boolean print_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  CORBA::Boolean print_status (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:
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index 11765552378..a3d05a6c5c5 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -116,7 +116,7 @@ parse_args (int argc, char **argv)
 
 void
 setup_timeouts (CORBA::ORB_ptr orb
-                TAO_ENV_ARG_DECL)
+                ACE_ENV_ARG_DECL)
 {
   // Escape value.
   if (timeout == -1)
@@ -124,13 +124,13 @@ setup_timeouts (CORBA::ORB_ptr orb
 
   // Obtain PolicyCurrent.
   CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent"
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Narrow down to correct type.
   CORBA::PolicyCurrent_var policy_current =
     CORBA::PolicyCurrent::_narrow (object.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   TimeBase::TimeT rt_timeout = 10000 * timeout;
@@ -144,31 +144,31 @@ setup_timeouts (CORBA::ORB_ptr orb
   rt_timeout_policy_list[0] =
     orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                         rt_timeout_any
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   policy_current->set_policy_overrides (rt_timeout_policy_list,
                                         CORBA::ADD_OVERRIDE
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  rt_timeout_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  rt_timeout_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 setup_buffering_constraints (CORBA::ORB_ptr orb
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
   // Obtain PolicyCurrent.
   CORBA::Object_var object = orb->resolve_initial_references ("PolicyCurrent"
-                                                              TAO_ENV_ARG_PARAMETER);
+                                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Narrow down to correct type.
   CORBA::PolicyCurrent_var policy_current =
     CORBA::PolicyCurrent::_narrow (object.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the sync scope policy, i.e., the ORB will buffer oneways.
@@ -187,17 +187,17 @@ setup_buffering_constraints (CORBA::ORB_ptr orb
   sync_policy_list[0] =
     orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
                         sync_any
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the sync scope.
   policy_current->set_policy_overrides (sync_policy_list,
                                         CORBA::ADD_OVERRIDE
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // We are now done with this policy.
-  sync_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  sync_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Flush buffers.
@@ -219,24 +219,24 @@ setup_buffering_constraints (CORBA::ORB_ptr orb
   buffering_constraint_policy_list[0] =
     orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
                         buffering_constraint_any
-                        TAO_ENV_ARG_PARAMETER);
+                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Setup the constraints.
   policy_current->set_policy_overrides (buffering_constraint_policy_list,
                                         CORBA::ADD_OVERRIDE
-                                        TAO_ENV_ARG_PARAMETER);
+                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // We are done with the policy.
-  buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+  buffering_constraint_policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 int
 main (int argc, char **argv)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -245,7 +245,7 @@ main (int argc, char **argv)
         CORBA::ORB_init (argc,
                          argv,
                          0
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
@@ -256,22 +256,22 @@ main (int argc, char **argv)
       // Get an object reference from the argument string.
       CORBA::Object_var object =
         orb->string_to_object (IOR
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Try to narrow the object reference to a <test> reference.
       test_var test_object = test::_narrow (object.in ()
-                                            TAO_ENV_ARG_PARAMETER);
+                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Setup buffering.
       setup_buffering_constraints (orb.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Setup timeout.
       setup_timeouts (orb.in ()
-                      TAO_ENV_ARG_PARAMETER);
+                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test::data the_data (data_bytes);
@@ -287,7 +287,7 @@ main (int argc, char **argv)
           test_object->method (i,
                                the_data,
                                work
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Interval between successive calls.
@@ -300,7 +300,7 @@ main (int argc, char **argv)
       // Shutdown server.
       if (shutdown_server)
         {
-          test_object->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+          test_object->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -310,7 +310,7 @@ main (int argc, char **argv)
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp
index 6f82d84ac69..13f7c855cfd 100644
--- a/TAO/tests/Timed_Buffered_Oneways/server.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp
@@ -42,21 +42,21 @@ main (int argc, char *argv[])
         CORBA::ORB_init (argc,
                          argv,
                          ""
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_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 (poa_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;
 
       if (parse_args (argc, argv) != 0)
@@ -65,12 +65,12 @@ main (int argc, char *argv[])
       test_i servant (orb.in ());
 
       test_var server =
-        servant._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
         orb->object_to_string (server.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -84,17 +84,17 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      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, "event loop finished\n"));
 
       root_poa->destroy (1,
                          1
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
index ae78c1de3e6..9fbd1859f2a 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp
@@ -13,7 +13,7 @@ void
 test_i::method (CORBA::ULong request_number,
                 const test::data &,
                 CORBA::ULong work
-                TAO_ENV_ARG_DECL_NOT_USED)
+                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -29,9 +29,9 @@ test_i::method (CORBA::ULong request_number,
 }
 
 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);
 }
diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.h b/TAO/tests/Timed_Buffered_Oneways/test_i.h
index 06723f6b263..48b20f4057f 100644
--- a/TAO/tests/Timed_Buffered_Oneways/test_i.h
+++ b/TAO/tests/Timed_Buffered_Oneways/test_i.h
@@ -31,10 +31,10 @@ public:
   void method (CORBA::ULong request_number,
                const test::data &,
                CORBA::ULong work
-               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:
diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp
index 4fc08c121d0..a6c340c3142 100644
--- a/TAO/tests/Timeout/client.cpp
+++ b/TAO/tests/Timeout/client.cpp
@@ -54,11 +54,11 @@ void
 send_echo (CORBA::ORB_ptr orb,
            Simple_Server_ptr server,
            CORBA::Long t
-           TAO_ENV_ARG_DECL)
+           ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      server->echo (0, t TAO_ENV_ARG_PARAMETER);
+      server->echo (0, t ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       in_time_count++;
@@ -76,7 +76,7 @@ send_echo (CORBA::ORB_ptr orb,
                          (max_timeout % 1000) * 1000);
 
       // This is a non-standard TAO call.
-      orb->run (tv TAO_ENV_ARG_PARAMETER);
+      orb->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_ENDTRY;
@@ -88,18 +88,18 @@ int 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->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -112,20 +112,20 @@ int main (int argc, char* argv[])
 
       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;
 
       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;
 
       TimeBase::TimeT mid_value =
@@ -143,19 +143,19 @@ int main (int argc, char* argv[])
       policy_list[0] =
         orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                             any_object
-                            TAO_ENV_ARG_PARAMETER);
+                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       object =
         server->_set_policy_overrides (policy_list,
                                        CORBA::SET_OVERRIDE
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Simple_Server_var timeout_server =
-        Simple_Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_list[0] = CORBA::Policy::_nil ();
 
@@ -175,14 +175,14 @@ int main (int argc, char* argv[])
           policy_list.length (0);
           policy_manager->set_policy_overrides (policy_list,
                                                 CORBA::SET_OVERRIDE
-                                                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;
 
-          send_echo (orb.in (), server.in (), t TAO_ENV_ARG_PARAMETER);
+          send_echo (orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_DEBUG ((LM_DEBUG,
@@ -192,18 +192,18 @@ int main (int argc, char* argv[])
           policy_list[0] =
             orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                                 any_orb
-                                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;
 
-          send_echo (orb.in (), server.in (), t TAO_ENV_ARG_PARAMETER);
+          send_echo (orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_DEBUG ((LM_DEBUG,
@@ -213,23 +213,23 @@ int main (int argc, char* argv[])
           policy_list[0] =
             orb->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
                                 any_thread
-                                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;
 
-          send_echo (orb.in (), server.in (), t TAO_ENV_ARG_PARAMETER);
+          send_echo (orb.in (), server.in (), t ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+          policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_DEBUG ((LM_DEBUG,
           //            "client(%P) Use the object policies\n"));
-          send_echo (orb.in (), timeout_server.in (), t TAO_ENV_ARG_PARAMETER);
+          send_echo (orb.in (), timeout_server.in (), t ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -239,17 +239,17 @@ int main (int argc, char* argv[])
       policy_list.length (0);
       policy_manager->set_policy_overrides (policy_list,
                                             CORBA::SET_OVERRIDE
-                                            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;
 
-      send_echo (orb.in (), server.in (), 0 TAO_ENV_ARG_PARAMETER);
+      send_echo (orb.in (), server.in (), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
+      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (timeout_count == 0)
@@ -263,7 +263,7 @@ int main (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "In time = %d, timed out = %d\n",
                   in_time_count, timeout_count));
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp
index 7678b8438b5..3d3109929b8 100644
--- a/TAO/tests/Timeout/server.cpp
+++ b/TAO/tests/Timeout/server.cpp
@@ -40,14 +40,14 @@ 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 poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -56,21 +56,21 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       Simple_Server_i server_impl (orb.in ());
 
       Simple_Server_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -88,10 +88,10 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      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, "event loop finished\n"));
diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp
index bbf564047ba..626d3d966a1 100644
--- a/TAO/tests/Timeout/test_i.cpp
+++ b/TAO/tests/Timeout/test_i.cpp
@@ -17,7 +17,7 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
 CORBA::Long
 Simple_Server_i::echo (CORBA::Long x,
                        CORBA::Long msecs
-                       TAO_ENV_ARG_DECL_NOT_USED)
+                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Time_Value tv (msecs / 1000, (msecs % 1000) * 1000);
@@ -30,10 +30,10 @@ Simple_Server_i::echo (CORBA::Long x,
 }
 
 void
-Simple_Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
               "server (%P) Received shutdown request from client\n"));
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/Timeout/test_i.h
index fcc74c77fab..78b4c9015fd 100644
--- a/TAO/tests/Timeout/test_i.h
+++ b/TAO/tests/Timeout/test_i.h
@@ -33,9 +33,9 @@ public:
   // = The Simple_Server methods.
   CORBA::Long echo (CORBA::Long x,
                     CORBA::Long msecs
-                    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:
diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp
index 08e22cbe995..6e0c6e2c465 100644
--- a/TAO/tests/Two_Objects/First_i.cpp
+++ b/TAO/tests/Two_Objects/First_i.cpp
@@ -17,7 +17,7 @@ First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done)
 }
 
 void
-First_i::oneway_method (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+First_i::oneway_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "Oneway servant : (%P|%t) one way method called. About to wait for two way call completion\n"));
diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h
index 58605c40548..71665113827 100644
--- a/TAO/tests/Two_Objects/First_i.h
+++ b/TAO/tests/Two_Objects/First_i.h
@@ -19,7 +19,7 @@ public:
   First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done);
 
   /// Interface methods..
-  void oneway_method (TAO_ENV_SINGLE_ARG_DECL)
+  void oneway_method (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp
index a7d18778599..023ccf9b40f 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.cpp
+++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp
@@ -18,7 +18,7 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len)
 
 //factory method to create first object
 Two_Objects_Test::First_ptr
-Object_Factory_i::create_first (TAO_ENV_SINGLE_ARG_DECL)
+Object_Factory_i::create_first (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   First_i *first_impl;
@@ -29,14 +29,14 @@ Object_Factory_i::create_first (TAO_ENV_SINGLE_ARG_DECL)
                     CORBA::NO_MEMORY() );
 
   Two_Objects_Test::First_var first =
-    first_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER );
+    first_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER );
 
   return first._retn();
 }
 
 //factory method to create second object
 Two_Objects_Test::Second_ptr
-Object_Factory_i::create_second (TAO_ENV_SINGLE_ARG_DECL)
+Object_Factory_i::create_second (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Second_i *second_impl;
@@ -47,7 +47,7 @@ Object_Factory_i::create_second (TAO_ENV_SINGLE_ARG_DECL)
                     CORBA::NO_MEMORY ());
 
   Two_Objects_Test::Second_var second =
-    second_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+    second_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
 
   return second._retn();
 }
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h
index d49488208cf..2eab1c9966f 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.h
+++ b/TAO/tests/Two_Objects/Object_Factory_i.h
@@ -20,10 +20,10 @@ public:
   Object_Factory_i (CORBA::ORB_ptr orb,
                     CORBA::ULong len);
 
-  Two_Objects_Test::First_ptr create_first (TAO_ENV_SINGLE_ARG_DECL)
+  Two_Objects_Test::First_ptr create_first (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-  Two_Objects_Test::Second_ptr create_second (TAO_ENV_SINGLE_ARG_DECL)
+  Two_Objects_Test::Second_ptr create_second (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp
index a2805cc5d21..ea5ce8b464d 100644
--- a/TAO/tests/Two_Objects/Second_i.cpp
+++ b/TAO/tests/Two_Objects/Second_i.cpp
@@ -21,7 +21,7 @@ Second_i::Second_i (CORBA::ORB_ptr orb,
 }
 
 Two_Objects_Test::Octet_Seq *
-Second_i::twoway_method (TAO_ENV_SINGLE_ARG_DECL)
+Second_i::twoway_method (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Two_Objects_Test::Octet_Seq  *preply_mesg;
@@ -53,9 +53,9 @@ Second_i::twoway_method (TAO_ENV_SINGLE_ARG_DECL)
 }
 
 void
-Second_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
+Second_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) about to shutdown the orb\n"));
-  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h
index 073f24e877f..827d32677df 100644
--- a/TAO/tests/Two_Objects/Second_i.h
+++ b/TAO/tests/Two_Objects/Second_i.h
@@ -17,10 +17,10 @@ public:
              CORBA::ULong len, ACE_Auto_Event &two_way_done);
 
   Two_Objects_Test::Octet_Seq *
-    twoway_method (TAO_ENV_SINGLE_ARG_DECL)
+    twoway_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));
 
 private:
diff --git a/TAO/tests/Two_Objects/client.cpp b/TAO/tests/Two_Objects/client.cpp
index 6314205f474..d93a387409a 100644
--- a/TAO/tests/Two_Objects/client.cpp
+++ b/TAO/tests/Two_Objects/client.cpp
@@ -37,13 +37,13 @@ int
 main (int argc, char *argv[])
 {
   // Used to declare the CORBA::Environment variable
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the 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 the arguments
@@ -54,13 +54,13 @@ main (int argc, char *argv[])
       // The object reference obtained is a reference to the factory
       // object.
       CORBA::Object_var tmp =
-        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow the object reference to the appropriate type
       Two_Objects_Test::Object_Factory_var factory =
         Two_Objects_Test::Object_Factory::_narrow(tmp.in ()
-                                                  TAO_ENV_ARG_PARAMETER);
+                                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -79,19 +79,19 @@ main (int argc, char *argv[])
       second = factory->create_second();
 
       // Call the oneway method
-      first->oneway_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      first->oneway_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Client : one way call done\n"));
 
       Two_Objects_Test::Octet_Seq_var reply_seq =
-      second->twoway_method (TAO_ENV_SINGLE_ARG_PARAMETER);
+      second->twoway_method (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Client : length of returned data is %d\n",
                      reply_seq->length() ));
 
-      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp
index 2d9389ca115..0aab902c36d 100644
--- a/TAO/tests/Two_Objects/server.cpp
+++ b/TAO/tests/Two_Objects/server.cpp
@@ -62,17 +62,17 @@ main (int argc, char *argv[])
     {
       // Initialize the 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;
 
       // Get initial reference to the Root POA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow down to the appropriate type
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
 
       // Get referencee to 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;
 
       // Parse the arguments
@@ -102,13 +102,13 @@ main (int argc, char *argv[])
       // _this method registers the object withe the POA and returns
       // an object reference
       Two_Objects_Test::Object_Factory_var factory =
-        factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        factory_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Convert the object reference to a string so that it can
       // be saved in a file and used by clinet programs later
       CORBA::String_var ior =
-        orb->object_to_string (factory.in () TAO_ENV_ARG_PARAMETER);
+        orb->object_to_string (factory.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -124,7 +124,7 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // Activate the POA manager
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Instantiate the specified # of worker threads
@@ -141,10 +141,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) event loop finished\n"));
 
-      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      root_poa->destroy (1, 1 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/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp
index a0c0d58c9f8..9b75ea5a884 100644
--- a/TAO/tests/Two_Objects/worker.cpp
+++ b/TAO/tests/Two_Objects/worker.cpp
@@ -14,14 +14,14 @@ Worker::Worker (CORBA::ORB_ptr orb, int time)
 int
 Worker::svc (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       ACE_Time_Value tv (timeout_);
 
       ///orb times out after <timeout> seconds
-      this->orb_->run (tv TAO_ENV_ARG_PARAMETER);
+      this->orb_->run (tv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h
index 0d116185253..e39fb418d95 100644
--- a/TAO/tests/Xt_Stopwatch/Client.h
+++ b/TAO/tests/Xt_Stopwatch/Client.h
@@ -49,7 +49,7 @@ public:
   // Adds the callbacks to the GUI underneath.....
 
   void parse_args (int argc, char *argv[]
-                   TAO_ENV_ARG_DECL);
+                   ACE_ENV_ARG_DECL);
 private:
 
   CORBA::ORB_var orb_;
diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index 58c06433cbd..f40fe31f222 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -38,17 +38,17 @@ main (int argc, char *argv[])
 
   Control control (toplevel);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       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;
 
       Client client (orb.in ());
 
-      client.parse_args (argc, argv TAO_ENV_ARG_PARAMETER);
+      client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       client.add_callback (control);
@@ -79,7 +79,7 @@ Client::~Client (void)
 void
 Client::parse_args (int argc,
                     char *argv[]
-                    TAO_ENV_ARG_DECL)
+                    ACE_ENV_ARG_DECL)
 {
   const char *ior = "file://test.ior";
 
@@ -102,11 +102,11 @@ Client::parse_args (int argc,
       }
 
   CORBA::Object_var object =
-    this->orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+    this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   this->server_ =
-    Stopwatch::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+    Stopwatch::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil(this->server_.in ()))
@@ -157,10 +157,10 @@ Client::stop_callback (Widget /*widget*/,
 void
 Client::start_hook (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->server_->start (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->server_->start (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -175,10 +175,10 @@ Client::start_hook (void)
 void
 Client::stop_hook (void)
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->server_->stop (TAO_ENV_SINGLE_ARG_PARAMETER);
+      this->server_->stop (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index 984aa6b5304..b02fa3f9951 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/server.cpp
@@ -72,16 +72,16 @@ main (int argc, char *argv[])
 
   Stopwatch_display stopwatch (toplevel);
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       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;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -90,11 +90,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () 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;
 
       stopwatch.manage ();
@@ -105,11 +105,11 @@ main (int argc, char *argv[])
       Stopwatch_imp server_impl (orb.in (), &timer);
 
       Stopwatch_var server =
-        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+        server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       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", ior.in ()));
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
       }
 
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       XtRealizeWidget (toplevel);
diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp
index 4b42f8473db..e224eb939df 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.cpp
+++ b/TAO/tests/Xt_Stopwatch/test_i.cpp
@@ -17,21 +17,21 @@ Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer)
 }
 
 void
-Stopwatch_imp::start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Stopwatch_imp::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->timer_->start ();
 }
 
 void
-Stopwatch_imp::stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Stopwatch_imp::stop (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->timer_->stop ();
 }
 
 void
-Stopwatch_imp::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Stopwatch_imp::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0);
diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h
index 550d3c2390d..1450ca0a48b 100644
--- a/TAO/tests/Xt_Stopwatch/test_i.h
+++ b/TAO/tests/Xt_Stopwatch/test_i.h
@@ -34,13 +34,13 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void start (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void stop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void stop (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:
diff --git a/TAO/tests/ior_corbaloc/client.cpp b/TAO/tests/ior_corbaloc/client.cpp
index 023165f06f0..d88cef1f264 100644
--- a/TAO/tests/ior_corbaloc/client.cpp
+++ b/TAO/tests/ior_corbaloc/client.cpp
@@ -23,7 +23,7 @@
 int main (int argc, char *argv [])
 {
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -31,12 +31,12 @@ int main (int argc, char *argv [])
       IOR_corbaloc_Client_i client;
 
       int init_result;
-      init_result = client.init (argc, argv TAO_ENV_ARG_PARAMETER);
+      init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (init_result == 0)
           {
-            client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
+            client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
         return 0;
diff --git a/TAO/tests/ior_corbaloc/corbaname_client.cpp b/TAO/tests/ior_corbaloc/corbaname_client.cpp
index c240ebce76a..03cae419d01 100644
--- a/TAO/tests/ior_corbaloc/corbaname_client.cpp
+++ b/TAO/tests/ior_corbaloc/corbaname_client.cpp
@@ -18,7 +18,7 @@
 
 int main (int argc, char *argv [])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
@@ -27,7 +27,7 @@ int main (int argc, char *argv [])
         CORBA::ORB_init (argc,
                          argv,
                          "" /* the ORB name, it can be anything! */
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 
       if(argc < 2 )
         {
@@ -40,12 +40,12 @@ int main (int argc, char *argv [])
       // Get an object reference using a corbaname: style URL
       CORBA::Object_var obj =
         orb->string_to_object (argv[1]
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow
       corbaloc::Status_var factory =
-        corbaloc::Status::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        corbaloc::Status::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -58,7 +58,7 @@ int main (int argc, char *argv [])
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        factory->print_status (TAO_ENV_SINGLE_ARG_PARAMETER);
+        factory->print_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret_value != 0)
diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp
index 7b81ae125a2..e00481deee0 100644
--- a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp
+++ b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp
@@ -33,7 +33,7 @@ IOR_corbaloc_Client_i::~IOR_corbaloc_Client_i (void)
 }
 
 int
-IOR_corbaloc_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
+IOR_corbaloc_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
 {
 
   ACE_TRY
@@ -45,13 +45,13 @@ IOR_corbaloc_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
 
       // Resolve the name
       CORBA::Object_var factory_object =
-        this->naming_context_->resolve (name TAO_ENV_ARG_PARAMETER);
+        this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow
       corbaloc::Status_var factory =
         corbaloc::Status::_narrow (factory_object.in ()
-                                   TAO_ENV_ARG_PARAMETER);
+                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -64,7 +64,7 @@ IOR_corbaloc_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
 
       // Invoke a request on the server
       CORBA::Boolean ret_value =
-        factory->print_status (TAO_ENV_ARG_PARAMETER);
+        factory->print_status (ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret_value != 0)
@@ -95,7 +95,7 @@ IOR_corbaloc_Client_i::run (TAO_ENV_SINGLE_ARG_DECL)
 int
 IOR_corbaloc_Client_i::init (int& argc,
                              char *argv[]
-                             TAO_ENV_ARG_DECL)
+                             ACE_ENV_ARG_DECL)
 {
 
   ACE_TRY
@@ -106,7 +106,7 @@ IOR_corbaloc_Client_i::init (int& argc,
         CORBA::ORB_init (argc,
                          argv,
                          "" /* the ORB name, it can be anything! */
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
 
       if(argc < 2){
               ACE_DEBUG((LM_DEBUG, "\nUsage:\n  %s [corbaloc URL for NameService]\n", argv[0]));
@@ -118,7 +118,7 @@ IOR_corbaloc_Client_i::init (int& argc,
       // Get a reference to the Naming Service
       CORBA::Object_var naming_context_object =
         orb->string_to_object (corbaloc_url_.c_str()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (naming_context_object.in ()))
@@ -129,7 +129,7 @@ IOR_corbaloc_Client_i::init (int& argc,
       // Narrow to get the correct reference
       this->naming_context_ =
         CosNaming::NamingContextExt::_narrow (naming_context_object.in ()
-                                              TAO_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->naming_context_.in ()))
diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h
index f785eb1dd80..060c38d1a77 100644
--- a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h
+++ b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.h
@@ -39,10 +39,10 @@ class IOR_corbaloc_Client_i
   IOR_corbaloc_Client_i (void);
   ~IOR_corbaloc_Client_i (void);
 
-  int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Execute the client example code.
 
-  int init (int& argc, char *argv[] TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+  int init (int& argc, char *argv[] ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // Initialize the client communication endpoint with the server.
 
  private:
diff --git a/TAO/tests/ior_corbaloc/server.cpp b/TAO/tests/ior_corbaloc/server.cpp
index 8dfc85c305b..4396c20085e 100644
--- a/TAO/tests/ior_corbaloc/server.cpp
+++ b/TAO/tests/ior_corbaloc/server.cpp
@@ -10,7 +10,7 @@
 int main (int argc, char* argv[])
 {
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 
@@ -18,7 +18,7 @@ int main (int argc, char* argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv,
                          "" /* the ORB name, it can be anything! */
-                         TAO_ENV_ARG_PARAMETER);
+                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if(argc < 2){
@@ -27,21 +27,21 @@ int main (int argc, char* argv[])
       }
       // Get a reference to the RootPOA
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // narrow down to the correct reference
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
+        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Set a POA Manager
       PortableServer::POAManager_var poa_manager =
-        poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+        poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Activate the POA Manager
-      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the servant
@@ -54,13 +54,13 @@ int main (int argc, char* argv[])
 
       // Get a reference to Naming Context
       CORBA::Object_var naming_context_object =
-        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Narrow down the reference
       CosNaming::NamingContext_var naming_context =
         CosNaming::NamingContext::_narrow (naming_context_object.in()
-                                           TAO_ENV_ARG_PARAMETER);
+                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Bind Iterator_Factory to the Naming Context
@@ -72,13 +72,13 @@ int main (int argc, char* argv[])
       ACE_TRY_CHECK;
 
       // Run the orb
-      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy the POA, waiting until the destruction terminates
-      poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+      poa->destroy (1, 1 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_CATCH (CORBA::SystemException, ex) {
diff --git a/TAO/tests/ior_corbaloc/status_i.cpp b/TAO/tests/ior_corbaloc/status_i.cpp
index d645e7c0170..d0a9207c320 100644
--- a/TAO/tests/ior_corbaloc/status_i.cpp
+++ b/TAO/tests/ior_corbaloc/status_i.cpp
@@ -2,14 +2,14 @@
 
 #include "status_i.h"
 
-corbaloc_Status_i::corbaloc_Status_i (TAO_ENV_ARG_DECL_NOT_USED)
+corbaloc_Status_i::corbaloc_Status_i (ACE_ENV_ARG_DECL_NOT_USED)
         : server_name_()
 {
   // Constructor
 }
 
 CORBA::Boolean
-corbaloc_Status_i::print_status (TAO_ENV_ARG_DECL_NOT_USED)
+corbaloc_Status_i::print_status (ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
diff --git a/TAO/tests/ior_corbaloc/status_i.h b/TAO/tests/ior_corbaloc/status_i.h
index cc197646643..0c06fa8cc6d 100644
--- a/TAO/tests/ior_corbaloc/status_i.h
+++ b/TAO/tests/ior_corbaloc/status_i.h
@@ -9,9 +9,9 @@
 
 class corbaloc_Status_i : public POA_corbaloc::Status {
 public:
-  corbaloc_Status_i (TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+  corbaloc_Status_i (ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  CORBA::Boolean print_status (TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+  CORBA::Boolean print_status (ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     throw (CORBA::SystemException);
 
   void set_name(const char *name){  server_name_=name; }
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index 9e4a91da725..93f2fa2ce9c 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -25,7 +25,7 @@
 
 static CORBA::Boolean
 catiiop (char* string
-         TAO_ENV_ARG_DECL)
+         ACE_ENV_ARG_DECL)
 {
   // NIL objref encodes as just "iiop:" ... which has already been
   // removed, so we see it as an empty string.
@@ -133,7 +133,7 @@ cat_profile_helper(TAO_InputCDR& stream, const char *protocol);
 
 static CORBA::Boolean
 catior (char* str
-        TAO_ENV_ARG_DECL_NOT_USED)
+        ACE_ENV_ARG_DECL_NOT_USED)
 {
   // Unhex the bytes, and make a CDR deencapsulation stream from the
   // resulting data.
@@ -292,7 +292,7 @@ catior (char* str
 
 static CORBA::Boolean
 catpoop (char* string
-        TAO_ENV_ARG_DECL)
+        ACE_ENV_ARG_DECL)
 {
   if (!string || !*string)
     return 0;
@@ -411,8 +411,8 @@ main (int argc, char *argv[])
 {
   ACE_Get_Opt get_opt (argc, argv, "f:n:");
 
-  TAO_ENV_DECLARE_NEW_ENV;
-  CORBA::ORB_var orb_var =  CORBA::ORB_init (argc, argv, "TAO" TAO_ENV_ARG_PARAMETER);
+  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::ORB_var orb_var =  CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER);
   CORBA::Boolean b = 0;
   int opt;
 
@@ -476,7 +476,7 @@ main (int argc, char *argv[])
                                          aString.length () - prefixLength);
                     subString[subString.length ()] = '\0';
                     str = subString.rep ();
-                    b = catior (str TAO_ENV_ARG_PARAMETER);
+                    b = catior (str ACE_ENV_ARG_PARAMETER);
                   }
                 else if (aString.find ("iiop:") == 0)
                   {
@@ -491,7 +491,7 @@ main (int argc, char *argv[])
                                          aString.length () - prefixLength);
                     //subString[subString.length () - 1] = '\0';
                     str = subString.rep ();
-                    b = catiiop (str TAO_ENV_ARG_PARAMETER);
+                    b = catiiop (str ACE_ENV_ARG_PARAMETER);
                   }
                 else if (aString.find (":IR:") > 0)
                   {
@@ -499,7 +499,7 @@ main (int argc, char *argv[])
                                 "decoding an POOP IOR\n"));
 
                     str = aString.rep ();
-                    b = catpoop (str TAO_ENV_ARG_PARAMETER);
+                    b = catpoop (str ACE_ENV_ARG_PARAMETER);
                   }
                 else
                   ACE_ERROR ((LM_ERROR,
diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp
index 3c61dfb04fa..1e2626d91a6 100644
--- a/TAO/utils/nslist/nsadd.cpp
+++ b/TAO/utils/nslist/nsadd.cpp
@@ -25,11 +25,11 @@ int showNSonly = 0;
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       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;
 
       char *pname = argv[0];
@@ -86,15 +86,15 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var obj =
-        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
+        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var nc_obj =
-        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var root_nc =
-        CosNaming::NamingContext::_narrow (nc_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (nc_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (root_nc.in ()))
         {
@@ -108,12 +108,12 @@ main (int argc, char *argv[])
       the_name[0].id = CORBA::string_dup (name);
       if (rebind)
         {
-          root_nc->rebind (the_name, obj.in () TAO_ENV_ARG_PARAMETER);
+          root_nc->rebind (the_name, obj.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
         {
-          root_nc->bind (the_name, obj.in () TAO_ENV_ARG_PARAMETER);
+          root_nc->bind (the_name, obj.in () ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp
index 276558f6190..3db6bfed55f 100644
--- a/TAO/utils/nslist/nsdel.cpp
+++ b/TAO/utils/nslist/nsdel.cpp
@@ -26,13 +26,13 @@ int showNSonly = 0;
 int
 main (int argc, char *argv[])
 {
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   int i;
   ACE_TRY
     {
       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;
 
       char *pname = argv[0];
@@ -110,11 +110,11 @@ main (int argc, char *argv[])
           printf ("name=%s\n", lastname );
 
       CORBA::Object_var nc_obj =
-        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var root_nc =
-        CosNaming::NamingContext::_narrow (nc_obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (nc_obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_nc.in ()))
@@ -132,7 +132,7 @@ main (int argc, char *argv[])
       the_name[ntoks - 1].id = CORBA::string_dup (lastname);
       if (kind != 0)
         the_name[ntoks - 1].kind = CORBA::string_dup (kind);
-      root_nc->unbind (the_name TAO_ENV_ARG_PARAMETER );
+      root_nc->unbind (the_name ACE_ENV_ARG_PARAMETER );
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp
index 607a0e8beeb..373ef784d64 100644
--- a/TAO/utils/nslist/nslist.cpp
+++ b/TAO/utils/nslist/nslist.cpp
@@ -26,7 +26,7 @@ int showNSonly = 0;
 
 static void list_context (CosNaming::NamingContext_ptr nc,
                           int level
-                          TAO_ENV_ARG_DECL);
+                          ACE_ENV_ARG_DECL);
 
 static void
 get_tag_name (CORBA::ULong tag, ACE_CString& tag_string)
@@ -102,7 +102,7 @@ static void
 show_chunk (CosNaming::NamingContext_ptr nc,
             const CosNaming::BindingList &bl,
             int level
-            TAO_ENV_ARG_DECL)
+            ACE_ENV_ARG_DECL)
 {
   for (CORBA::ULong i = 0;
        i < bl.length ();
@@ -126,7 +126,7 @@ show_chunk (CosNaming::NamingContext_ptr nc,
       Name[0].kind =
         CORBA::string_dup (bl[i].binding_name[0].kind);
 
-      CORBA::Object_var obj = nc->resolve (Name TAO_ENV_ARG_PARAMETER);
+      CORBA::Object_var obj = nc->resolve (Name ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       // If this is a context node, follow it down to the next
@@ -137,10 +137,10 @@ show_chunk (CosNaming::NamingContext_ptr nc,
                       ": naming context\n"));
 
           CosNaming::NamingContext_var xc =
-            CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+            CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          list_context (xc.in (), level + 1 TAO_ENV_ARG_PARAMETER);
+          list_context (xc.in (), level + 1 ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       // Mark this node as a reference
@@ -150,7 +150,7 @@ show_chunk (CosNaming::NamingContext_ptr nc,
             {
               CORBA::String_var str =
                 orb->object_to_string (obj.in ()
-                                       TAO_ENV_ARG_PARAMETER);
+                                       ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
               ACE_DEBUG ((LM_DEBUG,
                           ": <%s>\n",
@@ -169,16 +169,16 @@ show_chunk (CosNaming::NamingContext_ptr nc,
 static void
 list_context (CosNaming::NamingContext_ptr nc,
               int level
-              TAO_ENV_ARG_DECL)
+              ACE_ENV_ARG_DECL)
 {
   CosNaming::BindingIterator_var it;
   CosNaming::BindingList_var bl;
   const CORBA::ULong CHUNK = 100;
 
-  nc->list (CHUNK, bl, it TAO_ENV_ARG_PARAMETER);
+  nc->list (CHUNK, bl, it ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  show_chunk (nc, bl.in (), level TAO_ENV_ARG_PARAMETER);
+  show_chunk (nc, bl.in (), level ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (!CORBA::is_nil (it.in ()))
@@ -188,12 +188,12 @@ list_context (CosNaming::NamingContext_ptr nc,
       do
         {
           more = it->next_n (CHUNK, bl);
-          show_chunk (nc, bl.in (), level TAO_ENV_ARG_PARAMETER);
+          show_chunk (nc, bl.in (), level ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       while (more);
 
-      it->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+      it->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -204,10 +204,10 @@ main (int argc, char *argv[])
   showIOR = 0;
   showNSonly = 0;
 
-  TAO_ENV_DECLARE_NEW_ENV;
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      orb = CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
+      orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       char *pname = argv[0];
@@ -246,16 +246,16 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER);
+        orb->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CosNaming::NamingContext_var root_nc =
-        CosNaming::NamingContext::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
+        CosNaming::NamingContext::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
         orb->object_to_string (root_nc.in ()
-                               TAO_ENV_ARG_PARAMETER);
+                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (obj.in ()) || CORBA::is_nil (root_nc.in ()))
@@ -282,7 +282,7 @@ main (int argc, char *argv[])
                           "Naming Service:\n---------\n"));
             }
 
-          list_context (root_nc.in (), 1 TAO_ENV_ARG_PARAMETER);
+          list_context (root_nc.in (), 1 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
index 35d5687f404..015660edc4e 100644
--- a/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
+++ b/TAO/utils/wxNamingViewer/wxViewIORDialog.cpp
@@ -89,7 +89,7 @@ void WxViewIORDialog::decodeIOR()
 
       // The need to const_cast should disappear in TAO 1.1.2
       char* profileString =
-          const_cast<TAO_Profile*>(profile)->to_string(TAO_ENV_SINGLE_ARG_PARAMETER);
+          const_cast<TAO_Profile*>(profile)->to_string(ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       profiles->AppendItem( rootItem, profileString);
       delete [] profileString;